-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <Config_Keywords.h>
ModuleBase_WidgetDoubleValue::ModuleBase_WidgetDoubleValue(QWidget* theParent,
const Config_WidgetAPI* theData)
- : ModuleBase_ModelWidget(theParent, theData)
+ : ModuleBase_ModelWidget(theParent, theData), myHasDefault(false)
{
QFormLayout* aControlLay = new QFormLayout(this);
ModuleBase_Tools::adjustMargins(aControlLay);
mySpinBox->setSingleStep(aStepVal);
}
- double aDefVal = QString::fromStdString(getDefaultValue()).toDouble(&isOk);
- if (isOk) {
- mySpinBox->setValue(aDefVal);
- }
+ myDefaultVal = QString::fromStdString(getDefaultValue()).toDouble(&myHasDefault);
+ if (myHasDefault)
+ mySpinBox->setValue(myDefaultVal);
QString aTTip = translate(theData->widgetTooltip());
mySpinBox->setToolTip(aTTip);
} else {
ModuleBase_Tools::editParameter(myParameter, aText);
}
- aText = aText.split('=').at(0); // +"=";
+ aText = aText.split('=').at(0);
} else if (myParameter.get()){
// Nullyfy the parameter reference without deletion of the created
myParameter = FeaturePtr();
// 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
+ if (aReal->expressionInvalid()) {
+ aReal->setExpressionError("");
+ aReal->setExpressionInvalid(false);
+ }
aReal->setText("");
aReal->setValue(mySpinBox->value());
}
// aText += aExprAttr->value().c_str();
//}
ModuleBase_Tools::setSpinText(mySpinBox, aText);
- } else {
- ModuleBase_Tools::setSpinValue(mySpinBox, aRef->isInitialized() ? aRef->value() : 0);
+ }
+ else {
+ ModuleBase_Tools::setSpinValue(mySpinBox, aRef->isInitialized() ? aRef->value() : myDefaultVal);
+ if (aRef->isInitialized() && aRef->expressionInvalid()) {
+ aRef->setExpressionError("");
+ aRef->setExpressionInvalid(false);
+ }
+ if ((!aRef->isInitialized()) && myHasDefault)
+ aRef->setValue(myDefaultVal);
}
return true;
}