X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetDoubleValue.cpp;h=a43f02cb6b2b6e43db5d314a612e487f082e453c;hb=c24c2f94491145b9c2cbd0be6c6bc3d157bca9bb;hp=6aa383688e69272c252472f1fcbfb9075fb0a418;hpb=fccb11b890bf75fde316cd0dbc911fa001368062;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp index 6aa383688..a43f02cb6 100644 --- a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp +++ b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: ModuleBase_Widgets.h +// File: ModuleBase_WidgetDoubleValue.cpp // Created: 04 June 2014 // Author: Vitaly Smetannikov @@ -10,7 +10,6 @@ #include #include #include -#include #include #include @@ -24,7 +23,6 @@ #include #include -#include #ifndef DBL_MAX #define DBL_MAX 1.7976931348623158e+308 @@ -85,21 +83,21 @@ ModuleBase_WidgetDoubleValue::ModuleBase_WidgetDoubleValue(QWidget* theParent, QString aTTip = QString::fromStdString(theData->widgetTooltip()); mySpinBox->setToolTip(aTTip); + myLabel->setToolTip(aTTip); aControlLay->addRow(myLabel, mySpinBox); - connect(mySpinBox, SIGNAL(valueChanged(const QString&)), this, SIGNAL(valuesChanged())); + connect(mySpinBox, SIGNAL(valueChanged(const QString&)), this, SIGNAL(valuesModified())); } ModuleBase_WidgetDoubleValue::~ModuleBase_WidgetDoubleValue() { } -void ModuleBase_WidgetDoubleValue::reset() +bool ModuleBase_WidgetDoubleValue::resetCustom() { - if (isComputedDefault() || mySpinBox->hasVariable()) { - return; - //if (myFeature->compute(myAttributeID)) - // restoreValue(); + bool aDone = false; + if (!isUseReset() || isComputedDefault() || mySpinBox->hasVariable()) { + aDone = false; } else { bool isOk; double aDefValue = QString::fromStdString(getDefaultValue()).toDouble(&isOk); @@ -107,33 +105,33 @@ void ModuleBase_WidgetDoubleValue::reset() // if the double value can not be found by the default value, do nothing if (isOk) { ModuleBase_Tools::setSpinValue(mySpinBox, aDefValue); - storeValueCustom(); + storeValue(); + aDone = true; } } + return aDone; } bool ModuleBase_WidgetDoubleValue::storeValueCustom() const { DataPtr aData = myFeature->data(); AttributeDoublePtr aReal = aData->real(attributeID()); - if (!mySpinBox->hasVariable()) { - aReal->setValue(mySpinBox->value()); - } else { + if (mySpinBox->hasVariable()) { // Here is a text of a real value or an expression. std::string aText = mySpinBox->text().toStdString(); aReal->setText(aText); - // Send it to evaluator to convert into the double and store in the attribute - static Events_ID anId = ModelAPI_AttributeEvalMessage::eventId(); - std::shared_ptr aMessage = - std::shared_ptr(new ModelAPI_AttributeEvalMessage(anId, this)); - aMessage->setAttribute(aData->attribute(attributeID())); - Events_Loop::loop()->send(aMessage); + } 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()); @@ -146,9 +144,25 @@ bool ModuleBase_WidgetDoubleValue::restoreValue() 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 = mySpinBox->isModified(); + if (isModified) { + emit valuesChanged(); + mySpinBox->clearModified(); + mySpinBox->selectAll(); + } + return isModified; +}