Changeset 377 for bdm/user_info.cpp

Timestamp:

06/15/09 18:27:16 (15 years ago)

Author:

mido

Message:

1) globalni prejmenovani Setting &root na Setting &set
2) smazani par zastaralych adresaru
3) oprava warningu v doc\local
4) prejmenovani SettingsResolver? na SettingResolver? a drobne vylepseni funkcnosti
5) odstranena duplikace kodu v user_info.cpp

Files:

• bdm/user_info.cpp (modified) (13 diffs)

bdm/user_info.cpp

@@ -15 +15 @@
 namespace bdm
 {
-
-
 ///////////////////////// UI FILE /////////////////////////////////////////////
-
 
 UI_File::UI_File ()
@@ -88 +85 @@
     String_To_UI_Map::const_iterator iter = mapped_strings().find( class_name );
     if ( iter == mapped_strings().end())
+                // TODO dat sem vypis seznamu registrovanych trid
         it_error ( "UI error: class " + class_name + " was not properly registered. Use the macro ""UIREGISTER([class name]);"" within your code." );
     return *iter->second;
@@ -102 +100 @@
 ///////////////////////// INTERNAL LINK EXPANDER /////////////////////////////////////////////
 
-UI::SettingsResolver::SettingsResolver( const Setting &potential_link )
-{
-    file = NULL;
-    result = &potential_link;
-
+UI::SettingResolver::SettingResolver( const Setting &potential_link ): result( initialize_reference( file, potential_link ) )
+{
+}
+
+const Setting& UI::SettingResolver::initialize_reference(UI_File *&file, const Setting &potential_link)
+{
     if ( potential_link.getType() !=  Setting::TypeString )
-        return;
-
-    string link = (const char*) potential_link;
+            return potential_link;
+        
+        string link = (const char*) potential_link;
     size_t aerobase = link.find('@');
+
+        const Setting *result;
     if ( aerobase != string::npos )
     {
@@ -120 +121 @@
     }
     else
+        {
+                file = NULL;
+                result = &potential_link;
         while ( !result->isRoot() )
             result = &result->getParent();
+        }
 
     if ( !result->exists( link ) )
         ui_error( "linked Setting was not found", potential_link );
 
-    result = &(*result)[link];
-}
-
-UI::SettingsResolver::~SettingsResolver()
+    return (*result)[link];
+}
+
+UI::SettingResolver::~SettingResolver()
 {
     if ( file ) delete file;
-}
-
-const Setting& UI::SettingsResolver::root() const
-{
-    return *result;
 }
 
@@ -151 +151 @@
 void UI::save( const string &str, Setting &element )
 {
-    Setting &root = element.add( Setting::TypeString );
-    root = str;
+    Setting &set = element.add( Setting::TypeString );
+    set = str;
 }
 
@@ -158 +158 @@
 {
 
-    Setting &root = (name == "") ? element.add( Setting::TypeList )
+    Setting &set = (name == "") ? element.add( Setting::TypeList )
                     : element.add( name, Setting::TypeList );
 
-    Setting &cols = root.add( Setting::TypeInt );
+    Setting &cols = set.add( Setting::TypeInt );
     cols = matrix.cols();
 
-    Setting &rows = root.add( Setting::TypeInt );
+    Setting &rows = set.add( Setting::TypeInt );
     rows = matrix.rows();
 
-    Setting &elements = root.add( Setting::TypeArray );
+    Setting &elements = set.add( Setting::TypeArray );
 
     // build matrix row-wise
@@ -183 +183 @@
 {
 
-    Setting &root = (name == "") ? element.add( Setting::TypeArray )
+    Setting &set = (name == "") ? element.add( Setting::TypeArray )
                     : element.add( name, Setting::TypeArray );
     for ( int i=0; i<vector.length(); i++ )
     {
-        Setting &new_field = root.add(Setting::TypeInt);
+        Setting &new_field = set.add(Setting::TypeInt);
         new_field = vector(i);
     }
@@ -196 +196 @@
 void UI::save( const vec &vector, Setting &element, const string &name)
 {
-
-    Setting &root = (name == "") ? element.add( Setting::TypeArray )
+    Setting &set = (name == "") ? element.add( Setting::TypeArray )
                     : element.add( name, Setting::TypeArray );
     for ( int i=0; i<vector.length(); i++ )
     {
-                Setting &new_field = root.add(Setting::TypeFloat);
+                Setting &new_field = set.add(Setting::TypeFloat);
         new_field = vector(i);
     }
@@ -211 +210 @@
 void UI::from_setting( mat& matrix, const Setting &element )
 {
-    const SettingsResolver link_expander( element );
-    const Setting &root = link_expander.root();
-
-    if ( root.isNumber() )
+    const SettingResolver link( element );
+
+    if ( link.result.isNumber() )
     {
         matrix.set_size( 1, 1 );
-        matrix(0,0) = root;
-        return;
-    }
-
-    if ( root.isList() )
-    {
-        if ( root.getLength() != 3 )
-            ui_error( "the setting supposed to represent a matrix element has wrong syntax", root );
-
-        Setting &rows_setting = root[0];
-        Setting &cols_setting = root[1];
-        Setting &elements = root[2];
+        matrix(0,0) = link.result;
+        return;
+    }
+
+    if ( link.result.isList() )
+    {
+        if ( link.result.getLength() != 3 )
+            ui_error( "the setting supposed to represent a matrix element has wrong syntax", link.result );
+
+        Setting &rows_setting = link.result[0];
+        Setting &cols_setting = link.result[1];
+        Setting &elements = link.result[2];
 
         ASSERT_UITYPE(cols_setting,TypeInt);
@@ -238 +236 @@
 
         if ( cols < 0 | rows < 0 )
-            ui_error( "the dimensions of a matrix has to be non-negative", root );
+            ui_error( "the dimensions of a matrix has to be non-negative", link.result );
 
         if ( elements.getLength() != cols * rows )
@@ -259 +257 @@
     }
 
-    ui_error( "only numeric types or TypeList are supported as matrix values", root );
+    ui_error( "only numeric types or TypeList are supported as matrix values", link.result );
 }
 
@@ -265 +263 @@
 void UI::from_setting( ivec &vector, const Setting &element )
 {
-    const SettingsResolver link_expander( element );
-    const Setting &root = link_expander.root();
-
-    if ( root.isNumber() )
-    {
-        ASSERT_UITYPE(root,TypeInt);
+    const SettingResolver link( element );
+
+    if ( link.result.isNumber() )
+    {
+        ASSERT_UITYPE(link.result,TypeInt);
         vector.set_length( 1 );
-        vector(0) = root;
-        return;
-    }
-
-    if ( root.isList() )
-    {
-        if ( root.getLength() != 3 )
-            ui_error( "the setting supposed to represent a matrix element has wrong syntax", root );
-
-        Setting &cols_setting = root[0];
-        Setting &rows_setting = root[1];
-        Setting &elements = root[2];
-
-        ASSERT_UITYPE(cols_setting,TypeInt);
-        ASSERT_UITYPE(rows_setting,TypeInt);
-        ASSERT_UITYPE(elements,TypeArray);
-
-        int cols = cols_setting;
-        int rows = rows_setting;
-
-        if ( cols < 0 | rows < 0)
-            ui_error( "the dimensions of a matrix has to be non-negative", root );
-
-        if ( elements.getLength() != cols * rows )
-            ui_error( "the count of the matrix elements is incompatible with matrix dimension", elements );
-
-        if ( cols != 1 & rows !=1)
-            ui_error( "the vector length is invalid, it seems to be rather a matrix", elements );
-
-        int len = rows * cols;
+        vector(0) = link.result;
+        return;
+    }
+
+    if ( link.result.isList() )
+    {
+                mat matrix;
+                from_setting( matrix, link.result );
+
+        if ( matrix.cols() != 1 & matrix.rows() !=1)
+                        ui_error( "the vector length is invalid, it seems to be rather a matrix", link.result );
+
+        int len = matrix.rows() * matrix.cols();
         vector.set_length ( len );
         if ( len == 0 ) return;
 
+                Setting &elements = link.result[2];
         ASSERT_UITYPE(elements[0],TypeInt);
-        for ( int i=0; i<len; i++ )
-            vector(i) = elements[i];
-        return;
-    }
-
-    if ( root.isArray() )
-    {
-        int len = root.getLength();
+
+
+        if ( matrix.cols() == 1 )
+                        for ( int i=0; i<len; i++ )
+                                vector(i) = matrix(i,1);
+                else
+                        for ( int i=0; i<len; i++ )
+                                vector(i) = matrix(1,i);
+        return;
+
+    }
+
+    if ( link.result.isArray() )
+    {
+        int len = link.result.getLength();
         vector.set_length( len );
         if ( len == 0 ) return;
 
-        ASSERT_UITYPE(root[0],TypeInt);
+        ASSERT_UITYPE(link.result[0],TypeInt);
         for ( int i=0; i < len; i++ )
-            vector(i) = root[i];
-        return;
-    }
-
-    ui_error( "only numeric types, TypeArray or TypeList are supported as vector values", root );
+            vector(i) = link.result[i];
+        return;
+    }
+
+    ui_error( "only numeric types, TypeArray or TypeList are supported as vector values", link.result );
 }
 
@@ -329 +317 @@
 void UI::from_setting( vec &vector, const Setting &element )
 {
-    const SettingsResolver link_expander( element );
-    const Setting &root = link_expander.root();
-
-    if ( root.isNumber() )
+    const SettingResolver link( element );
+
+    if ( link.result.isNumber() )
     {
         vector.set_length( 1 );
-        vector(0) = root;
-        return;
-    }
-
-    if ( root.isList() )
-    {
-        if ( root.getLength() != 3 )
-            ui_error( "the setting supposed to represent a matrix element has wrong syntax", root );
-
-        Setting &cols_setting = root[0];
-        Setting &rows_setting = root[1];
-        Setting &elements = root[2];
-
-        ASSERT_UITYPE(cols_setting,TypeInt);
-        ASSERT_UITYPE(rows_setting,TypeInt);
-        ASSERT_UITYPE(elements,TypeArray);
-
-        int cols = cols_setting;
-        int rows = rows_setting;
-
-        if ( cols < 0 | rows < 0)
-            ui_error( "the dimensions of a matrix has to be non-negative", root );
-
-        if ( elements.getLength() != cols * rows )
-            ui_error( "the count of the matrix elements is incompatible with matrix dimension", elements );
-
-        if ( cols != 1 & rows !=1)
-            ui_error( "the vector length is invalid, it seems to be rather a matrix", elements );
-
-        int len = rows * cols;
+        vector(0) = link.result;
+        return;
+    }
+
+    if ( link.result.isList() )
+    {
+                mat matrix;
+                from_setting( matrix, link.result );
+
+        if ( matrix.cols() != 1 & matrix.rows() !=1)
+                        ui_error( "the vector length is invalid, it seems to be rather a matrix", link.result );
+
+        int len = matrix.rows() * matrix.cols();
         vector.set_length ( len );
         if ( len == 0 ) return;
 
-        if ( !elements[0].isNumber())
-            ui_error("a vector element has to be a number", elements[0]);
-
-        for ( int i=0; i<len; i++ )
-            vector(i) = elements[i];
-        return;
-    }
-
-    if ( root.isArray() )
-    {
-        int len = root.getLength();
+        if ( matrix.cols() == 1 )
+                        for ( int i=0; i<len; i++ )
+                                vector(i) = matrix(i,1);
+                else
+                        for ( int i=0; i<len; i++ )
+                                vector(i) = matrix(1,i);
+        return;
+    }
+
+    if ( link.result.isArray() )
+    {
+        int len = link.result.getLength();
         vector.set_length( len );
         if ( len == 0 ) return;
 
-        if ( !root[0].isNumber())
-            ui_error("a vector element has to be a number", root[0]);
-
-        for ( int i=0; i < len; i++ ) {
-        double tmp= (root[i]);
-            vector(i) = tmp;
-}
-        return;
-    }
-
-    ui_error( "only numeric types, TypeArray or TypeList are supported as vector values", root );
+        if ( !link.result[0].isNumber())
+            ui_error("a vector element has to be a number", link.result[0]);
+
+        for ( int i=0; i < len; i++ ) 
+            vector(i) = link.result[i];
+
+                return;
+    }
+
+    ui_error( "only numeric types, TypeArray or TypeList are supported as vector values", link.result );
 }