X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetDoubleValue.cpp;h=47799fc54eb11866cf5dff6b98b0588bed58b130;hb=857b1f72d9703c46c6c8c9bb239821d314344c86;hp=230f49220cbbd82e49947eb811b51776e80cd77f;hpb=9c710f79194400664d41e147a7c783b86c906d53;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp index 230f49220..47799fc54 100644 --- a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp +++ b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: ModuleBase_Widgets.h +// File: ModuleBase_WidgetDoubleValue.cpp // Created: 04 June 2014 // Author: Vitaly Smetannikov @@ -104,7 +104,7 @@ bool ModuleBase_WidgetDoubleValue::reset() // if the double value can not be found by the default value, do nothing if (isOk) { ModuleBase_Tools::setSpinValue(mySpinBox, aDefValue); - storeValueCustom(); + storeValue(); aDone = true; } } @@ -115,19 +115,22 @@ bool ModuleBase_WidgetDoubleValue::storeValueCustom() const { DataPtr aData = myFeature->data(); AttributeDoublePtr aReal = aData->real(attributeID()); - if (!mySpinBox->hasVariable()) { - aReal->setValue(mySpinBox->value()); - aReal->setText(""); - } else { + if (mySpinBox->hasVariable()) { // Here is a text of a real value or an expression. std::string aText = mySpinBox->text().toStdString(); aReal->setText(aText); + } else { + // it is important to set the empty text value to the attribute before set the value + // because setValue tries to calculate the attribute value according to the + // attribute current text + aReal->setText(""); + aReal->setValue(mySpinBox->value()); } updateObject(myFeature); return true; } -bool ModuleBase_WidgetDoubleValue::restoreValue() +bool ModuleBase_WidgetDoubleValue::restoreValueCustom() { DataPtr aData = myFeature->data(); AttributeDoublePtr aRef = aData->real(attributeID());