X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetDoubleValue.cpp;h=54cc1d3ce5397a74eed863845a6cf02472a029ff;hb=322bc04c30609d50bd763a8dbe014284d0f0e8d6;hp=a17ea26c9793ee4a8c3acab86dc7f5df40b0646b;hpb=541121bdd224916e37b61175542333b6ed5d69b4;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp index a17ea26c9..54cc1d3ce 100644 --- a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp +++ b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp @@ -1,53 +1,75 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModuleBase_Widgets.h -// Created: 04 June 2014 -// Author: Vitaly Smetannikov - -#include -#include -#include - -#include -#include -#include +// Copyright (C) 2014-2019 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 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), myHasDefault(false) { 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, this); if (!aLabelIcon.isEmpty()) - myLabel->setPixmap(QPixmap(aLabelIcon)); + myLabel->setPixmap(ModuleBase_IconFactory::loadPixmap(aLabelIcon)); + + bool aAcceptVariables = theData->getBooleanAttribute(DOUBLE_WDG_ACCEPT_EXPRESSIONS, true); mySpinBox = new ModuleBase_ParamSpinBox(this); + mySpinBox->setAcceptVariables(aAcceptVariables); QString anObjName = QString::fromStdString(attributeID()); mySpinBox->setObjectName(anObjName); @@ -78,71 +100,133 @@ ModuleBase_WidgetDoubleValue::ModuleBase_WidgetDoubleValue(QWidget* theParent, mySpinBox->setSingleStep(aStepVal); } - double aDefVal = QString::fromStdString(getDefaultValue()).toDouble(&isOk); - if (isOk) { - mySpinBox->setValue(aDefVal); - } + myDefaultVal = QString::fromStdString(getDefaultValue()).toDouble(&myHasDefault); + if (myHasDefault) + mySpinBox->setValue(myDefaultVal); - QString aTTip = QString::fromStdString(theData->widgetTooltip()); + QString aTTip = translate(theData->widgetTooltip()); mySpinBox->setToolTip(aTTip); + myLabel->setToolTip(aTTip); aControlLay->addRow(myLabel, mySpinBox); - connect(mySpinBox, SIGNAL(valueChanged(double)), this, SIGNAL(valuesChanged())); + // 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() { } -void ModuleBase_WidgetDoubleValue::reset() +void ModuleBase_WidgetDoubleValue::activateCustom() { - if (isComputedDefault()) { - return; - //if (myFeature->compute(myAttributeID)) - // restoreValue(); - } - else { + ModuleBase_ModelWidget::activateCustom(); + QStringList aParameters; + ModuleBase_Tools::getParameters(aParameters); + mySpinBox->setCompletionList(aParameters); +} + +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 double value can not be found by the default value, do nothing + // if the value can not be found by the default value, do nothing if (isOk) { - ModuleBase_Tools::setSpinValue(mySpinBox, isOk ? aDefValue : 0.0); - storeValueCustom(); + ModuleBase_Tools::setSpinValue(mySpinBox, aDefValue); + storeValue(); + aDone = true; } } + return aDone; } -bool ModuleBase_WidgetDoubleValue::storeValueCustom() const +bool ModuleBase_WidgetDoubleValue::storeValueCustom() { DataPtr aData = myFeature->data(); AttributeDoublePtr aReal = aData->real(attributeID()); - aReal->setValue(mySpinBox->value()); - std::string aTextRepr = aReal->text(); if (mySpinBox->hasVariable()) { - aTextRepr = mySpinBox->text().toStdString(); + // Here is a text of a real value or an expression. + QString aText = mySpinBox->text(); + if (aText.contains('=')) { + if (!myParameter.get()) { + myParameter = ModuleBase_Tools::createParameter(aText); + if (!myParameter.get()) { + aReal->setExpressionError("Parameter cannot be created"); + aReal->setExpressionInvalid(true); + updateObject(myFeature); + return false; + } else if (aReal->expressionInvalid()) { + aReal->setExpressionError(""); + aReal->setExpressionInvalid(false); + } + } else { + ModuleBase_Tools::editParameter(myParameter, aText); + } + aText = aText.split('=').at(0); + } else if (myParameter.get()){ + // Nullyfy the parameter reference without deletion of the created + myParameter = FeaturePtr(); + } + aReal->setText(aText.toStdString()); + } 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 + if (aReal->expressionInvalid()) { + aReal->setExpressionError(""); + aReal->setExpressionInvalid(false); + } + aReal->setText(""); + aReal->setValue(mySpinBox->value()); } - aReal->setText(aTextRepr); updateObject(myFeature); return true; } -bool ModuleBase_WidgetDoubleValue::restoreValue() +bool ModuleBase_WidgetDoubleValue::restoreValueCustom() { DataPtr aData = myFeature->data(); AttributeDoublePtr aRef = aData->real(attributeID()); std::string aTextRepr = aRef->text(); if (!aTextRepr.empty()) { - mySpinBox->setText(QString::fromStdString(aTextRepr)); - } else { - ModuleBase_Tools::setSpinValue(mySpinBox, aRef->value()); + QString aText = QString::fromStdString(aTextRepr); + ModuleBase_Tools::setSpinText(mySpinBox, aText); + } + else { + ModuleBase_Tools::setSpinValue(mySpinBox, aRef->isInitialized() ? aRef->value() : myDefaultVal); + if (aRef->isInitialized() && aRef->expressionInvalid()) { + aRef->setExpressionError(""); + aRef->setExpressionInvalid(false); + } + if ((!aRef->isInitialized()) && myHasDefault) + aRef->setValue(myDefaultVal); } 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; +}