Issue #604 Creation of an unexpected line in the Sketcher

Regression: Apply is always disable during mirror operation when the cursor is over property panel. Using myIsResetCurrentValue instead of myIsPropertyPanelValueChanged.

diff --git a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
index d0e7a9c20f831fc97b06d7e8fa6eaec0d3db7f85..230f49220cbbd82e49947eb811b51776e80cd77f 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
@@ -92,15 +92,11 @@ ModuleBase_WidgetDoubleValue::~ModuleBase_WidgetDoubleValue()
 {
 }
 
-void ModuleBase_WidgetDoubleValue::reset()
+bool ModuleBase_WidgetDoubleValue::reset()
 {
-  if (!isUseReset())
-    return;
-
-  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);
@@ -109,8 +105,10 @@ void ModuleBase_WidgetDoubleValue::reset()
     if (isOk) {
       ModuleBase_Tools::setSpinValue(mySpinBox, aDefValue);
       storeValueCustom();
+      aDone = true;
     }
   }
+  return aDone;
 }
 
 bool ModuleBase_WidgetDoubleValue::storeValueCustom() const

diff --git a/src/ModuleBase/ModuleBase_WidgetIntValue.cpp b/src/ModuleBase/ModuleBase_WidgetIntValue.cpp
index f09f9c056ae0eb8e0d5b3400ed3377733dda867d..a0daa71242513af0ac539389b139ae940af8a584 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetIntValue.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetIntValue.cpp
@@ -91,15 +91,11 @@ ModuleBase_WidgetIntValue::~ModuleBase_WidgetIntValue()
 {
 }
 
-void ModuleBase_WidgetIntValue::reset()
+bool ModuleBase_WidgetIntValue::reset()
 {
-  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 +106,10 @@ void ModuleBase_WidgetIntValue::reset()
       mySpinBox->setValue(isOk ? aDefValue : 0);
       mySpinBox->blockSignals(isBlocked);
       storeValueCustom();
+      aDone = true;
     }
   }
+  return aDone;
 }
 
 bool ModuleBase_WidgetIntValue::storeValueCustom() const

diff --git a/src/ModuleBase/ModuleBase_WidgetIntValue.h b/src/ModuleBase/ModuleBase_WidgetIntValue.h
index b795bc1c8122b6bfaefa123e32eb2871323551f5..aa7958b9bf21fe9a62a50d50a3874c70bca9f576 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetIntValue.h
+++ b/src/ModuleBase/ModuleBase_WidgetIntValue.h
@@ -38,7 +38,7 @@ Q_OBJECT
   virtual ~ModuleBase_WidgetIntValue();
 
   /// Fills the widget with default values
-  virtual void reset();
+  virtual bool reset();
 
   //! Read value of corresponded attribute from data model to the input control
   // \return True in success

diff --git a/src/PartSet/PartSet_WidgetPoint2d.cpp b/src/PartSet/PartSet_WidgetPoint2d.cpp
index 6ad84d8fe9a4f05a9ab33081734100daa65fd76c..5b5659a1c63e2d4842ba886e282d80501bf87645 100644 (file)
--- a/src/PartSet/PartSet_WidgetPoint2d.cpp
+++ b/src/PartSet/PartSet_WidgetPoint2d.cpp
@@ -99,15 +99,11 @@ PartSet_WidgetPoint2D::PartSet_WidgetPoint2D(QWidget* theParent,
   setLayout(aLayout);
 }
 
-void PartSet_WidgetPoint2D::reset()
+bool PartSet_WidgetPoint2D::reset()
 {
-  if (!isUseReset())
-    return;
-
-  if (isComputedDefault() || myXSpin->hasVariable() || myYSpin->hasVariable()) {
-    return;
-    //if (myFeature->compute(myAttributeID))
-    //  restoreValue();
+  bool aDone = false;
+  if (!isUseReset() || isComputedDefault() || myXSpin->hasVariable() || myYSpin->hasVariable()) {
+    aDone = false;
   }
   else {
     bool isOk;
@@ -117,7 +113,9 @@ void PartSet_WidgetPoint2D::reset()
     ModuleBase_Tools::setSpinValue(myXSpin, isOk ? aDefValue : 0.0);
     ModuleBase_Tools::setSpinValue(myYSpin, isOk ? aDefValue : 0.0);
     storeValueCustom();
+    aDone = true;
   }
+  return aDone;
 }
 
 PartSet_WidgetPoint2D::~PartSet_WidgetPoint2D()

diff --git a/src/PartSet/PartSet_WidgetPoint2d.h b/src/PartSet/PartSet_WidgetPoint2d.h
index 473eccfedeb530a8eea14423a204fccd9e84fdc6..77ead09c2e9f8809fd753aa40cc2c5d1645ac8be 100644 (file)
--- a/src/PartSet/PartSet_WidgetPoint2d.h
+++ b/src/PartSet/PartSet_WidgetPoint2d.h
@@ -51,7 +51,7 @@ Q_OBJECT
   virtual ~PartSet_WidgetPoint2D();
 
   /// Fills the widget with default values
-  virtual void reset();
+  virtual bool reset();
 
   /// Set the given wrapped value to the current widget
   /// This value should be processed in the widget according to the needs