Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for the issue #910: never fully remove the results, just make them disabled when...
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_WidgetDoubleValue.cpp
diff --git
a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
index 82a8800b3232b435e0ee7ca6928ffc0aa83a0b13..47799fc54eb11866cf5dff6b98b0588bed58b130 100644
(file)
--- a/
src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
+++ b/
src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
@@
-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);
// if the double value can not be found by the default value, do nothing
if (isOk) {
ModuleBase_Tools::setSpinValue(mySpinBox, aDefValue);
- storeValue
Custom
();
+ storeValue();
aDone = true;
}
}
aDone = true;
}
}
@@
-115,22
+115,22
@@
bool ModuleBase_WidgetDoubleValue::storeValueCustom() const
{
DataPtr aData = myFeature->data();
AttributeDoublePtr aReal = aData->real(attributeID());
{
DataPtr aData = myFeature->data();
AttributeDoublePtr aReal = aData->real(attributeID());
- if (!mySpinBox->hasVariable()) {
+ 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
// it is important to set the empty text value to the attribute before set the value
- // because setValue tries to calculate the attr
ubyte baky
e according to the
+ // because setValue tries to calculate the attr
ibute valu
e according to the
// attribute current text
aReal->setText("");
aReal->setValue(mySpinBox->value());
// attribute current text
aReal->setText("");
aReal->setValue(mySpinBox->value());
- } else {
- // Here is a text of a real value or an expression.
- std::string aText = mySpinBox->text().toStdString();
- aReal->setText(aText);
}
updateObject(myFeature);
return true;
}
}
updateObject(myFeature);
return true;
}
-bool ModuleBase_WidgetDoubleValue::restoreValue()
+bool ModuleBase_WidgetDoubleValue::restoreValue
Custom
()
{
DataPtr aData = myFeature->data();
AttributeDoublePtr aRef = aData->real(attributeID());
{
DataPtr aData = myFeature->data();
AttributeDoublePtr aRef = aData->real(attributeID());