Changeset 121

Timestamp:

Aug 24, 2010, 9:36:59 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual

Files:

• include/extLink/dataIO_extLinkVCL.h (modified) (1 diff)
• src/dataIO/visual_dataIO.cpp (modified) (1 diff)
• src/extLink/dataIO_extLinkVCL.cpp (modified) (4 diffs)

osgVisual/include/extLink/dataIO_extLinkVCL.h

@@ -96 +96 @@
         bool configFileValid;
 
-        CVCLVariable<double> SAENGER1_POS_LAT;
-    CVCLVariable<double> SAENGER1_POS_LON;
-    CVCLVariable<double> SAENGER1_POS_ALT; 
-        CVCLVariable<double> SAENGER1_ROT_X;
-    CVCLVariable<double> SAENGER1_ROT_Y;
-    CVCLVariable<double> SAENGER1_ROT_Z;
-
-        CVCLVariable<double> SAENGER2_POS_LAT;
-    CVCLVariable<double> SAENGER2_POS_LON;
-    CVCLVariable<double> SAENGER2_POS_ALT; 
-        CVCLVariable<double> SAENGER2_ROT_X;
-    CVCLVariable<double> SAENGER2_ROT_Y;
-    CVCLVariable<double> SAENGER2_ROT_Z;
-
-        CVCLVariable<double> SAENGER_POS_LAT;
-    CVCLVariable<double> SAENGER_POS_LON;
-    CVCLVariable<double> SAENGER_POS_ALT; 
-        CVCLVariable<double> SAENGER_ROT_X;
-    CVCLVariable<double> SAENGER_ROT_Y;
-    CVCLVariable<double> SAENGER_ROT_Z;
 };
 

osgVisual/src/dataIO/visual_dataIO.cpp

@@ -28 +28 @@
 visual_dataIO::~visual_dataIO()
 {
+        // Delete all slots:
+        for(unsigned int i=0;i<dataSlots.size();i++)
+        {
+                delete dataSlots[i];
+        }
+        dataSlots.clear();
+        
         OSG_NOTIFY( osg::ALWAYS ) << "visual_dataIO destructed" << std::endl;
 }

osgVisual/src/extLink/dataIO_extLinkVCL.cpp

@@ -75 +75 @@
         }
 
-        //OSG_NOTIFY( osg::ALWAYS ) << "LAT: " << osgVisual::visual_dataIO::getInstance()->getSlotDataAsDouble("SAENGER1_POS_LAT", osgVisual::dataIO_slot::TO_OBJ ) << std::endl;
         return true;
 }
@@ -82 +81 @@
 {
         OSG_NOTIFY( osg::INFO ) << "extLinkVCL writebackFROM_OBJvalues()" << std::endl;
-
-        // Copy slot data to variables
-                // Nothing to do
-                // Example: MY_CHANNEL.setValue( myValue );
 
         // write FROM_OBJ values into VCL
@@ -121 +116 @@
                 root_element = xmlDocGetRootElement(doc);
 
+                // Parse the XML document.
                 checkXMLNode(root_element);
 
@@ -182 +178 @@
                 return;
 
-        OSG_ALWAYS << "Processing channels for channel " << channelName_ << " with the direction " << direction_ << std::endl;
+        OSG_ALWAYS << "dataIO_extL) : Processing entries for channel " << channelName_ << " with the direction " << direction_ << std::endl;
 
         for (xmlNode *cur_node = a_node; cur_node; cur_node = cur_node->next)