From: ouv <ouv@opencascade.com>
Date: Thu, 17 Dec 2009 10:16:04 +0000 (+0000)
Subject: Debug
X-Git-Tag: PHASE_17_Part1_V4~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d58ffa50ae18bb1fee60d57805a006caf1250090;p=modules%2Fkernel.git

Debug
---

diff --git a/src/Notebook/SALOME_EvalSet.cxx b/src/Notebook/SALOME_EvalSet.cxx
index d6ff45930..3dd301996 100755
--- a/src/Notebook/SALOME_EvalSet.cxx
+++ b/src/Notebook/SALOME_EvalSet.cxx
@@ -520,11 +520,10 @@ SALOME_String SALOME_EvalSetLogic::name() const
 bool SALOME_EvalSetLogic::createValue(const SALOME_String& str, SALOME_EvalVariant& val)const
 {
   bool ok = true;
-  SALOME_String valStr = toLower(str);
   //
-  if ( valStr == "true" || valStr == "yes" )
+  if ( str == "True" )
     val = SALOME_EvalVariant( true );
-  else if ( valStr == "false" || valStr == "no" )
+  else if ( str == "False" )
     val = SALOME_EvalVariant( false );
   else
     ok = SALOME_EvalSetBase::createValue( str, val );
diff --git a/src/Notebook/SALOME_EvalVariant.cxx b/src/Notebook/SALOME_EvalVariant.cxx
index d0a218c76..11d4e5f41 100755
--- a/src/Notebook/SALOME_EvalVariant.cxx
+++ b/src/Notebook/SALOME_EvalVariant.cxx
@@ -342,7 +342,7 @@ bool SALOME_EvalVariant::toBool() const
 	  return DataValueDouble() != 0.;
   }
   else if ( aType == SALOME_EvalVariant_String ) {
-    SALOME_String aZero("0"), aFalse("false");
+    SALOME_String aZero("0"), aFalse("False");
     const SALOME_String& aStr=DataValueString();
     return !(aStr==aZero || aStr==aFalse || aStr.empty());
   }
@@ -443,7 +443,7 @@ SALOME_String SALOME_EvalVariant::toString() const
     int iX;
     //
     iX=toInt(&bOk);
-    aS= iX? "true" : "false";
+    aS= iX? "True" : "False";
   }
   else if (aType == SALOME_EvalVariant_Int) {
     sprintf(buffer, "%d", DataValueInt());
diff --git a/src/Notebook/SALOME_Notebook.cxx b/src/Notebook/SALOME_Notebook.cxx
index 1382c8467..0edb15c9d 100644
--- a/src/Notebook/SALOME_Notebook.cxx
+++ b/src/Notebook/SALOME_Notebook.cxx
@@ -1027,7 +1027,7 @@ bool SALOME_Notebook::CheckParamName( const std::string& theParamName, std::stri
   for( int i=0, n=theParamName.length(); i<n; i++ )
     if( isspace( theParamName[i] ) )
     {
-      theMsg = "The name should not contain white symbols";
+      theMsg = "The name should not contain white spaces";
       return false;
     }
 
diff --git a/src/Notebook/SALOME_Parameter.cxx b/src/Notebook/SALOME_Parameter.cxx
index 9dba0d40a..ff11892c0 100644
--- a/src/Notebook/SALOME_Parameter.cxx
+++ b/src/Notebook/SALOME_Parameter.cxx
@@ -262,7 +262,7 @@ SALOME_Parameter* SALOME_Parameter::Load( SALOME_Notebook* theNotebook, FILE* th
     switch( aResType )
     {
     case SALOME_EvalVariant_Boolean:
-      return new SALOME_Parameter( theNotebook, aName, aValue=="true" );
+      return new SALOME_Parameter( theNotebook, aName, aValue=="True" );
 
     case SALOME_EvalVariant_Int:
     case SALOME_EvalVariant_UInt:
diff --git a/src/Notebook/Test/NotebookTest.cxx b/src/Notebook/Test/NotebookTest.cxx
index d0f36defe..749084af7 100644
--- a/src/Notebook/Test/NotebookTest.cxx
+++ b/src/Notebook/Test/NotebookTest.cxx
@@ -203,10 +203,10 @@ void NotebookTest::testParameterString()
   aResult[1]="THE QUICK BROWN FOX JUMPS OVER A LAZY DOG";
   aResult[2]="the quick brown fox jumps over a lazy dog";
   aResult[3]="41";
-  aResult[4]="true";
-  aResult[5]="false";
-  aResult[6]="false";
-  aResult[7]="true";
+  aResult[4]="True";
+  aResult[5]="False";
+  aResult[6]="False";
+  aResult[7]="True";
   //
   aTypeR[0]=SALOME_EvalVariant_String;
   aTypeR[1]=SALOME_EvalVariant_String;