X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetDoubleValue.cpp;h=3b5b8b455cf0633464499acd892207f194b2d523;hb=e4e611ffb15cda428f0e59ef468e8b199cba3fb6;hp=7400d7f7d48db95bc329456d6a75aa6c7a567282;hpb=689d227220195a03c063e4bdf27ac2f92da06cb0;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp index 7400d7f7d..3b5b8b455 100644 --- a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp +++ b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp @@ -1,52 +1,70 @@ -// File: ModuleBase_Widgets.h -// Created: 04 June 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 -#include -#include +#include +#include #include #include +#include -#include -#include - -#include -#include +#include +#include +#include +#include -#include -#include +#include #include -#include -#include +#include +#include +#include +#include -#include +#include #ifndef DBL_MAX -#define DBL_MAX 1.7976931348623158e+308 +#define DBL_MAX 1.7976931348623158e+308 #endif #ifdef _DEBUG #include #endif +//#define DEBUG_COMPLETE_WITH_PARAMETERS + ModuleBase_WidgetDoubleValue::ModuleBase_WidgetDoubleValue(QWidget* theParent, - const Config_WidgetAPI* theData, - const std::string& theParentId) - : ModuleBase_ModelWidget(theParent, theData, theParentId) + const Config_WidgetAPI* theData) + : ModuleBase_ModelWidget(theParent, theData) { - myContainer = new QWidget(theParent); - QHBoxLayout* aControlLay = new QHBoxLayout(myContainer); + QFormLayout* aControlLay = new QFormLayout(this); ModuleBase_Tools::adjustMargins(aControlLay); - QString aLabelText = QString::fromStdString(theData->widgetLabel()); + QString aLabelText = translate(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)); - aControlLay->addWidget(myLabel); + myLabel->setPixmap(ModuleBase_IconFactory::loadPixmap(aLabelIcon)); + + bool aAcceptVariables = theData->getBooleanAttribute(DOUBLE_WDG_ACCEPT_EXPRESSIONS, true); - mySpinBox = new ModuleBase_DoubleSpinBox(myContainer); + mySpinBox = new ModuleBase_ParamSpinBox(this); + mySpinBox->setAcceptVariables(aAcceptVariables); QString anObjName = QString::fromStdString(attributeID()); mySpinBox->setObjectName(anObjName); @@ -77,51 +95,104 @@ ModuleBase_WidgetDoubleValue::ModuleBase_WidgetDoubleValue(QWidget* theParent, mySpinBox->setSingleStep(aStepVal); } - aProp = theData->getProperty(ANY_WDG_DEFAULT); - double aDefVal = QString::fromStdString(aProp).toDouble(&isOk); + double aDefVal = QString::fromStdString(getDefaultValue()).toDouble(&isOk); if (isOk) { mySpinBox->setValue(aDefVal); - } else if (aProp == DOUBLE_WDG_DEFAULT_COMPUTED){ - myIsComputedDefault = true; } - QString aTTip = QString::fromStdString(theData->widgetTooltip()); + QString aTTip = translate(theData->widgetTooltip()); mySpinBox->setToolTip(aTTip); + myLabel->setToolTip(aTTip); - aControlLay->addWidget(mySpinBox); - aControlLay->setStretch(1, 1); - - connect(mySpinBox, SIGNAL(valueChanged(double)), this, SIGNAL(valuesChanged())); + aControlLay->addRow(myLabel, mySpinBox); + // we should listen textChanged signal as valueChanged do not send when text is modified + connect(mySpinBox, SIGNAL(textChanged(const QString&)), this, SIGNAL(valuesModified())); + mySpinBox->setValueEnabled(isValueEnabled()); } ModuleBase_WidgetDoubleValue::~ModuleBase_WidgetDoubleValue() { } -bool ModuleBase_WidgetDoubleValue::storeValue() const +void ModuleBase_WidgetDoubleValue::activateCustom() +{ + ModuleBase_ModelWidget::activateCustom(); +#ifdef DEBUG_COMPLETE_WITH_PARAMETERS + QStringList aParameters; + ModuleBase_Tools::getParameters(aParameters); + mySpinBox->setCompletionList(aParameters); +#endif +} + +bool ModuleBase_WidgetDoubleValue::resetCustom() +{ + bool aDone = false; + if (!isUseReset() || isComputedDefault() || mySpinBox->hasVariable()) { + aDone = false; + } else { + bool isOk; + double aDefValue = QString::fromStdString(getDefaultValue()).toDouble(&isOk); + // reset the value just if there is a default value definition in the XML definition + // if the value can not be found by the default value, do nothing + if (isOk) { + ModuleBase_Tools::setSpinValue(mySpinBox, aDefValue); + storeValue(); + aDone = true; + } + } + return aDone; +} + +bool ModuleBase_WidgetDoubleValue::storeValueCustom() { DataPtr aData = myFeature->data(); AttributeDoublePtr aReal = aData->real(attributeID()); - aReal->setValue(mySpinBox->value()); + if (mySpinBox->hasVariable()) { + // Here is a text of a real value or an expression. + std::string aText = mySpinBox->text().toStdString(); + aReal->setText(aText); + } else { + // it is important to set the empty text value to the attribute before set the value + // because setValue tries to calculate the attribute value according to the + // attribute current text + aReal->setText(""); + aReal->setValue(mySpinBox->value()); + } updateObject(myFeature); return true; } -bool ModuleBase_WidgetDoubleValue::restoreValue() +bool ModuleBase_WidgetDoubleValue::restoreValueCustom() { DataPtr aData = myFeature->data(); AttributeDoublePtr aRef = aData->real(attributeID()); - - bool isBlocked = mySpinBox->blockSignals(true); - mySpinBox->setValue(aRef->value()); - mySpinBox->blockSignals(isBlocked); - + std::string aTextRepr = aRef->text(); + if (!aTextRepr.empty()) { + ModuleBase_Tools::setSpinText(mySpinBox, QString::fromStdString(aTextRepr)); + } else { + ModuleBase_Tools::setSpinValue(mySpinBox, aRef->isInitialized() ? aRef->value() : 0); + } return true; } +void ModuleBase_WidgetDoubleValue::selectContent() +{ + mySpinBox->selectAll(); +} + QList ModuleBase_WidgetDoubleValue::getControls() const { QList aList; aList.append(mySpinBox); return aList; } + +bool ModuleBase_WidgetDoubleValue::processEnter() +{ + bool isModified = getValueState() == ModifiedInPP; + if (isModified) { + emit valuesChanged(); + mySpinBox->selectAll(); + } + return isModified; +}