Dump Python Extension

diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
index b40231f23cd04f8d0734cf0595041ed787f54fbe..42cf9e48de5fcc704deb3696e4c31c62e461e277 100644 (file)
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
@@ -198,7 +198,9 @@ bool SalomeApp_DoubleSpinBox::isValid( QString& msg, bool toCorrect )
   {
     if( toCorrect )
     {
-      if( aState == NoVariable )
+      if( aState == Incompatible )
+       msg += tr( "ERR_INCOMPATIBLE_TYPE" ).arg( text() ) + "\n";
+      else if( aState == NoVariable )
        msg += tr( "ERR_NO_VARIABLE" ).arg( text() ) + "\n";
       else if( aState == Invalid )
        msg += tr( "ERR_INVALID_VALUE" ) + "\n";
@@ -261,13 +263,16 @@ void SalomeApp_DoubleSpinBox::setText( const QString& value )
 */
 SalomeApp_DoubleSpinBox::State SalomeApp_DoubleSpinBox::isValid( const QString& text, double& value ) const
 {
-  if( !findVariable( text, value ) )
+  SearchState aSearchState = findVariable( text, value );
+  if( aSearchState == NotFound )
   {
     bool ok = false;
     value = text.toDouble( &ok );
     if( !ok )
       return NoVariable;
   }
+  else if( aSearchState == IncorrectType )
+    return Incompatible;
 
   if( !checkRange( value ) )
     return Invalid;
@@ -301,10 +306,11 @@ bool SalomeApp_DoubleSpinBox::checkRange( const double value ) const
 
 /*!
   \brief This function is used to determine whether input is a variable name and to get its value.
-  \return true if the input is a variable name
+  \return status of search operation
 */
-bool SalomeApp_DoubleSpinBox::findVariable( const QString& name, double& value ) const
+SalomeApp_DoubleSpinBox::SearchState SalomeApp_DoubleSpinBox::findVariable( const QString& name, double& value ) const
 {
+  value = 0;
   if( SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() ) )
   {
     if( SalomeApp_Study* study = dynamic_cast<SalomeApp_Study*>( app->activeStudy() ) )
@@ -312,14 +318,18 @@ bool SalomeApp_DoubleSpinBox::findVariable( const QString& name, double& value )
       _PTR(Study) studyDS = study->studyDS();
 
       std::string aName = name.toStdString();
-      if( studyDS->IsVariable( aName ) && ( studyDS->IsReal( aName ) || studyDS->IsInteger( aName ) ) )
+      if( studyDS->IsVariable( aName ) )
       {
-       value = studyDS->GetReal( aName );
-       return true;
+       if( studyDS->IsReal( aName ) || studyDS->IsInteger( aName ) )
+       {
+         value = studyDS->GetReal( aName );
+         return Found;
+       }
+       return IncorrectType;
       }
     }
   }
-  return false;
+  return NotFound;
 }
 
 /*!

diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.h b/src/SalomeApp/SalomeApp_DoubleSpinBox.h
index 1bb25964dda1320664bc6ebdc339d95832b1b0e3..c5b6539ca6f12e686f1b9c52ba8f42faa4d8d115 100644 (file)
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.h
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.h
@@ -32,7 +32,8 @@ class SALOMEAPP_EXPORT SalomeApp_DoubleSpinBox : public QtxDoubleSpinBox
 {
   Q_OBJECT
 
-  enum State { Invalid = 0, NoVariable, Acceptable };
+  enum State { Invalid = 0, NoVariable, Incompatible, Acceptable };
+  enum SearchState { NotFound = 0, IncorrectType, Found };
 
 public:
   SalomeApp_DoubleSpinBox( QWidget* = 0 );
@@ -63,7 +64,7 @@ protected:
   double                    defaultValue() const;
   bool                      checkRange( const double ) const;
 
-  bool                      findVariable( const QString&, double& ) const;
+  SearchState               findVariable( const QString&, double& ) const;
 
 protected:
   virtual void              keyPressEvent( QKeyEvent* );

diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.cxx b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
index c950062f694cfdf11617aae941ef2c05ba808732..4d3460a3bd320294afeb4e6a8580a05ec121558e 100644 (file)
--- a/src/SalomeApp/SalomeApp_IntSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
@@ -168,7 +168,9 @@ bool SalomeApp_IntSpinBox::isValid( QString& msg, bool toCorrect )
   {
     if( toCorrect )
     {
-      if( aState == NoVariable )
+      if( aState == Incompatible )
+       msg += tr( "ERR_INCOMPATIBLE_TYPE" ).arg( text() ) + "\n";
+      else if( aState == NoVariable )
        msg += tr( "ERR_NO_VARIABLE" ).arg( text() ) + "\n";
       else if( aState == Invalid )
        msg += tr( "ERR_INVALID_VALUE" ) + "\n";
@@ -217,13 +219,21 @@ void SalomeApp_IntSpinBox::setText( const QString& value )
 */
 SalomeApp_IntSpinBox::State SalomeApp_IntSpinBox::isValid( const QString& text, int& value ) const
 {
-  if( !findVariable( text, value ) )
+  SearchState aSearchState = findVariable( text, value );
+  if( aSearchState == NotFound )
   {
     bool ok = false;
     value = text.toInt( &ok );
     if( !ok )
+    {
+      text.toDouble( &ok );
+      if( ok )
+       return Invalid;
       return NoVariable;
+    }
   }
+  else if( aSearchState == IncorrectType )
+    return Incompatible;
 
   if( !checkRange( value ) )
     return Invalid;
@@ -254,10 +264,11 @@ bool SalomeApp_IntSpinBox::checkRange( const int value ) const
 
 /*!
   \brief This function is used to determine whether input is a variable name and to get its value.
-  \return true if the input is a variable name
+  \return status of search operation
 */
-bool SalomeApp_IntSpinBox::findVariable( const QString& name, int& value ) const
+SalomeApp_IntSpinBox::SearchState SalomeApp_IntSpinBox::findVariable( const QString& name, int& value ) const
 {
+  value = 0;
   if( SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() ) )
   {
     if( SalomeApp_Study* study = dynamic_cast<SalomeApp_Study*>( app->activeStudy() ) )
@@ -265,14 +276,18 @@ bool SalomeApp_IntSpinBox::findVariable( const QString& name, int& value ) const
       _PTR(Study) studyDS = study->studyDS();
 
       std::string aName = name.toStdString();
-      if( studyDS->IsVariable( aName ) && studyDS->IsInteger( aName ) )
+      if( studyDS->IsVariable( aName ) )
       {
-       value = studyDS->GetInteger( aName );
-       return true;
+       if( studyDS->IsInteger( aName ) )
+       {
+         value = studyDS->GetInteger( aName );
+         return Found;
+       }
+       return IncorrectType;
       }
     }
   }
-  return false;
+  return NotFound;
 }
 
 /*!

diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.h b/src/SalomeApp/SalomeApp_IntSpinBox.h
index 82508d83b1c7a0ae42e4487d80045a8e88e7a5c4..d15fe99c1d811f777e93a1e645366729c124abb1 100644 (file)
--- a/src/SalomeApp/SalomeApp_IntSpinBox.h
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.h
@@ -32,7 +32,8 @@ class SALOMEAPP_EXPORT SalomeApp_IntSpinBox : public QtxIntSpinBox
 {
   Q_OBJECT
 
-  enum State { Invalid = 0, NoVariable, Acceptable };
+  enum State { Invalid = 0, NoVariable, Incompatible, Acceptable };
+  enum SearchState { NotFound = 0, IncorrectType, Found };
 
 public:
   SalomeApp_IntSpinBox( QWidget* = 0 );
@@ -61,7 +62,7 @@ protected:
   int                       defaultValue() const;
   bool                      checkRange( const int ) const;
 
-  bool                      findVariable( const QString&, int& ) const;
+  SearchState               findVariable( const QString&, int& ) const;
 
 protected:
   virtual void              keyPressEvent( QKeyEvent* );