X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_DoubleSpinBox.cpp;h=080138f5483b0314722ba314cb4c0ed73a4b7a93;hb=40f3b736db0100d3793d72f22aecf23fb21cbe1b;hp=a8489408dc6bec240b76ccaf602e7552d6523ac5;hpb=7b95df2653284e65f416373ff010af49ee8c68ef;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_DoubleSpinBox.cpp b/src/ModuleBase/ModuleBase_DoubleSpinBox.cpp index a8489408d..080138f54 100644 --- a/src/ModuleBase/ModuleBase_DoubleSpinBox.cpp +++ b/src/ModuleBase/ModuleBase_DoubleSpinBox.cpp @@ -36,7 +36,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 @@ -60,7 +60,7 @@ ModuleBase_DoubleSpinBox::ModuleBase_DoubleSpinBox(QWidget* theParent, int thePr myCleared(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); @@ -71,7 +71,7 @@ ModuleBase_DoubleSpinBox::ModuleBase_DoubleSpinBox(QWidget* theParent, int thePr // 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& ))); @@ -119,8 +119,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(); @@ -128,7 +128,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 @@ -240,6 +240,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()); @@ -270,7 +271,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) {