Changeset 117

Timestamp:

Aug 23, 2010, 7:15:04 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual

Files:

• bin/visual_slave.bat (modified) (1 diff)
• src/extLink/dataIO_extLinkVCL.cpp (modified) (6 diffs)

osgVisual/bin/visual_slave.bat

@@ -1 @@
-osgVisual.exe -C center -s --server 192.168.0.101 12345 --window 950 450 600 350 D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive -p salzburg.path
+osgVisual.exe -s --server 192.168.0.101 12345 --window 950 450 600 350 D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive

osgVisual/src/extLink/dataIO_extLinkVCL.cpp

@@ -187 +187 @@
                 if(cur_node->type == XML_ELEMENT_NODE && node_name == "CONFIGURATION")
                 {
-                        std::cout << "XML node CONFIGURATION found" << std::endl;
+                        //OSG_DEBUG << "XML node CONFIGURATION found" << std::endl;
                         configFileValid = true;
                 }
@@ -193 +193 @@
         if (cur_node->type == XML_ELEMENT_NODE && node_name == "CHANNEL")
                 {
-                        std::cout << "XML node CHANNEL found" << std::endl;
+                        //OSG_DEBUG << "XML node CHANNEL found" << std::endl;
 
                         // Extract channel infos like name, direction and extract channels
@@ -213 +213 @@
                         addChannels(cur_node->children, name, direction );
         
-            //printf("node type: Element, name: %s\n", cur_node->name);
-                        std::cout << "Processing children at " << cur_node->children << std::endl;
+            //OSG_DEBUG << "node type=Element, name:" << cur_node->name << std::endl;
+                        //OSG_DEBUG << "Processing children at " << cur_node->children << std::endl;
         }       // IF(CHANNEL) END
 
@@ -231 +231 @@
         for (xmlNode *cur_node = a_node; cur_node; cur_node = cur_node->next)
         {
-                OSG_ALWAYS << "Found entry!" << std::endl;
-
-                // Extract ENTRY - name
+                if (cur_node->type != XML_ELEMENT_NODE) // only emelent nodes are relevant entries. otherwise skip this iteration. VCL files only contain text nodes in comments or as untrimmed element nodes.
+                        continue;               
+
+                // Extract ENTRY - name (from the Channel <ENTRY> in the XML file
                 std::string entryName;
                 xmlAttr  *attr = cur_node->properties;
@@ -241 +242 @@
                         if( attr_name == "name" )
                                 entryName = reinterpret_cast<const char*>(attr->children->content);
-                        //std::cout << "Attribute name: " << attr->name << " value: " << attr->children->content << std::endl;
+                        //OSG_DEBUG << "Attribute name: " << attr->name << " value: " << attr->children->content << std::endl;
                         attr = attr->next; 
                 } 
@@ -250 +251 @@
 
                 // Attach VCL variable to channel:
+                //OSG_DEBUG << "attaching.... name: " << channelName_ << ", entryName: " << entryName << std::endl;
                 if( !tmp->Attach(channelName_.c_str(), entryName.c_str() ) )
                         OSG_ALWAYS << "ERROR - dataIO_extLinkVCL::addChannels(): unable to attach VCL variable entryName: " << entryName << " to channel: " << channelName_ << std::endl;