X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_ParamSpinBox.cpp;h=1fdad51d3682ff889c22d401bd96be370ce285e5;hb=872ac5e3e0196ad70c2a01a79bd070c9a7d4a2e6;hp=64e340fc082f5c6a4cf0f8179b7847af0b98eb85;hpb=ee5964f120cd964f6d7f3bf8147408da023e596e;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_ParamSpinBox.cpp b/src/ModuleBase/ModuleBase_ParamSpinBox.cpp index 64e340fc0..1fdad51d3 100644 --- a/src/ModuleBase/ModuleBase_ParamSpinBox.cpp +++ b/src/ModuleBase/ModuleBase_ParamSpinBox.cpp @@ -65,12 +65,6 @@ void ModuleBase_ParamSpinBox::connectSignalsAndSlots() { connect(this, SIGNAL(valueChanged(const QString&)), this, SLOT(onTextChanged(const QString&))); - - //connect(lineEdit(), SIGNAL(textChanged(const QString&)), - // this, SLOT(onTextChanged(const QString&))); - - //connect(lineEdit(), SIGNAL(textChanged(const QString&)), - // this, SIGNAL(textChanged(const QString&))); } /*! @@ -79,11 +73,6 @@ void ModuleBase_ParamSpinBox::connectSignalsAndSlots() void ModuleBase_ParamSpinBox::onTextChanged(const QString& text) { myTextValue = text; - - double value = 0; - if (isValid(text, value) == Acceptable) { - myCorrectValue = text; - } } /*! @@ -102,6 +91,14 @@ double ModuleBase_ParamSpinBox::valueFromText(const QString& theText) const return aValue; } +QString ModuleBase_ParamSpinBox::textFromValue (double theValue) const +{ + if (hasVariable(myTextValue)){ + return myTextValue; + } + return ModuleBase_DoubleSpinBox::textFromValue(theValue); +} + /*! \brief This function is used to determine whether input is valid. \param str currently entered value @@ -142,8 +139,7 @@ void ModuleBase_ParamSpinBox::setValue(const double value) { ModuleBase_DoubleSpinBox::setValue(value); - myCorrectValue = ModuleBase_DoubleSpinBox::textFromValue(value); - myTextValue = myCorrectValue; + myTextValue = ModuleBase_DoubleSpinBox::textFromValue(value); } /*! @@ -175,7 +171,7 @@ bool ModuleBase_ParamSpinBox::isAcceptVariables() const bool ModuleBase_ParamSpinBox::hasVariable() const { - return hasVariable(text()); + return hasVariable(myTextValue); } bool ModuleBase_ParamSpinBox::hasVariable(const QString& theText) const