Changeset 962

Timestamp:

05/19/10 21:32:40 (15 years ago)

Author:

smidl

Message:

New class defaults + correction of log_level save

Files:

• applications/bdmtoolbox/mex/CMakeLists.txt (modified) (1 diff)
• applications/bdmtoolbox/mex/class_defaults.cpp (modified) (1 diff)
• library/bdm/base/bdmbase.h (modified) (1 diff)

applications/bdmtoolbox/mex/CMakeLists.txt

@@ -41 +41 @@
 
 MEX(class_defaults)
+EXEC(class_defaults)

applications/bdmtoolbox/mex/class_defaults.cpp

@@ -31 +31 @@
         //CONFIG
         UImxArray Cfg(input[0]);
+        Cfg.writeFile("class_defaults.cfg");
+        if ( n_output<1 ) mexErrMsgTxt ( "No output - nothing to do!" );
+        
+#else
+        int main ( int argc, char* argv[] ) {
+                const char *fname;
+                if ( argc>1 ) {
+                        fname = argv[1];
+                } else {
+                        fname="class_defaults.cfg";
+                }
+                UIFile Cfg ( fname );
+#endif
+                
         shared_ptr<root> r=UI::build<root>(Cfg);
-        
-        if ( n_output<1 ) mexErrMsgTxt ( "No output - nothing to do!" );
+
+#ifdef MEX
         UImxArray Ret;
-        UI::save(r, Ret.getRoot());
+        UI::save(*r, Ret);
         
         output[0] = Ret.create_mxArray();
+#else
+        UIFile Out;
+        UI::save(*r,Out);
+        Out.writeFile("defaults");
+#endif
 }
-#endif

library/bdm/base/bdmbase.h

@@ -512 +512 @@
         {
                 // HERE WE WANT NOT TO DELETE PREVIOUS DATA STORED BY OTHER LOG_LEVELS, SEE SPECIAL IMPLEMENTATION OF UI::GET(...) FOR THIS CLASS
-                string string_to_write =  ( const char* ) element;
+                const char* ch_elem=( const char* ) element;
+                string string_to_write;
+                if (ch_elem)
+                        string_to_write=ch_elem;
+                else
+                        string_to_write="";
 
                 for( unsigned int i = 0; i < this->values.size(); i++ )