default values for the constraint point in order to enable the "Apply" button

diff --git a/src/ModuleBase/ModuleBase_ModelWidget.cpp b/src/ModuleBase/ModuleBase_ModelWidget.cpp
index 6a5421549ff74845da9a60dca29fd6257a54761d..73a422d94a6a58a84b0d6cc42ff87202533f945c 100644 (file)
--- a/src/ModuleBase/ModuleBase_ModelWidget.cpp
+++ b/src/ModuleBase/ModuleBase_ModelWidget.cpp
@@ -85,6 +85,17 @@ bool ModuleBase_ModelWidget::focusTo()
   return true;
 }
 
+void ModuleBase_ModelWidget::activate()
+{
+  if (!isEditingMode()) {
+    // the control value is stored to the mode by the focus in on the widget
+    // we need the value is initialized in order to enable the apply button in the property panel
+    // it should happens only in the creation mode because during edition all fields are filled
+    storeValue();
+  }
+  activateCustom();
+}
+
 void ModuleBase_ModelWidget::updateObject(ObjectPtr theObj) const
 {
   Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));

diff --git a/src/ModuleBase/ModuleBase_ModelWidget.h b/src/ModuleBase/ModuleBase_ModelWidget.h
index bb11733d9107fa8b2505ebac212163ff4f0cdd31..44b43e4620d47749a322ad3b23e4f6c4175eb81a 100644 (file)
--- a/src/ModuleBase/ModuleBase_ModelWidget.h
+++ b/src/ModuleBase/ModuleBase_ModelWidget.h
@@ -84,7 +84,7 @@ Q_OBJECT
   virtual bool focusTo();
 
   /// The methiod called when widget is activated
-  virtual void activate() {}
+  void activate();
 
   /// The methiod called when widget is deactivated
   virtual void deactivate() {}
@@ -162,6 +162,9 @@ signals:
     myAttributeID = theAttribute;
   }
 
+  /// The methiod called when widget is activated
+  virtual void activateCustom() {};
+
   /// Sends Update and Redisplay for the given object
   /// \param theObj is updating object
   void updateObject(ObjectPtr theObj) const;

diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
index 361f6383d8507a66b94c38457a95eab6c878f4f5..070cec76c88d88845c2fcb4b2bb20fe29d5ac6f2 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
@@ -454,7 +454,7 @@ void ModuleBase_WidgetShapeSelector::raisePanel() const
 }
 
 //********************************************************************
-void ModuleBase_WidgetShapeSelector::activate()
+void ModuleBase_WidgetShapeSelector::activateCustom()
 {
   activateSelection(true);
 }

diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.h b/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
index c6b5431d0b965a6e20d0fea6a6271a5986ade806..b4885d240a566e6c070aeb846f3bdee503c2dc8d 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
@@ -102,9 +102,6 @@ Q_OBJECT
   virtual bool setSelection(ModuleBase_ViewerPrs theValue);
 
 
-  /// The methiod called when widget is activated
-  virtual void activate();
-
   /// The methiod called when widget is deactivated
   virtual void deactivate();
 
@@ -119,7 +116,10 @@ Q_OBJECT
   void onSelectionChanged();
 
  protected:
-   /// Computes and updates name of selected object in the widget
+  /// The methiod called when widget is activated
+  virtual void activateCustom();
+
+  /// Computes and updates name of selected object in the widget
   void updateSelectionName();
 
   /// Raise panel which contains this widget

diff --git a/src/PartSet/PartSet_WidgetPoint2d.cpp b/src/PartSet/PartSet_WidgetPoint2d.cpp
index a8cd1a82388860ffaeb3fdc8d764e7d56962e6b7..e8796669b9cc529bd2b625a8dc9de2e5d61aeca1 100644 (file)
--- a/src/PartSet/PartSet_WidgetPoint2d.cpp
+++ b/src/PartSet/PartSet_WidgetPoint2d.cpp
@@ -188,7 +188,7 @@ QList<QWidget*> PartSet_WidgetPoint2D::getControls() const
 }
 
 
-void PartSet_WidgetPoint2D::activate()
+void PartSet_WidgetPoint2D::activateCustom()
 {
   XGUI_ViewerProxy* aViewer = myWorkshop->viewer();
   connect(aViewer, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)), 
@@ -199,12 +199,6 @@ void PartSet_WidgetPoint2D::activate()
   QIntList aModes;
   aModes << TopAbs_VERTEX;
   myWorkshop->moduleConnector()->activateSubShapesSelection(aModes);
-  if (!isEditingMode()) {
-    // the control value is stored to the mode by the focus in on the widget
-    // we need the value is initialized in order to enable the apply button in the property panel
-    // it should happens only in the creation mode because during edition all fields are filled
-    storeValue();
-  }
 }
 
 void PartSet_WidgetPoint2D::deactivate()

diff --git a/src/PartSet/PartSet_WidgetPoint2d.h b/src/PartSet/PartSet_WidgetPoint2d.h
index bb50069630e8762d60db4194227312859188548f..def3b2bb73e503ccfb416f05d9e691ae453aa167 100644 (file)
--- a/src/PartSet/PartSet_WidgetPoint2d.h
+++ b/src/PartSet/PartSet_WidgetPoint2d.h
@@ -66,9 +66,6 @@ Q_OBJECT
 
   //bool initFromPrevious(ObjectPtr theObject);
 
