Debug

diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
index df0a0a36b6ef2c06e40938bce466148b7cd1fbd8..1b001c6cc465848fe50de3e79e10d0e000946563 100644 (file)
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
@@ -277,18 +277,18 @@ void SalomeApp_DoubleSpinBox::setText( const QString& value )
 */
 SalomeApp_DoubleSpinBox::State SalomeApp_DoubleSpinBox::isValid( const QString& text, double& value, QStringList& absent ) const
 {
-  SearchState aSearchState = findVariable( text, value, absent );
-  if( aSearchState == NotFound )
+  bool isNumber = false;
+  value = QLocale().toDouble( text, &isNumber );
+  if( !isNumber )
   {
-    bool ok = false;
-    value = QLocale().toDouble( text, &ok );
-    if ( !ok )
+    SearchState aSearchState = findVariable( text, value, absent );
+    if( aSearchState == NotFound )
       return NoVariable;
+    else if( aSearchState == IncorrectType )
+      return Incompatible;
+    else if( aSearchState == IncorrectExpression )
+      return Invalid;
   }
-  else if( aSearchState == IncorrectType )
-    return Incompatible;
-  else if( aSearchState == IncorrectExpression )
-    return Invalid;
 
   if( !checkRange( value ) )
     return Invalid;

diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.cxx b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
index 914db5821abb4bada05a8ce6bca795d7e5430ad6..388063750a894659bed385deb7b25fff34d7b9c9 100644 (file)
--- a/src/SalomeApp/SalomeApp_IntSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
@@ -233,23 +233,22 @@ void SalomeApp_IntSpinBox::setText( const QString& value )
 */
 SalomeApp_IntSpinBox::State SalomeApp_IntSpinBox::isValid( const QString& text, int& value, QStringList& absent ) const
 {
-  SearchState aSearchState = findVariable( text, value, absent );
-  if( aSearchState == NotFound )
+  bool isNumber = false;
+  value = text.toInt( &isNumber );
+  if( !isNumber )
   {
-    bool ok = false;
-    value = text.toInt( &ok );
-    if( !ok )
-    {
-      text.toDouble( &ok );
-      if( ok )
-       return Invalid;
+    text.toDouble( &isNumber );
+    if( isNumber )
+      return Invalid;
+
+    SearchState aSearchState = findVariable( text, value, absent );
+    if( aSearchState == NotFound )
       return NoVariable;
-    }
+    else if( aSearchState == IncorrectType )
+      return Incompatible;
+    else if( aSearchState == IncorrectExpression )
+      return Invalid;
   }
-  else if( aSearchState == IncorrectType )
-    return Incompatible;
-  else if( aSearchState == IncorrectExpression )
-    return Invalid;
 
   if( !checkRange( value ) )
     return Invalid;