X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetChoice.cpp;h=ea04160b52f36ff0e1af50ffa770e24f68448f57;hb=ca925f26180f15699a77e76461679f11abd499ba;hp=c89508324c86fb47807bb34de494e79ef99ac2f5;hpb=1b93f1881c5fec599aa79707f93c84dd9c287bc0;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetChoice.cpp b/src/ModuleBase/ModuleBase_WidgetChoice.cpp index c89508324..ea04160b5 100644 --- a/src/ModuleBase/ModuleBase_WidgetChoice.cpp +++ b/src/ModuleBase/ModuleBase_WidgetChoice.cpp @@ -1,61 +1,117 @@ -// 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 "ModuleBase_ChoiceCtrl.h" #include +#include #include #include +#include #include #include #include #include +#include +#include +#include +#include + +static QMap defaultValues; -ModuleBase_WidgetChoice::ModuleBase_WidgetChoice(QWidget* theParent, - const Config_WidgetAPI* theData, - const std::string& theParentId) - : ModuleBase_ModelWidget(theParent, theData, theParentId) +ModuleBase_WidgetChoice::ModuleBase_WidgetChoice(QWidget* theParent, + const Config_WidgetAPI* theData) +: ModuleBase_ModelWidget(theParent, theData), myIsFirst(true) { - QHBoxLayout* aLayout = new QHBoxLayout(this); - ModuleBase_Tools::adjustMargins(aLayout); + myHasValue = defaultValues.contains(myFeatureId + attributeID()); + if (myHasValue) + myDefValue = defaultValues[myFeatureId + attributeID()]; + else + myDefValue = 0; - QString aLabelText = QString::fromStdString(theData->widgetLabel()); + QString aLabelText = translate(theData->widgetLabel()); QString aLabelIcon = QString::fromStdString(theData->widgetIcon()); - myLabel = new QLabel(aLabelText, this); - if (!aLabelIcon.isEmpty()) - myLabel->setPixmap(QPixmap(aLabelIcon)); - aLayout->addWidget(myLabel); + std::string aTypes = theData->getProperty("string_list"); + QStringList aList; - std::string aToolstr = theData->widgetTooltip(); - if (!aToolstr.empty()) { - myLabel->setToolTip(QString::fromStdString(aToolstr)); + 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; - myCombo = new QComboBox(this); - aLayout->addWidget(myCombo, 1); - - std::string aTypes = theData->getProperty("string_list"); - QStringList aList = QString(aTypes.c_str()).split(' '); - myCombo->addItems(aList); + bool aHasDefaultValue; + int aDefaultVal = QString::fromStdString(getDefaultValue()).toInt(&aHasDefaultValue); + + // Widget type can be combobox or radiobuttons + std::string aWgtType = theData->getProperty("widget_type"); + std::string aIcons = theData->getProperty("icons_list"); + QStringList aIconList = QString(aIcons.c_str()).split(' '); + + std::string aWgtDir = theData->getProperty("buttons_dir"); + + QHBoxLayout* aLayout = new QHBoxLayout(this); + myChoiceCtrl = new ModuleBase_ChoiceCtrl(this, aList, aIconList, + (aWgtType == "radiobuttons")? ModuleBase_ChoiceCtrl::RadioButtons : + ModuleBase_ChoiceCtrl::ComboBox, + (aWgtDir == "horizontal")? Qt::Horizontal : Qt::Vertical); + myChoiceCtrl->setLabel(aLabelText); + + if (!aLabelIcon.isEmpty()) + myChoiceCtrl->setLabelIcon(aLabelIcon); - connect(myCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(onCurrentIndexChanged(int))); + connect(myChoiceCtrl, SIGNAL(valueChanged(int)), this, SLOT(onCurrentIndexChanged(int))); + + int aCheckedId = aHasDefaultValue ? aDefaultVal : 0; + myChoiceCtrl->setValue(aCheckedId); + aLayout->addWidget(myChoiceCtrl); } ModuleBase_WidgetChoice::~ModuleBase_WidgetChoice() { } - -bool ModuleBase_WidgetChoice::storeValueCustom() const + +bool ModuleBase_WidgetChoice::storeValueCustom() { DataPtr aData = myFeature->data(); std::shared_ptr aIntAttr = aData->integer(attributeID()); - aIntAttr->setValue(myCombo->currentIndex()); + int aCase = 0; + if (myIsFirst) + aCase = myHasValue? myDefValue : myChoiceCtrl->value(); + else + aCase = myChoiceCtrl->value(); + + aIntAttr->setValue(aCase); + myDefValue = aCase; + myIsFirst = false; + updateObject(myFeature); return true; } @@ -65,23 +121,49 @@ bool ModuleBase_WidgetChoice::restoreValueCustom() DataPtr aData = myFeature->data(); std::shared_ptr aIntAttr = aData->integer(attributeID()); - bool isBlocked = myCombo->blockSignals(true); - myCombo->setCurrentIndex(aIntAttr->value()); - myCombo->blockSignals(isBlocked); + if (aIntAttr->value() != -1) { + bool isBlocked = myChoiceCtrl->blockSignals(true); + if (!myStringListAttribute.empty()) { + AttributeStringArrayPtr aStrAttr = aData->stringArray(myStringListAttribute); + QStringList aChoiceList; + if (aStrAttr) { + for (int i = 0; i < aStrAttr->size(); i++) { + aChoiceList << aStrAttr->value(i).c_str(); + } + myChoiceCtrl->setChoiceList(aChoiceList); + } + } + if (aIntAttr->isInitialized()) + myChoiceCtrl->setValue(aIntAttr->value()); + else { + bool aHasDefaultValue; + int aDefaultVal = QString::fromStdString(getDefaultValue()).toInt(&aHasDefaultValue); + myChoiceCtrl->setValue(aHasDefaultValue ? aDefaultVal : 0); + } + myChoiceCtrl->blockSignals(isBlocked); + emit itemSelected(this, aIntAttr->value()); + myDefValue = aIntAttr->value(); + myIsFirst = false; + } return true; } bool ModuleBase_WidgetChoice::focusTo() { - myCombo->setFocus(); - return true; + return myChoiceCtrl->focusTo(); } QList ModuleBase_WidgetChoice::getControls() const { - QList aControls; - aControls.append(myCombo); - return aControls; + return myChoiceCtrl->getControls(); +} + +QString ModuleBase_WidgetChoice::getPropertyPanelTitle(int theIndex) +{ + QString aTitle; + if (myButtonTitles.length() > theIndex) + aTitle = myButtonTitles[theIndex]; + return aTitle; } void ModuleBase_WidgetChoice::onCurrentIndexChanged(int theIndex) @@ -89,4 +171,11 @@ void ModuleBase_WidgetChoice::onCurrentIndexChanged(int theIndex) emit valuesChanged(); // Don't transfer focus // emit focusOutWidget(this); + + emit itemSelected(this, theIndex); +} + +void ModuleBase_WidgetChoice::onFeatureAccepted() +{ + defaultValues[myFeatureId + attributeID()] = myDefValue; }