X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetDoubleValue.cpp;h=b6dc65443f1cdd964a9ff2dbb9d349aca4a9a351;hb=88ee9b2b81cf93a6324336b57e30cc8a3a487499;hp=9cd6797fc09bc2049ba89beaa6d0e50e6fc7b34b;hpb=bc81a3b5bb8b7c51bdec9b32bd8db9c60a73fb88;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp index 9cd6797fc..b6dc65443 100644 --- a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp +++ b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp @@ -1,19 +1,41 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModuleBase_WidgetDoubleValue.cpp -// Created: 04 June 2014 -// Author: Vitaly Smetannikov +// Copyright (C) 2014-2022 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 @@ -25,29 +47,29 @@ #include #ifndef DBL_MAX -#define DBL_MAX 1.7976931348623158e+308 +#define DBL_MAX 1.7976931348623158e+308 #endif #ifdef _DEBUG #include #endif -#define APPLY_BY_ENTER_OR_TAB - 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,32 +100,32 @@ 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); -#ifdef APPLY_BY_ENTER_OR_TAB - // Apply widget value change by enter/tab event. - //connect(mySpinBox, SIGNAL(editingFinished()), this, SIGNAL(valuesChanged())); - connect(mySpinBox, SIGNAL(valueStored()), this, SIGNAL(valuesChanged())); - connect(mySpinBox, SIGNAL(valueChanged(const QString&)), this, SIGNAL(valuesModified())); - connect(mySpinBox, SIGNAL(focusNextPrev()), this, SIGNAL(focusNextPrev())); - -#else - connect(mySpinBox, SIGNAL(valueChanged(const QString&)), this, SIGNAL(valuesChanged())); -#endif + // 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::activateCustom() +{ + ModuleBase_ModelWidget::activateCustom(); + QStringList aParameters; + ModuleBase_Tools::getParameters(aParameters); + mySpinBox->setCompletionList(aParameters); +} + bool ModuleBase_WidgetDoubleValue::resetCustom() { bool aDone = false; @@ -113,7 +135,7 @@ bool ModuleBase_WidgetDoubleValue::resetCustom() 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, aDefValue); storeValue(); @@ -123,19 +145,43 @@ bool ModuleBase_WidgetDoubleValue::resetCustom() return aDone; } -bool ModuleBase_WidgetDoubleValue::storeValueCustom() const +bool ModuleBase_WidgetDoubleValue::storeValueCustom() { DataPtr aData = myFeature->data(); AttributeDoublePtr aReal = aData->real(attributeID()); if (mySpinBox->hasVariable()) { // Here is a text of a real value or an expression. - std::string aText = mySpinBox->text().toStdString(); - aReal->setText(aText); + 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.toStdWString()); } 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(""); + if (aReal->expressionInvalid()) { + aReal->setExpressionError(""); + aReal->setExpressionInvalid(false); + } + aReal->setText(L""); aReal->setValue(mySpinBox->value()); } updateObject(myFeature); @@ -146,15 +192,28 @@ bool ModuleBase_WidgetDoubleValue::restoreValueCustom() { DataPtr aData = myFeature->data(); AttributeDoublePtr aRef = aData->real(attributeID()); - std::string aTextRepr = aRef->text(); + std::wstring aTextRepr = aRef->text(); if (!aTextRepr.empty()) { - ModuleBase_Tools::setSpinText(mySpinBox, QString::fromStdString(aTextRepr)); - } else { - ModuleBase_Tools::setSpinValue(mySpinBox, aRef->value()); + QString aText = QString::fromStdWString(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; @@ -164,11 +223,25 @@ QList ModuleBase_WidgetDoubleValue::getControls() const bool ModuleBase_WidgetDoubleValue::processEnter() { - bool isModified = mySpinBox->isModified(); + bool isModified = getValueState() == ModifiedInPP; if (isModified) { emit valuesChanged(); - mySpinBox->clearModified(); mySpinBox->selectAll(); } return isModified; } + +bool ModuleBase_WidgetDoubleValue::isModified() const +{ + QString aText = mySpinBox->text(); + if (aText.isEmpty()) + return false; + + if (myHasDefault) { + bool aOk = false; + double aVal = aText.toDouble(&aOk); + if (!aOk || aVal == myDefaultVal) + return false; + } + return true; +} \ No newline at end of file