X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModuleBase%2FModuleBase_WidgetBoolValue.cpp;h=81d8241a31cb757a9a7153e4b233d6c9593ab13d;hb=bbf6e2c75c79cb80729eb85baecf4d1a17dd7ed8;hp=a36aa614b83d6593a2f8fed5be5b38603d84820a;hpb=87b6a30a3afb8fb32e7e43ade8d9c947d9eb1684;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetBoolValue.cpp b/src/ModuleBase/ModuleBase_WidgetBoolValue.cpp index a36aa614b..81d8241a3 100644 --- a/src/ModuleBase/ModuleBase_WidgetBoolValue.cpp +++ b/src/ModuleBase/ModuleBase_WidgetBoolValue.cpp @@ -1,4 +1,4 @@ -// 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 @@ -12,10 +12,9 @@ // // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -40,11 +39,11 @@ ModuleBase_WidgetBoolValue::ModuleBase_WidgetBoolValue(QWidget* theParent, { QString aText = translate(theData->widgetLabel()); QString aToolTip = translate(theData->widgetTooltip()); - bool isChecked = theData->getBooleanAttribute(ATTR_DEFAULT, false); + myDefVal = theData->getBooleanAttribute(ATTR_DEFAULT, false); myCheckBox = new QCheckBox(aText, this); myCheckBox->setToolTip(aToolTip); - myCheckBox->setChecked(isChecked); + myCheckBox->setChecked(myDefVal); QVBoxLayout* aMainLayout = new QVBoxLayout(this); ModuleBase_Tools::adjustMargins(aMainLayout); @@ -73,9 +72,14 @@ bool ModuleBase_WidgetBoolValue::restoreValueCustom() std::shared_ptr aRef = aData->boolean(attributeID()); bool isBlocked = myCheckBox->blockSignals(true); - myCheckBox->setChecked(aRef->value()); + if (aRef->isInitialized()) { + myCheckBox->setChecked(aRef->value()); + } + else { + myCheckBox->setChecked(myDefVal); + aRef->setValue(myDefVal); + } myCheckBox->blockSignals(isBlocked); - return true; }