Changeset 390 for library/bdm/base/user_info.cpp

Timestamp:

06/19/09 12:41:37 (15 years ago)

Author:

mido

Message:

class bdmroot renamed to root, ui matrix patched (possibility of a "matrix" string at first place of the matrix list was allowed)

Files:

• library/bdm/base/user_info.cpp (modified) (1 diff)

library/bdm/base/user_info.cpp

@@ -222 +222 @@
     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];
+                int data_offset;
+
+                if ( link.result.getLength() == 3 )
+                        data_offset = 0;
+                else if ( link.result.getLength() == 4 )
+                {
+                ASSERT_UITYPE(link.result[0],TypeString);
+                        if( link.result[0] != "matrix" )
+                                ui_error( "the setting supposed to represent a matrix element has wrong syntax", link.result );
+
+                        data_offset = 1;
+                }
+                else
+                        ui_error( "the setting supposed to represent a matrix element has wrong syntax", link.result );
+
+        Setting &rows_setting = link.result[0 + data_offset];
+        Setting &cols_setting = link.result[1 + data_offset];
+        Setting &elements = link.result[2 + data_offset];
 
         ASSERT_UITYPE(cols_setting,TypeInt);