X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_DoubleSpinBox.cpp;h=dba8c5d0f22aec40deef9ddff35ad64c8fd30f56;hb=f96e7958a6b68c45e722aea764ecc075d0797233;hp=d85ad9897385d7a1d21529881b9a0180782247d7;hpb=00539c245cd740157cfe2258d3e17337c86c963c;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_DoubleSpinBox.cpp b/src/ModuleBase/ModuleBase_DoubleSpinBox.cpp
index d85ad9897..dba8c5d0f 100644
--- a/src/ModuleBase/ModuleBase_DoubleSpinBox.cpp
+++ b/src/ModuleBase/ModuleBase_DoubleSpinBox.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:      ModuleBase_DoubleSpinBox.cxx
 // Author:    Sergey TELKOV
 //
@@ -6,6 +8,7 @@
 #include <QLineEdit>
 #include <QDoubleValidator>
 #include <QVariant>
+#include <QKeyEvent>
 
 #include <limits>
 
@@ -34,7 +37,7 @@ const double PSEUDO_ZERO = 1.e-20;
  \endcode
 
  Another useful feature is possibility to use scientific notation (e.g. 1.234e+18)
- for the widegt text. To enable this, negative precision should be specified either
+ for the widget text. To enable this, negative precision should be specified either
  through a constructor or using setPrecision() method.
 
  Note that "decimals" property of QDoubleSpinBox is almost completely substituted
@@ -50,14 +53,16 @@ const double PSEUDO_ZERO = 1.e-20;
  a step value of 1.0 and a precision of 2 decimal places.
  The value is initially set to 0.00.
 
- \param parent parent object
+ \param theParent parent object
+ \param thePrecision precision of values input
  */
-ModuleBase_DoubleSpinBox::ModuleBase_DoubleSpinBox(QWidget* parent, int thePrecision)
-    : QDoubleSpinBox(parent),
-      myCleared(false)
+ModuleBase_DoubleSpinBox::ModuleBase_DoubleSpinBox(QWidget* theParent, int thePrecision)
+    : QDoubleSpinBox(theParent),
+      myCleared(false),
+      myIsEmitKeyPressEvent(false)
 {
   // VSR 01/07/2010: Disable thousands separator for spin box
-  // (to avoid incosistency of double-2-string and string-2-double conversion)
+  // (to avoid inconsistency of double-2-string and string-2-double conversion)
   QLocale loc;
   loc.setNumberOptions(loc.numberOptions() | QLocale::OmitGroupSeparator | QLocale::RejectGroupSeparator);
   setLocale(loc);
@@ -68,7 +73,7 @@ ModuleBase_DoubleSpinBox::ModuleBase_DoubleSpinBox(QWidget* parent, int thePreci
   // Use precision equal to default Qt decimals
   // it's necessary to set decimals before the range setting,
   // by default Qt rounds boundaries to 2 decimals at setRange
-  setDecimals(thePrecision);
+  setDecimals(qAbs(myPrecision));
 
   connect(lineEdit(), SIGNAL(textChanged( const QString& )), this,
           SLOT(onTextChanged( const QString& )));
@@ -116,8 +121,8 @@ void ModuleBase_DoubleSpinBox::setCleared(const bool on)
  */
 void ModuleBase_DoubleSpinBox::setPrecision(const int prec)
 {
-  int newPrec = qMax(prec, 0);
-  int oldPrec = qMax(myPrecision, 0);
+  int newPrec = qAbs(prec);
+  int oldPrec = qAbs(myPrecision);
   myPrecision = prec;
   if (newPrec != oldPrec)
     update();
@@ -125,7 +130,7 @@ void ModuleBase_DoubleSpinBox::setPrecision(const int prec)
 
 /*!
  \brief Get precision value of the spin box
- \return current prevision value
+ \return current precision value
  \sa setPrecision()
  */
 int ModuleBase_DoubleSpinBox::getPrecision() const
@@ -163,7 +168,7 @@ QString ModuleBase_DoubleSpinBox::textFromValue(double val) const
 
 /*!
  \brief Return source string with removed leading and trailing zeros.
- \param str source string
+ \param src source string
  \return resulting string
  */
 QString ModuleBase_DoubleSpinBox::removeTrailingZeroes(const QString& src) const
@@ -193,6 +198,42 @@ QString ModuleBase_DoubleSpinBox::removeTrailingZeroes(const QString& src) const
   return res;
 }
 
+void ModuleBase_DoubleSpinBox::keyPressEvent(QKeyEvent* theEvent)
+{
+  switch (theEvent->key()) {
+    case Qt::Key_Enter:
+    case Qt::Key_Return: {
+      // do not react to the Enter key, the property panel processes it
+      if (!myIsEmitKeyPressEvent)
+        return;
+    }
+    break;
+    default:
+      break;
+  }
+  QDoubleSpinBox::keyPressEvent(theEvent);
+}
+
+void ModuleBase_DoubleSpinBox::keyReleaseEvent(QKeyEvent* theEvent)
+{
+  switch (theEvent->key()) {
+    case Qt::Key_Enter:
+    case Qt::Key_Return: {
+      // the enter has already been processed when key is pressed,
+      // key release should not be processed in operation manager
+      if (myIsEmitKeyPressEvent) {
+        theEvent->accept();
+        emit enterReleased();
+        return;
+      }
+    }
+    break;
+    default:
+      break;
+  }
+  QDoubleSpinBox::keyReleaseEvent(theEvent);
+}
+
 /*!
  \brief Perform \a steps increment/decrement steps.
 
@@ -237,6 +278,7 @@ QValidator::State ModuleBase_DoubleSpinBox::validate(QString& str, int& pos) con
   // Otherwise, expect myPrecision digits after the decimal point.
   int decs = myPrecision < 0 ? qAbs(myPrecision) - 1 : myPrecision;
 
+  v.setLocale(this->locale());
   v.setDecimals(decs);
   v.setBottom(minimum());
   v.setTop(maximum());
@@ -267,7 +309,7 @@ QValidator::State ModuleBase_DoubleSpinBox::validate(QString& str, int& pos) con
     }
   }
 
-  // Treat values ouside (min; max) range as Invalid
+  // Treat values outside (min; max) range as Invalid
   // This check is enabled by assigning "strict_validity_check" dynamic property
   // with value "true" to the spin box instance.
   if (state == QValidator::Intermediate) {
@@ -298,9 +340,16 @@ QValidator::State ModuleBase_DoubleSpinBox::validate(QString& str, int& pos) con
 
 /*!
  \brief Called when user enters the text in the spin box.
- \param txt current spin box text (not used)
  */
-void ModuleBase_DoubleSpinBox::onTextChanged(const QString& /*txt*/)
+void ModuleBase_DoubleSpinBox::onTextChanged(const QString& )
 {
   myCleared = false;
 }
+
+bool ModuleBase_DoubleSpinBox::enableKeyPressEvent(const bool& theEnable)
+{
+  bool aPreviousValue = myIsEmitKeyPressEvent;
+  myIsEmitKeyPressEvent = theEnable;
+
+  return aPreviousValue;
+}