X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetIntValue.cpp;h=dae84951aaad0b9154d8c5177f2723923c1a433f;hb=d0e479afb535cd9d6542d53302428a5c8e99485f;hp=95045d0c20bd3857783ea1e1e5d6f71541409095;hpb=d98db945e11f834b88904ce700e512e4233f57e3;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_WidgetIntValue.cpp b/src/ModuleBase/ModuleBase_WidgetIntValue.cpp
index 95045d0c2..dae84951a 100644
--- a/src/ModuleBase/ModuleBase_WidgetIntValue.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetIntValue.cpp
@@ -7,6 +7,8 @@
 #include <ModuleBase_WidgetIntValue.h>
 #include <ModuleBase_ParamSpinBox.h>
 #include <ModuleBase_Tools.h>
+#include <ModuleBase_ParamIntSpinBox.h>
+#include <ModuleBase_IconFactory.h>
 
 #include <ModelAPI_AttributeInteger.h>
 #include <ModelAPI_Data.h>
@@ -22,7 +24,6 @@
 #include <QLabel>
 #include <QEvent>
 #include <QTimer>
-#include <QSpinBox>
 
 #include <math.h>
 
@@ -34,12 +35,9 @@
 #include <iostream>
 #endif
 
-//#define APPLY_BY_ENTER_OR_TAB
-
 ModuleBase_WidgetIntValue::ModuleBase_WidgetIntValue(QWidget* theParent,
-                                                           const Config_WidgetAPI* theData,
-                                                           const std::string& theParentId)
-    : ModuleBase_ModelWidget(theParent, theData, theParentId)
+                                                     const Config_WidgetAPI* theData)
+: ModuleBase_ModelWidget(theParent, theData)
 {
   QFormLayout* aControlLay = new QFormLayout(this);
   ModuleBase_Tools::adjustMargins(aControlLay);
@@ -48,9 +46,9 @@ ModuleBase_WidgetIntValue::ModuleBase_WidgetIntValue(QWidget* theParent,
   QString aLabelIcon = QString::fromStdString(theData->widgetIcon());
   myLabel = new QLabel(aLabelText, this);
   if (!aLabelIcon.isEmpty())
-    myLabel->setPixmap(QPixmap(aLabelIcon));
+    myLabel->setPixmap(ModuleBase_IconFactory::loadPixmap(aLabelIcon));
 
-  mySpinBox = new QSpinBox(this);
+  mySpinBox = new ModuleBase_ParamIntSpinBox(this);
   QString anObjName = QString::fromStdString(attributeID());
   mySpinBox->setObjectName(anObjName);
 
@@ -87,45 +85,47 @@ ModuleBase_WidgetIntValue::ModuleBase_WidgetIntValue(QWidget* theParent,
   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()));
-#else
-  connect(mySpinBox, SIGNAL(valueChanged(int)), this, SIGNAL(valuesChanged()));
-#endif
+  connect(mySpinBox, SIGNAL(valueChanged(int)), this, SIGNAL(valuesModified()));
 }
 
 ModuleBase_WidgetIntValue::~ModuleBase_WidgetIntValue()
 {
 }
 
-bool ModuleBase_WidgetIntValue::reset()
+bool ModuleBase_WidgetIntValue::resetCustom()
 {
   bool aDone = false;
-  if (!isUseReset() || isComputedDefault()) {
+  if (!isUseReset() || isComputedDefault() || mySpinBox->hasVariable()) {
     aDone = false;
   } else {
     bool isOk;
     int aDefValue = QString::fromStdString(getDefaultValue()).toInt(&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) {
-      bool isBlocked = mySpinBox->blockSignals(true);
-      mySpinBox->setValue(isOk ? aDefValue : 0);
-      mySpinBox->blockSignals(isBlocked);
-      storeValueCustom();
+      ModuleBase_Tools::setSpinValue(mySpinBox, aDefValue);
+      storeValue();
       aDone = true;
     }
   }
   return aDone;
 }
 
-bool ModuleBase_WidgetIntValue::storeValueCustom() const
+bool ModuleBase_WidgetIntValue::storeValueCustom()
 {
   DataPtr aData = myFeature->data();
-  AttributeIntegerPtr aIntVal = aData->integer(attributeID());
-  int aVal = mySpinBox->value();
-  aIntVal->setValue(mySpinBox->value());
+  AttributeIntegerPtr anAttribute = aData->integer(attributeID());
+  if (mySpinBox->hasVariable()) {
+    // Here is a text of a real value or an expression.
+    std::string aText = mySpinBox->text().toStdString();
+    anAttribute->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
+    anAttribute->setText("");
+    anAttribute->setValue(mySpinBox->value());
+  }
   updateObject(myFeature);
   return true;
 }
@@ -133,16 +133,34 @@ bool ModuleBase_WidgetIntValue::storeValueCustom() const
 bool ModuleBase_WidgetIntValue::restoreValueCustom()
 {
   DataPtr aData = myFeature->data();
-  AttributeIntegerPtr aRef = aData->integer(attributeID());
-  bool isBlocked = mySpinBox->blockSignals(true);
-  mySpinBox->setValue(aRef->value());
-  mySpinBox->blockSignals(isBlocked);
+  AttributeIntegerPtr anAttribute = aData->integer(attributeID());
+  std::string aTextRepr = anAttribute->text();
+  if (!aTextRepr.empty()) {
+    ModuleBase_Tools::setSpinText(mySpinBox, QString::fromStdString(aTextRepr));
+  } else {
+    ModuleBase_Tools::setSpinValue(mySpinBox, anAttribute->value());
+  }
   return true;
 }
 
+void ModuleBase_WidgetIntValue::selectContent()
+{
+  mySpinBox->selectAll();
+}
+
 QList<QWidget*> ModuleBase_WidgetIntValue::getControls() const
 {
   QList<QWidget*> aList;
   aList.append(mySpinBox);
   return aList;
 }
+
+bool ModuleBase_WidgetIntValue::processEnter()
+{
+  bool isModified = getValueState() == ModifiedInPP;
+  if (isModified) {
+    emit valuesChanged();
+    mySpinBox->selectAll();
+  }
+  return isModified;
+}