Issue #894: Toggle constraint before transaction open

diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
index 1439438c314fe431a1496e02209fde5369c8fc8a..e0b7c97743f446d2a5809348a5ef709203deab11 100755 (executable)
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@ -734,6 +734,16 @@ void PartSet_Module::onFeatureTriggered()
   ModuleBase_IModule::onFeatureTriggered();
 }
 
+void PartSet_Module::launchOperation(const QString& theCmdId)
+{
+  if (PartSet_SketcherMgr::constraintsIdList().contains(theCmdId)) {
+    // Show constraints if a constraint was anOperation
+    mySketchMgr->onShowConstraintsToggle(true);
+  }
+  ModuleBase_IModule::launchOperation(theCmdId);
+}
+
+
 void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS) 
 {
   Handle(AIS_InteractiveObject) anAIS = theAIS->impl<Handle(AIS_InteractiveObject)>();

diff --git a/src/PartSet/PartSet_Module.h b/src/PartSet/PartSet_Module.h
index 2828de29f243998b359c17a0ab49c85aed765124..87572db15c83362772ba75d2bd289cec4f9bf932 100644 (file)
--- a/src/PartSet/PartSet_Module.h
+++ b/src/PartSet/PartSet_Module.h
@@ -69,6 +69,10 @@ public:
   /// Call back forlast tuning of property panel before operation performance
   virtual void propertyPanelDefined(ModuleBase_Operation* theOperation);
 
+  /// Creates an operation and send it to loop
+  /// \param theCmdId the operation name
+  virtual void launchOperation(const QString& theCmdId);
+
   /// Realizes some functionality by an operation start
   /// Displays all sketcher sub-Objects, hides sketcher result, appends selection filters
   /// Activate the operation presentation

diff --git a/src/PartSet/PartSet_SketcherMgr.cpp b/src/PartSet/PartSet_SketcherMgr.cpp
index b4cf246eac2e7827d57f60dcd9e7cbe781d99850..ae2181836c593d8a060e808ee2097cbc7be16209 100644 (file)
--- a/src/PartSet/PartSet_SketcherMgr.cpp
+++ b/src/PartSet/PartSet_SketcherMgr.cpp
@@ -877,10 +877,6 @@ void PartSet_SketcherMgr::stopSketch(ModuleBase_Operation* /* theOperation*/)
 
 void PartSet_SketcherMgr::startNestedSketch(ModuleBase_Operation* theOperation)
 {
-  if (constraintsIdList().contains(theOperation->id())) {
-    // Show constraints if a constraint was created
-    onShowConstraintsToggle(true);
-  }
   connectToPropertyPanel(true);
 }
 

diff --git a/src/PartSet/PartSet_SketcherMgr.h b/src/PartSet/PartSet_SketcherMgr.h
index 477fdcb3053bb17c8e75443b6c6ea744e059a13f..08a1522364049fe22fcbe96015408b56cd80c84d 100644 (file)
--- a/src/PartSet/PartSet_SketcherMgr.h
+++ b/src/PartSet/PartSet_SketcherMgr.h
@@ -188,6 +188,9 @@ public slots:
   /// Process sketch plane selected event
   void onPlaneSelected(const std::shared_ptr<GeomAPI_Pln>& thePln);
 
+  /// Toggle show constraints
+  void onShowConstraintsToggle(bool);
+
 private slots:
   /// Process the enter mouse to the view port. If the current operation is a create of
   /// a nested sketch feature, it updates internal flags to display the feature on mouse move
@@ -212,8 +215,6 @@ private slots:
   void onBeforeContextMenu();
   void onAfterContextMenu();
 
-  void onShowConstraintsToggle(bool);
-
 private:
   /// Launches the operation from current highlighting
   void launchEditing();