Method isEmpty corrected.

diff --git a/src/QDS/QDS_SpinBox.cxx b/src/QDS/QDS_SpinBox.cxx
index d25322c3f0b29b4af6e51d7cba40f21f17abddb4..b77aa8ba0759b8f0e85ad3dcd1d622b05a782ae8 100644 (file)
--- a/src/QDS/QDS_SpinBox.cxx
+++ b/src/QDS/QDS_SpinBox.cxx
@@ -1,6 +1,7 @@
 #include "QDS_SpinBox.h"
 
-#include <qspinbox.h>
+#include <QtxIntSpinBox.h>
+
 #include <qvalidator.h>
 
 /*!
@@ -24,8 +25,8 @@ QDS_SpinBox::~QDS_SpinBox()
 QString QDS_SpinBox::getString() const
 {
   QString res;
-  QSpinBox* aSpinBox = spinBox();
-  if ( aSpinBox )
+  QtxIntSpinBox* aSpinBox = spinBox();
+  if ( aSpinBox && !aSpinBox->isCleared() )
   {
     res = aSpinBox->text();
     if ( !aSpinBox->suffix().isEmpty() )
@@ -41,16 +42,20 @@ QString QDS_SpinBox::getString() const
 */
 void QDS_SpinBox::setString( const QString& txt )
 {
-  if ( spinBox() )
+  if ( !spinBox() )
+    return;
+
+  spinBox()->setCleared( txt.isEmpty() );
+  if ( !txt.isEmpty() )
     spinBox()->setValue( txt.toInt() );
 }
 
 /*!
   Returns pointer to QSpinBox widget.
 */
-QSpinBox* QDS_SpinBox::spinBox() const
+QtxIntSpinBox* QDS_SpinBox::spinBox() const
 {
-  return ::qt_cast<QSpinBox*>( controlWidget() );
+  return ::qt_cast<QtxIntSpinBox*>( controlWidget() );
 }
 
 /*!
@@ -58,7 +63,7 @@ QSpinBox* QDS_SpinBox::spinBox() const
 */
 QWidget* QDS_SpinBox::createControl( QWidget* parent )
 {
-  QSpinBox* aSpinBox = new QSpinBox( parent );
+  QtxIntSpinBox* aSpinBox = new QtxIntSpinBox( parent );
   aSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
   connect( aSpinBox, SIGNAL( valueChanged( int ) ), this, SLOT( onValueChanged( int ) ) );
   return aSpinBox;

diff --git a/src/QDS/QDS_SpinBox.h b/src/QDS/QDS_SpinBox.h
index d6490edbf8eefafe578f5b94b13918b7af8cb541..f018ddfb80ae797a416123681e3e0e6d68a11482 100644 (file)
--- a/src/QDS/QDS_SpinBox.h
+++ b/src/QDS/QDS_SpinBox.h
@@ -3,7 +3,7 @@
 
 #include "QDS_Datum.h"
 
-class QSpinBox;
+class QtxIntSpinBox;
 
 class QDS_EXPORT QDS_SpinBox : public QDS_Datum
 {
@@ -20,7 +20,7 @@ private slots:
   void             onValueChanged( int );
 
 protected:
-  QSpinBox*        spinBox() const;
+  QtxIntSpinBox*   spinBox() const;
 
   virtual QWidget* createControl( QWidget* );
 

diff --git a/src/QDS/QDS_SpinBoxDbl.cxx b/src/QDS/QDS_SpinBoxDbl.cxx
index 42d1e2f9e9be6179e05877fb5e80f1e75f53ad78..92ffe65c8a606bc696c067a73d8804a3c066b8ee 100644 (file)
--- a/src/QDS/QDS_SpinBoxDbl.cxx
+++ b/src/QDS/QDS_SpinBoxDbl.cxx
@@ -28,7 +28,7 @@ QString QDS_SpinBoxDbl::getString() const
 {
   QString res;
   QtxDblSpinBox* sb = spinBox();
-  if ( sb )
+  if ( sb && !sb->isCleared() )
   {
     bool hasFocus = sb->hasFocus();
     if ( hasFocus )
@@ -52,12 +52,16 @@ QString QDS_SpinBoxDbl::getString() const
 */
 void QDS_SpinBoxDbl::setString( const QString& txt )
 {
-  if ( spinBox() )
+  if ( !spinBox() )
+    return;
+
+  spinBox()->setCleared( txt.isEmpty() );
+  if ( !txt.isEmpty() )
     spinBox()->setValue( txt.toDouble() );
 }
 
 /*!
-  Returns pointer to XMLGUI_SpinBoxDbl widget.
+  Returns pointer to QtxDblSpinBox widget.
 */
 QtxDblSpinBox* QDS_SpinBoxDbl::spinBox() const
 {