X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetDoubleValue.cpp;h=47799fc54eb11866cf5dff6b98b0588bed58b130;hb=857b1f72d9703c46c6c8c9bb239821d314344c86;hp=a17ea26c9793ee4a8c3acab86dc7f5df40b0646b;hpb=9db45503b9ec9a48ee30e9ea7ce14eb34c139d5e;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
index a17ea26c9..47799fc54 100644
--- a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
@@ -1,30 +1,28 @@
 // Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
-// File:        ModuleBase_Widgets.h
+// File:        ModuleBase_WidgetDoubleValue.cpp
 // Created:     04 June 2014
 // Author:      Vitaly Smetannikov
 
-#include <ModuleBase_WidgetDoubleValue.h>
-#include <ModuleBase_ParamSpinBox.h>
-#include <ModuleBase_Tools.h>
+#include <Config_Keywords.h>
+#include <Config_WidgetAPI.h>
 
 #include <ModelAPI_AttributeDouble.h>
-#include <ModelAPI_AttributeString.h>
 #include <ModelAPI_Data.h>
+#include <ModelAPI_Object.h>
 
-#include <Config_Keywords.h>
-#include <Config_WidgetAPI.h>
-
-#include <Events_Loop.h>
-#include <ModelAPI_Events.h>
+#include <ModuleBase_ParamSpinBox.h>
+#include <ModuleBase_Tools.h>
+#include <ModuleBase_WidgetDoubleValue.h>
 
-#include <QWidget>
 #include <QFormLayout>
 #include <QLabel>
-#include <QEvent>
-#include <QTimer>
+#include <QList>
+#include <QObject>
+#include <QPixmap>
+#include <QString>
 
-#include <math.h>
+#include <cfloat>
 
 #ifndef DBL_MAX
 #define DBL_MAX 1.7976931348623158e+308 
@@ -87,53 +85,58 @@ ModuleBase_WidgetDoubleValue::ModuleBase_WidgetDoubleValue(QWidget* theParent,
   mySpinBox->setToolTip(aTTip);
 
   aControlLay->addRow(myLabel, mySpinBox);
-  connect(mySpinBox, SIGNAL(valueChanged(double)), this, SIGNAL(valuesChanged()));
+  connect(mySpinBox, SIGNAL(valueChanged(const QString&)), this, SIGNAL(valuesChanged()));
 }
 
 ModuleBase_WidgetDoubleValue::~ModuleBase_WidgetDoubleValue()
 {
 }
 
-void ModuleBase_WidgetDoubleValue::reset()
+bool ModuleBase_WidgetDoubleValue::reset()
 {
-  if (isComputedDefault()) {
-    return;
-    //if (myFeature->compute(myAttributeID))
-    //  restoreValue();
-  }
-  else {
+  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 (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
 {
   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.
+    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());
   }
-  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));
+    ModuleBase_Tools::setSpinText(mySpinBox, QString::fromStdString(aTextRepr));
   } else {
     ModuleBase_Tools::setSpinValue(mySpinBox, aRef->value());
   }