-  /// The methiod called when widget is activated
-  virtual void activate();
-
   /// The methiod called when widget is deactivated
   virtual void deactivate();
 
@@ -111,6 +108,10 @@ protected slots:
   /// \param theEvent a mouse event
   void onMouseMove(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent);
 
+protected:
+  /// The methiod called when widget is activated
+  virtual void activateCustom();
+
 private slots:
   /// Process value changed event
   void onValuesChanged();

diff --git a/src/PartSet/PartSet_WidgetPoint2dDistance.cpp b/src/PartSet/PartSet_WidgetPoint2dDistance.cpp
index c3cba967bb8490347938c04084fe4779876bc915..be108103444444fb9defbfc239b8f925efcddc31 100644 (file)
--- a/src/PartSet/PartSet_WidgetPoint2dDistance.cpp
+++ b/src/PartSet/PartSet_WidgetPoint2dDistance.cpp
@@ -60,7 +60,7 @@ void PartSet_WidgetPoint2dDistance::setPoint(FeaturePtr theFeature,
   }
 }
 
-void PartSet_WidgetPoint2dDistance::activate()
+void PartSet_WidgetPoint2dDistance::activateCustom()
 {
   XGUI_ViewerProxy* aViewer = myWorkshop->viewer();
   connect(aViewer, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)), 

diff --git a/src/PartSet/PartSet_WidgetPoint2dDistance.h b/src/PartSet/PartSet_WidgetPoint2dDistance.h
index 9ccf0cb6bdbbb864cc7ca349e0f46a6dcd97c316..aa0ce98cd8170aebbe78cad44460efd2a638e45d 100644 (file)
--- a/src/PartSet/PartSet_WidgetPoint2dDistance.h
+++ b/src/PartSet/PartSet_WidgetPoint2dDistance.h
@@ -47,9 +47,6 @@ Q_OBJECT
 
   virtual ~PartSet_WidgetPoint2dDistance();
 
-  /// The methiod called when widget is activated
-  virtual void activate();
-
   /// The methiod called when widget is deactivated
   virtual void deactivate();
 
@@ -78,6 +75,9 @@ Q_OBJECT
   void onMouseMove(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent);
 
 protected:
+  /// The methiod called when widget is activated
+  virtual void activateCustom();
+
   /// Set the second point which defines a value in the widget as a distance with a first point defined by feature
   void setPoint(FeaturePtr theFeature, const std::shared_ptr<GeomAPI_Pnt2d>& thePnt);
 

diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp
index bf48108641a3d72338b4904b8d7e1931c75a2314..afe12cd2d39ce60e64dc1994fcb02387218cf796 100644 (file)
--- a/src/PartSet/PartSet_WidgetSketchLabel.cpp
+++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp
@@ -131,7 +131,7 @@ std::shared_ptr<GeomAPI_Pln> PartSet_WidgetSketchLabel::plane() const
 
 }
 
-void PartSet_WidgetSketchLabel::activate()
+void PartSet_WidgetSketchLabel::activateCustom()
 {
   std::shared_ptr<GeomAPI_Pln> aPlane = plane();
   if (aPlane) {

diff --git a/src/PartSet/PartSet_WidgetSketchLabel.h b/src/PartSet/PartSet_WidgetSketchLabel.h
index 26364b8fccaa063d5ab14805c5cf074975c9e676..9c9ffad2cc8a4007c626792c5d06b205821b9e44 100644 (file)
--- a/src/PartSet/PartSet_WidgetSketchLabel.h
+++ b/src/PartSet/PartSet_WidgetSketchLabel.h
@@ -58,9 +58,6 @@ Q_OBJECT
 
   QWidget* getControl() const;
 
-  /// The methiod called when widget is activated
-  virtual void activate();
-
   /// The methiod called when widget is deactivated
   virtual void deactivate();
 
@@ -78,6 +75,10 @@ signals:
   /// Signal on plane selection
   void planeSelected(const std::shared_ptr<GeomAPI_Pln>& thePln);
 
+protected:
+  /// The methiod called when widget is activated
+  virtual void activateCustom();
+
  private slots:
    /// Slot on plane selection
   void onPlaneSelected();

diff --git a/src/XGUI/XGUI_OperationMgr.cpp b/src/XGUI/XGUI_OperationMgr.cpp
index 859c0da92888aca8f62c4198b75b1cad1b00aefb..fa74ed50313618c714699ef4699d11c6714564fe 100644 (file)
--- a/src/XGUI/XGUI_OperationMgr.cpp
+++ b/src/XGUI/XGUI_OperationMgr.cpp
@@ -13,7 +13,7 @@
 #include <QKeyEvent>
 
 XGUI_OperationMgr::XGUI_OperationMgr(QObject* theParent)
-    : QObject(theParent), myIsValidationLock(false)
+    : QObject(theParent), myIsValidationLock(false), myIsApplyEnabled(false)
 {
 }