X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetBoolValue.cpp;h=d859e0ca878301e1d2da61eca2710d890ccb6bca;hb=06e7f5859095193fc7f498bd89a7d28009794f53;hp=854a93a4801bf4c1ce7c5b0add5bacbf8b01f078;hpb=1a0d48211014d96db9125fe973eacbae895c4490;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetBoolValue.cpp b/src/ModuleBase/ModuleBase_WidgetBoolValue.cpp index 854a93a48..d859e0ca8 100644 --- a/src/ModuleBase/ModuleBase_WidgetBoolValue.cpp +++ b/src/ModuleBase/ModuleBase_WidgetBoolValue.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModuleBase_WidgetBoolValue.cpp -// Created: 04 June 2014 -// Author: Vitaly Smetannikov +// Copyright (C) 2014-2023 CEA, EDF +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include #include @@ -21,17 +34,16 @@ #include ModuleBase_WidgetBoolValue::ModuleBase_WidgetBoolValue(QWidget* theParent, - const Config_WidgetAPI* theData, - const std::string& theParentId) - : ModuleBase_ModelWidget(theParent, theData, theParentId) + const Config_WidgetAPI* theData) +: ModuleBase_ModelWidget(theParent, theData) { - QString aText = QString::fromStdString(theData->widgetLabel()); - QString aToolTip = QString::fromStdString(theData->widgetTooltip()); - bool isChecked = theData->getBooleanAttribute(ATTR_DEFAULT, false); + QString aText = translate(theData->widgetLabel()); + QString aToolTip = translate(theData->widgetTooltip()); + 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); @@ -45,7 +57,7 @@ ModuleBase_WidgetBoolValue::~ModuleBase_WidgetBoolValue() { } -bool ModuleBase_WidgetBoolValue::storeValueCustom() const +bool ModuleBase_WidgetBoolValue::storeValueCustom() { DataPtr aData = myFeature->data(); std::shared_ptr aBool = aData->boolean(attributeID()); @@ -54,15 +66,20 @@ bool ModuleBase_WidgetBoolValue::storeValueCustom() const return true; } -bool ModuleBase_WidgetBoolValue::restoreValue() +bool ModuleBase_WidgetBoolValue::restoreValueCustom() { DataPtr aData = myFeature->data(); 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; }