X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetDoubleValue.cpp;h=ff920c03a261347674d28e41a178120c0edb41ac;hb=refs%2Fheads%2FV9_11_BR;hp=9dc18d5981db4b0c238bdf77e58dcb2c4787bac8;hpb=d34842c50d5f335cca443c78910c16c54139c7d0;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp index 9dc18d598..ff920c03a 100644 --- a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp +++ b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp @@ -1,15 +1,36 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModuleBase_WidgetDoubleValue.cpp -// Created: 04 June 2014 -// Author: Vitaly Smetannikov +// Copyright (C) 2014-2023 CEA, EDF +// +// 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 @@ -26,22 +47,20 @@ #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) - : ModuleBase_ModelWidget(theParent, 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()) @@ -81,17 +100,17 @@ 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(const QString&)), this, SIGNAL(valuesModified())); + // 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()); } @@ -102,11 +121,9 @@ ModuleBase_WidgetDoubleValue::~ModuleBase_WidgetDoubleValue() 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() @@ -134,13 +151,37 @@ bool ModuleBase_WidgetDoubleValue::storeValueCustom() 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); @@ -151,11 +192,19 @@ 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->isInitialized() ? aRef->value() : 0); + 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; } @@ -181,3 +230,18 @@ bool ModuleBase_WidgetDoubleValue::processEnter() } 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