Changeset 118 for osgVisual/src/dataIO/visual_dataIO.cpp

Timestamp:

Aug 23, 2010, 11:43:12 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• osgVisual/src/dataIO/visual_dataIO.cpp (modified) (8 diffs)

osgVisual/src/dataIO/visual_dataIO.cpp

@@ -191 +191 @@
         {
                 // Check if this variable name&-type already exists
-                if( dataSlots[i].variableName == variableName_ && dataSlots[i].direction == direction_  && dataSlots[i].variableType ==  variableTyp_)
+                if( dataSlots[i]->variableName == variableName_ && dataSlots[i]->direction == direction_  && dataSlots[i]->variableType ==  variableTyp_)
                 {
                         //OSG_NOTIFY( osg::INFO ) << "visual_dataIO::getSlotPointer() - Slot found at position " << i << std::endl;
                         // Return pointer to the value
-                        if (variableTyp_ == osgVisual::dataIO_slot::STRING )
-                                return &(dataSlots[i].sValue);
-                        else
-                                return &(dataSlots[i].value);
+                        return dataSlots[i];
                 }
         }
@@ -204 +201 @@
         // Slot does not exist -> add it to slot list
         //OSG_NOTIFY( osg::INFO ) << "visual_dataIO::getSlotPointer() - Slot not found, will add as new slot " << std::endl;
-        dataIO_slot newSlot;
-        newSlot.variableName = variableName_;
-        newSlot.variableType = variableTyp_;
-        newSlot.value = 0;
-        newSlot.sValue = "";
+        dataIO_slot* newSlot = new dataIO_slot();
+        newSlot->variableName = variableName_;
+        newSlot->variableType = variableTyp_;
+        newSlot->value = 0;
+        newSlot->sValue = "";
         dataSlots.push_back( newSlot );
-        if (variableTyp_ == osgVisual::dataIO_slot::STRING )
-                return &(dataSlots.back().sValue);
-        else
-        {
-                return &(dataSlots.back().value);
-        }
+        return dataSlots.back();
 }
 
@@ -224 +216 @@
         {
                 // Check if this variable name&-type already exists
-                if( dataSlots[i].variableName == variableName_ && dataSlots[i].direction == direction_  && dataSlots[i].variableType == osgVisual::dataIO_slot::DOUBLE )
+                if( dataSlots[i]->variableName == variableName_ && dataSlots[i]->direction == direction_  && dataSlots[i]->variableType == osgVisual::dataIO_slot::DOUBLE )
                 {
                         //OSG_NOTIFY( osg::INFO ) << "visual_dataIO::getSlotDataAsDouble() - Slot found at position " << i << std::endl;
-                        return dataSlots[i].value;
+                        return dataSlots[i]->value;
                 }
         }
@@ -239 +231 @@
         {
                 // Check if this variable name&-type already exists
-                if( dataSlots[i].variableName == variableName_ && dataSlots[i].direction == direction_  && dataSlots[i].variableType == osgVisual::dataIO_slot::STRING )
+                if( dataSlots[i]->variableName == variableName_ && dataSlots[i]->direction == direction_  && dataSlots[i]->variableType == osgVisual::dataIO_slot::STRING )
                 {
                         //OSG_NOTIFY( osg::INFO ) << "visual_dataIO::getSlotDataAsDouble() - Slot found at position " << i << std::endl;
-                        return dataSlots[i].sValue;
+                        return dataSlots[i]->sValue;
                 }
         }
@@ -255 +247 @@
         {
                 // Check if this variable name&-type already exists
-                if( dataSlots[i].variableName == variableName_ && dataSlots[i].direction == direction_ && dataSlots[i].variableType ==  osgVisual::dataIO_slot::STRING)
+                if( dataSlots[i]->variableName == variableName_ && dataSlots[i]->direction == direction_ && dataSlots[i]->variableType ==  osgVisual::dataIO_slot::STRING)
                 {
                         // Update value
-                        dataSlots[i].sValue = sValue_;
+                        dataSlots[i]->sValue = sValue_;
                         slotFound = true;
-                        return &(dataSlots[i]);
+                        return dataSlots[i];
                 }
                 
@@ -268 +260 @@
         {
                 // Slot does not exist -> add it to slot list
-                dataIO_slot newSlot;
-                newSlot.variableName = variableName_;
-                newSlot.direction = direction_;
-                newSlot.variableType = osgVisual::dataIO_slot::STRING;
-                newSlot.value = 0;
-                newSlot.sValue = sValue_;
+                dataIO_slot* newSlot = new dataIO_slot();
+                newSlot->variableName = variableName_;
+                newSlot->direction = direction_;
+                newSlot->variableType = osgVisual::dataIO_slot::STRING;
+                newSlot->value = 0;
+                newSlot->sValue = sValue_;
                 dataSlots.push_back( newSlot );
+                return dataSlots.back();
         }
 
@@ -287 +280 @@
         {
                 // Check if this variableName & -type already exists
-                if( dataSlots[i].variableName == variableName_ && dataSlots[i].direction == direction_ && dataSlots[i].variableType ==  osgVisual::dataIO_slot::DOUBLE)
+                if( dataSlots[i]->variableName == variableName_ && dataSlots[i]->direction == direction_ && dataSlots[i]->variableType ==  osgVisual::dataIO_slot::DOUBLE)
                 {
                         // Update value
                         //OSG_NOTIFY( osg::ALWAYS ) << "setSlotData: " << variableName_ << " - value: " << value_ << std::endl;
-                        dataSlots[i].value = value_;
+                        dataSlots[i]->value = value_;
                         slotFound = true;
-                        return &(dataSlots[i]);
+                        return dataSlots[i];
                 }       
         }
@@ -300 +293 @@
         {
                 // Slot does not exist -> add it to slot list
-                dataIO_slot newSlot;
-                newSlot.variableName = variableName_;
-                newSlot.direction = direction_;
-                newSlot.variableType = osgVisual::dataIO_slot::DOUBLE;
-                newSlot.value = value_;
-                newSlot.sValue = "";
+                dataIO_slot* newSlot = new dataIO_slot();
+                newSlot->variableName = variableName_;
+                newSlot->direction = direction_;
+                newSlot->variableType = osgVisual::dataIO_slot::DOUBLE;
+                newSlot->value = value_;
+                newSlot->sValue = "";
                 dataSlots.push_back( newSlot );
+                return dataSlots.back();
         }