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

Timestamp:

06/19/09 17:57:53 (15 years ago)

Author:

smidl

Message:

compilation fixes - UI_build use exceptions now!!!!

Files:

• library/bdm/base/user_info.cpp (modified) (4 diffs)

library/bdm/base/user_info.cpp

@@ -229 +229 @@
                 {
                 ASSERT_UITYPE(link.result[0],TypeString);
-                        if( link.result[0] != "matrix" )
+                        const char* elem1=(const char*)link.result[0];
+                        if( (strcmp(elem1, "matrix") ))
                                 ui_error( "the setting supposed to represent a matrix element has wrong syntax", link.result );
 
@@ -280 +281 @@
     if ( link.result.isNumber() )
     {
-        ASSERT_UITYPE(link.result,TypeInt);
+  //      ASSERT_UITYPE(link.result,TypeInt);
         vector.set_length( 1 );
         vector(0) = link.result;
@@ -299 +300 @@
 
                 Setting &elements = link.result[2];
-        ASSERT_UITYPE(elements[0],TypeInt);
+        // ASSERT_UITYPE(elements[0],TypeInt); -- spolehame an autoconvert
 
 
         if ( matrix.cols() == 1 )
                         for ( int i=0; i<len; i++ )
-                                vector(i) = matrix(i,1);
+                                vector(i) = matrix(i,0);
                 else
                         for ( int i=0; i<len; i++ )
-                                vector(i) = matrix(1,i);
+                                vector(i) = matrix(0,i);
         return;
 
@@ -353 +354 @@
         if ( matrix.cols() == 1 )
                         for ( int i=0; i<len; i++ )
-                                vector(i) = matrix(i,1);
+                                vector(i) = matrix(i,0);
                 else
                         for ( int i=0; i<len; i++ )
-                                vector(i) = matrix(1,i);
+                                vector(i) = matrix(0,i);
         return;
     }