#1071 - sketch validation problem

[modules/shaper.git] / src / ModuleBase / ModuleBase_WidgetIntValue.cpp

diff --git a/src/ModuleBase/ModuleBase_WidgetIntValue.cpp b/src/ModuleBase/ModuleBase_WidgetIntValue.cpp
index f09f9c056ae0eb8e0d5b3400ed3377733dda867d..b92d5863f3a3d71ac9ac852bf6afcbe7a8b0bce9 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetIntValue.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetIntValue.cpp
@@ -1,12 +1,13 @@
 // Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
-// File:        ModuleBase_Widgets.h
+// File:        ModuleBase_WidgetIntValue.cpp
 // Created:     04 June 2014
 // Author:      Vitaly Smetannikov
 
 #include <ModuleBase_WidgetIntValue.h>
 #include <ModuleBase_ParamSpinBox.h>
 #include <ModuleBase_Tools.h>
+#include <ModuleBase_IntSpinBox.h>
 
 #include <ModelAPI_AttributeInteger.h>
 #include <ModelAPI_Data.h>
@@ -22,7 +23,6 @@
 #include <QLabel>
 #include <QEvent>
 #include <QTimer>
-#include <QSpinBox>
 
 #include <math.h>
 
@@ -48,7 +48,7 @@ ModuleBase_WidgetIntValue::ModuleBase_WidgetIntValue(QWidget* theParent,
   if (!aLabelIcon.isEmpty())
     myLabel->setPixmap(QPixmap(aLabelIcon));
 
-  mySpinBox = new QSpinBox(this);
+  mySpinBox = new ModuleBase_IntSpinBox(this);
   QString anObjName = QString::fromStdString(attributeID());
   mySpinBox->setObjectName(anObjName);
 
@@ -82,24 +82,21 @@ ModuleBase_WidgetIntValue::ModuleBase_WidgetIntValue(QWidget* theParent,
 
   QString aTTip = QString::fromStdString(theData->widgetTooltip());
   mySpinBox->setToolTip(aTTip);
+  myLabel->setToolTip(aTTip);
 
   aControlLay->addRow(myLabel, mySpinBox);
-  connect(mySpinBox, SIGNAL(valueChanged(int)), this, SIGNAL(valuesChanged()));
+  connect(mySpinBox, SIGNAL(valueChanged(int)), this, SIGNAL(valuesModified()));
 }
 
 ModuleBase_WidgetIntValue::~ModuleBase_WidgetIntValue()
 {
 }
 
-void ModuleBase_WidgetIntValue::reset()
+bool ModuleBase_WidgetIntValue::resetCustom()
 {
-  if (!isUseReset())
-    return;
-
-  if (isComputedDefault()) {
-    return;
-    //if (myFeature->compute(myAttributeID))
-    //  restoreValue();
+  bool aDone = false;
+  if (!isUseReset() || isComputedDefault()) {
+    aDone = false;
   } else {
     bool isOk;
     int aDefValue = QString::fromStdString(getDefaultValue()).toInt(&isOk);
@@ -110,8 +107,10 @@ void ModuleBase_WidgetIntValue::reset()
       mySpinBox->setValue(isOk ? aDefValue : 0);
       mySpinBox->blockSignals(isBlocked);
       storeValueCustom();
+      aDone = true;
     }
   }
+  return aDone;
 }
 
 bool ModuleBase_WidgetIntValue::storeValueCustom() const
@@ -124,7 +123,7 @@ bool ModuleBase_WidgetIntValue::storeValueCustom() const
   return true;
 }
 
-bool ModuleBase_WidgetIntValue::restoreValue()
+bool ModuleBase_WidgetIntValue::restoreValueCustom()
 {
   DataPtr aData = myFeature->data();
   AttributeIntegerPtr aRef = aData->integer(attributeID());
@@ -140,3 +139,14 @@ QList<QWidget*> ModuleBase_WidgetIntValue::getControls() const
   aList.append(mySpinBox);
   return aList;
 }
+
+bool ModuleBase_WidgetIntValue::processEnter()
+{
+  bool isModified = mySpinBox->isModified();
+  if (isModified) {
+    emit valuesChanged();
+    mySpinBox->clearModified();
+    mySpinBox->selectAll();
+  }
+  return isModified;
+}