From f98f36bd009570d51eac255acf952cb09f68b5db Mon Sep 17 00:00:00 2001
From: nds <natalia.donis@opencascade.com>
Date: Thu, 4 Dec 2014 17:49:00 +0300
Subject: [PATCH] It moves the connect of the propertyPanel noWidget signal to
 the module instead of operation.

---
 src/FeaturesPlugin/placement_widget.xml |  2 --
 src/ModuleBase/ModuleBase_Operation.cpp |  5 -----
 src/PartSet/PartSet_Module.cpp          | 14 ++++++++++++++
 src/PartSet/PartSet_Module.h            |  5 +++++
 src/XGUI/XGUI_Workshop.cpp              |  3 +++
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/FeaturesPlugin/placement_widget.xml b/src/FeaturesPlugin/placement_widget.xml
index 0e6f3488e..e5f67055c 100644
--- a/src/FeaturesPlugin/placement_widget.xml
+++ b/src/FeaturesPlugin/placement_widget.xml
@@ -14,6 +14,4 @@
     use_subshapes="true"
 	concealment="true"
   />
-  <!-- In order to avoid automatic closing of operation -->
-  <label id="" label="" internal="1"/>
 </source>
diff --git a/src/ModuleBase/ModuleBase_Operation.cpp b/src/ModuleBase/ModuleBase_Operation.cpp
index 892a6780b..5ee3daa6e 100644
--- a/src/ModuleBase/ModuleBase_Operation.cpp
+++ b/src/ModuleBase/ModuleBase_Operation.cpp
@@ -181,8 +181,6 @@ void ModuleBase_Operation::postpone()
 
 void ModuleBase_Operation::resume()
 {
-  if (myPropertyPanel)
-    connect(myPropertyPanel, SIGNAL(noMoreWidgets()), SLOT(commit()));
   //  connect(myPropertyPanel, SIGNAL(widgetActivated(ModuleBase_ModelWidget*)),
   //          this,            SLOT(onWidgetActivated(ModuleBase_ModelWidget*)));
   emit resumed();
@@ -358,9 +356,6 @@ void ModuleBase_Operation::setPropertyPanel(ModuleBase_IPropertyPanel* theProp)
   myPropertyPanel->setEditingMode(isEditOperation());
   //connect(myPropertyPanel, SIGNAL(widgetActivated(ModuleBase_ModelWidget*)), this,
   //        SLOT(onWidgetActivated(ModuleBase_ModelWidget*)));
-  if (myPropertyPanel) {
-    connect(myPropertyPanel, SIGNAL(noMoreWidgets()), SLOT(commit()));
-  }
 }
 
 bool ModuleBase_Operation::isGranted(QString theId) const
diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
index e3c2d76ab..3dec04e88 100644
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@ -522,6 +522,20 @@ void PartSet_Module::onEnterReleased()
   myRestartingMode = RM_LastFeatureEmpty;
 }
 
+void PartSet_Module::onNoMoreWidgets()
+{
+  ModuleBase_Operation* aOperation = myWorkshop->currentOperation();
+  if (aOperation) {
+    /// Restart sketcher operations automatically
+    FeaturePtr aFeature = aOperation->feature();
+    std::shared_ptr<SketchPlugin_Feature> aSPFeature = 
+              std::dynamic_pointer_cast<SketchPlugin_Feature>(aFeature);
+    if (aSPFeature) {
+      aOperation->commit();
+    }
+  }
+}
+
 QStringList PartSet_Module::sketchOperationIdList() const
 {
   QStringList aIds;
diff --git a/src/PartSet/PartSet_Module.h b/src/PartSet/PartSet_Module.h
index 36156c8ec..2f981fd66 100644
--- a/src/PartSet/PartSet_Module.h
+++ b/src/PartSet/PartSet_Module.h
@@ -49,6 +49,11 @@ public:
 
   QStringList sketchOperationIdList() const;
 
+public slots:
+  /// SLOT, that is called by no more widget signal emitted by property panel
+  /// Set a specific flag to restart the sketcher operation
+  void onNoMoreWidgets();
+
 protected slots:
   /// Called when previous operation is finished
   virtual void onOperationComitted(ModuleBase_Operation* theOperation);
diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index d127172fc..31c283e5d 100644
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -1038,6 +1038,9 @@ void XGUI_Workshop::createDockWidgets()
   aDesktop->addDockWidget(Qt::LeftDockWidgetArea, aObjDock);
   myPropertyPanel = new XGUI_PropertyPanel(aDesktop);
   myPropertyPanel->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea);
+
+  connect(myPropertyPanel, SIGNAL(noMoreWidgets()), myModule, SLOT(onNoMoreWidgets()));
+
   aDesktop->addDockWidget(Qt::LeftDockWidgetArea, myPropertyPanel);
   hidePropertyPanel();  //<! Invisible by default
   hideObjectBrowser();
-- 
2.39.2