-// 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 <ModuleBase_WidgetIntValue.h>
ModuleBase_WidgetIntValue::ModuleBase_WidgetIntValue(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);
}
- myDefVal = QString::fromStdString(getDefaultValue()).toInt(&isOk);
- if (isOk)
+ myDefVal = QString::fromStdString(getDefaultValue()).toInt(&myHasDefault);
+ if (myHasDefault)
mySpinBox->setValue(myDefVal);
- else
- myDefVal = 0;
QString aTTip = translate(theData->widgetTooltip());
mySpinBox->setToolTip(aTTip);
ModuleBase_Tools::setSpinText(mySpinBox, aText);
} else {
ModuleBase_Tools::setSpinValue(mySpinBox,
- anAttribute->isInitialized() ? anAttribute->value() : 0);
+ anAttribute->isInitialized() ? anAttribute->value() : myDefVal);
if (anAttribute->isInitialized() && anAttribute->expressionInvalid()) {
anAttribute->setExpressionError("");
anAttribute->setExpressionInvalid(false);
}
- if (!anAttribute->isInitialized())
+ if ((!anAttribute->isInitialized()) && myHasDefault)
anAttribute->setValue(myDefVal);
}
return true;