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();
// 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;
}