X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetChoice.cpp;h=7ef0cfb540f37b5c824e455c2b53eafe3da49fef;hb=613e672654df0f1e6838fb55b384842ce534809a;hp=d837c4f38b10efcf2ef81d38730bbaa74ec291db;hpb=4d6bb9de0e54f09a9bbacc94a058cb7cd437d535;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetChoice.cpp b/src/ModuleBase/ModuleBase_WidgetChoice.cpp index d837c4f38..7ef0cfb54 100644 --- a/src/ModuleBase/ModuleBase_WidgetChoice.cpp +++ b/src/ModuleBase/ModuleBase_WidgetChoice.cpp @@ -1,15 +1,32 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModuleBase_WidgetChoice.cpp -// Created: 03 Sept 2014 -// Author: Vitaly Smetannikov +// Copyright (C) 2014-2017 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 +// 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 "ModuleBase_WidgetChoice.h" -#include +#include "ModuleBase_Tools.h" +#include "ModuleBase_IconFactory.h" #include +#include #include #include +#include #include #include @@ -20,20 +37,31 @@ #include #include - -ModuleBase_WidgetChoice::ModuleBase_WidgetChoice(QWidget* theParent, - const Config_WidgetAPI* theData, - const std::string& theParentId) - : ModuleBase_ModelWidget(theParent, theData, theParentId), myCombo(0), myButtons(0) +ModuleBase_WidgetChoice::ModuleBase_WidgetChoice(QWidget* theParent, + const Config_WidgetAPI* theData) +: ModuleBase_ModelWidget(theParent, theData), myCombo(0), myButtons(0) { QHBoxLayout* aLayout = new QHBoxLayout(this); ModuleBase_Tools::adjustMargins(aLayout); - QString aLabelText = QString::fromStdString(theData->widgetLabel()); + QString aLabelText = translate(theData->widgetLabel()); QString aLabelIcon = QString::fromStdString(theData->widgetIcon()); std::string aTypes = theData->getProperty("string_list"); - QStringList aList = QString(aTypes.c_str()).split(' '); + QStringList aList; + + foreach(QString aType, QString(aTypes.c_str()).split(' ')) { + aList.append(translate(aType.toStdString())); + } + if (aTypes.empty()) { + myStringListAttribute = theData->getProperty("string_list_attribute"); + if (!myStringListAttribute.empty()) + aList.clear(); + } + if (theData->getBooleanAttribute("use_in_title", false)) + myButtonTitles = aList; + bool aHasDefaultValue; + int aDefaultVal = QString::fromStdString(getDefaultValue()).toInt(&aHasDefaultValue); // Widget type can be combobox or radiobuttons std::string aWgtType = theData->getProperty("widget_type"); if ((aWgtType.length() > 0) && (aWgtType == "radiobuttons")) { @@ -46,7 +74,7 @@ ModuleBase_WidgetChoice::ModuleBase_WidgetChoice(QWidget* theParent, std::string aWgtDir = theData->getProperty("buttons_dir"); if (aWgtDir == "horizontal") aBtnLayout = new QHBoxLayout(aGroupBox); - else + else aBtnLayout = new QVBoxLayout(aGroupBox); ModuleBase_Tools::adjustMargins(aBtnLayout); @@ -60,10 +88,10 @@ ModuleBase_WidgetChoice::ModuleBase_WidgetChoice(QWidget* theParent, aBtn->setCheckable(true); aBtn->setToolTip(aBtnTxt); - QPixmap aIcon(aIconList.at(aId)); + QPixmap aIcon = ModuleBase_IconFactory::loadPixmap(aIconList.at(aId)); aBtn->setIcon(aIcon); aBtn->setIconSize(aIcon.size()); - + aBtnLayout->addWidget(aBtn); myButtons->addButton(aBtn, aId++); } @@ -76,13 +104,13 @@ ModuleBase_WidgetChoice::ModuleBase_WidgetChoice(QWidget* theParent, myButtons->addButton(aBtn, aId++); } } - myButtons->button(0)->setChecked(true); + int aCheckedId = aHasDefaultValue ? aDefaultVal : 0; + myButtons->button(aDefaultVal)->setChecked(true); connect(myButtons, SIGNAL(buttonClicked(int)), this, SLOT(onCurrentIndexChanged(int))); - connect(myButtons, SIGNAL(buttonClicked(int)), this, SIGNAL(itemSelected(int))); } else { myLabel = new QLabel(aLabelText, this); if (!aLabelIcon.isEmpty()) - myLabel->setPixmap(QPixmap(aLabelIcon)); + myLabel->setPixmap(ModuleBase_IconFactory::loadPixmap(aLabelIcon)); aLayout->addWidget(myLabel); std::string aToolstr = theData->widgetTooltip(); @@ -92,19 +120,21 @@ ModuleBase_WidgetChoice::ModuleBase_WidgetChoice(QWidget* theParent, myCombo = new QComboBox(this); aLayout->addWidget(myCombo, 1); - + myCombo->addItems(aList); + if (aHasDefaultValue && aDefaultVal < aList.size()) + myCombo->setCurrentIndex(aDefaultVal); + connect(myCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(onCurrentIndexChanged(int))); - connect(myCombo, SIGNAL(currentIndexChanged(int)), this, SIGNAL(itemSelected(int))); } } ModuleBase_WidgetChoice::~ModuleBase_WidgetChoice() { } - -bool ModuleBase_WidgetChoice::storeValueCustom() const + +bool ModuleBase_WidgetChoice::storeValueCustom() { DataPtr aData = myFeature->data(); std::shared_ptr aIntAttr = aData->integer(attributeID()); @@ -125,13 +155,27 @@ bool ModuleBase_WidgetChoice::restoreValueCustom() if (aIntAttr->value() != -1) { if (myCombo) { bool isBlocked = myCombo->blockSignals(true); + if (myCombo->count() == 0 && !myStringListAttribute.empty()) { + AttributeStringArrayPtr aStrAttr = aData->stringArray(myStringListAttribute); + if (aStrAttr) { + for (int i = 0; i < aStrAttr->size(); i++) { + myCombo->insertItem(i, aStrAttr->value(i).c_str()); + } + } + } myCombo->setCurrentIndex(aIntAttr->value()); myCombo->blockSignals(isBlocked); } else { bool isBlocked = myButtons->blockSignals(true); - myButtons->button(aIntAttr->value())->setChecked(true); + if (aIntAttr->isInitialized()) + myButtons->button(aIntAttr->value())->setChecked(true); + else { + bool aHasDefaultValue; + int aDefaultVal = QString::fromStdString(getDefaultValue()).toInt(&aHasDefaultValue); + myButtons->button(aHasDefaultValue ? aDefaultVal : 0)->setChecked(true); + } myButtons->blockSignals(isBlocked); - emit itemSelected(aIntAttr->value()); + emit itemSelected(this, aIntAttr->value()); } } return true; @@ -159,9 +203,19 @@ QList ModuleBase_WidgetChoice::getControls() const return aControls; } +QString ModuleBase_WidgetChoice::getPropertyPanelTitle(int theIndex) +{ + QString aTitle; + if (myButtonTitles.length() > theIndex) + aTitle = myButtonTitles[theIndex]; + return aTitle; +} + void ModuleBase_WidgetChoice::onCurrentIndexChanged(int theIndex) { emit valuesChanged(); // Don't transfer focus // emit focusOutWidget(this); + + emit itemSelected(this, theIndex); }