X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetChoice.cpp;h=83537b71d3bcf293047252fea682769153a22c48;hb=c8e35a67c60489a46aaf7c8ff75001511ac2635b;hp=7156a0f453e1e1e32911853ff0f82bc1a1117aa5;hpb=3874b57fe5aba25ff5aee2a07654fc23c1ee8eb0;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetChoice.cpp b/src/ModuleBase/ModuleBase_WidgetChoice.cpp index 7156a0f45..83537b71d 100644 --- a/src/ModuleBase/ModuleBase_WidgetChoice.cpp +++ b/src/ModuleBase/ModuleBase_WidgetChoice.cpp @@ -21,18 +21,17 @@ ModuleBase_WidgetChoice::ModuleBase_WidgetChoice(QWidget* theParent, const std::string& theParentId) : ModuleBase_ModelWidget(theParent, theData, theParentId) { - myContainer = new QWidget(theParent); - QHBoxLayout* aLayout = new QHBoxLayout(myContainer); + QHBoxLayout* aLayout = new QHBoxLayout(this); ModuleBase_Tools::adjustMargins(aLayout); QString aLabelText = QString::fromStdString(theData->widgetLabel()); QString aLabelIcon = QString::fromStdString(theData->widgetIcon()); - myLabel = new QLabel(aLabelText, myContainer); + myLabel = new QLabel(aLabelText, this); if (!aLabelIcon.isEmpty()) myLabel->setPixmap(QPixmap(aLabelIcon)); aLayout->addWidget(myLabel); - myCombo = new QComboBox(myContainer); + myCombo = new QComboBox(this); aLayout->addWidget(myCombo, 1); std::string aTypes = theData->getProperty("string_list"); @@ -46,7 +45,7 @@ ModuleBase_WidgetChoice::~ModuleBase_WidgetChoice() { } -bool ModuleBase_WidgetChoice::storeValue() const +bool ModuleBase_WidgetChoice::storeValueCustom() const { DataPtr aData = myFeature->data(); std::shared_ptr aIntAttr = aData->integer(attributeID());