* XMLSerializer works now also for non heap instances

* Added additional error info for serializable AntTweakBar Former-commit-id: f8b2c26
jigli · Nov 15, 2013 · e5fb0c6 · e5fb0c6
1 parent ee5453d
commit e5fb0c6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2,086 deletions.
diff --git a/include/igl/ReAntTweakBar.cpp b/include/igl/ReAntTweakBar.cpp
@@ -100,7 +100,7 @@ IGL_INLINE void igl::ReTwBar::TwNewBar(const char *name)
 {
   // double colon without anything in front of it means look for this in the
   // global namespace... I hope...
-  //this->name = name;
+  this->name = name;
   this->bar = ::TwNewBar(name);
 }
 

diff --git a/include/igl/ReAntTweakBar.h b/include/igl/ReAntTweakBar.h
@@ -53,7 +53,6 @@
 
 namespace igl
 {
-
   TwType ReTwDefineEnum(
     const char *name, 
     const TwEnumVal *enumValues, 
@@ -155,7 +154,7 @@ namespace igl
     public:
       TwBar * bar;
       // Alec: This causes trouble (not sure why)
-	  //std::string name;
+      std::string name;
     protected:
       std::vector<ReTwRWItem> rw_items;
       std::vector<ReTwCBItem> cb_items;
@@ -243,8 +242,7 @@ namespace igl
       const std::vector<ReTwRWItem> & get_rw_items();
       const std::vector<ReTwCBItem> & get_cb_items();
   };
-
-};
+}
 
 // List of TwBar functions
 //TW_API TwBar *      TW_CALL TwNewBar(const char *barName);

diff --git a/include/igl/xml/ReAntTweakBarXMLSerialization.h b/include/igl/xml/ReAntTweakBarXMLSerialization.h
@@ -198,11 +198,17 @@ namespace igl
 
       for(iter = variables.begin(); iter != variables.end(); iter++)
       {
+        if(iter->second == NULL)
+        {
+          printf("ERROR: '%s' entry not found... Skipping...\n",iter->first.c_str());
+          continue;
+        }
+
         sscanf(iter->second,"%s %[^\n]",type_str,value_str);
 
         if(!bar->type_from_string(type_str,type))
         {
-          printf("ERROR: %s type not found... Skipping...\n",type_str);
+          printf("ERROR: Type '%s' of '%s' not found... Skipping...\n",type_str,iter->first.c_str());
           continue;
         }
 
@@ -211,11 +217,17 @@ namespace igl
 
       for(iter = cbVariables.begin(); iter != cbVariables.end(); iter++)
       {
+        if(iter->second == NULL)
+        {
+          printf("ERROR: '%s' entry not found... Skipping...\n",iter->first.c_str());
+          continue;
+        }
+
         sscanf(iter->second,"%s %[^\n]",type_str,value_str);
 
         if(!bar->type_from_string(type_str,type))
         {
-          printf("ERROR: %s type not found... Skipping...\n",type_str);
+          printf("ERROR: Type '%s' of '%s' not found... Skipping...\n",type_str,iter->first.c_str());
           continue;
         }