Merge branch 'Dev_1.2.0' of newgeom:newgeom into Dev_1.2.0

[modules/shaper.git] / src / XGUI / XGUI_ModuleConnector.cpp

diff --git a/src/XGUI/XGUI_ModuleConnector.cpp b/src/XGUI/XGUI_ModuleConnector.cpp
index fdc407f7be5fa95b5a577b800f2748d43d346f16..b83edb4c8d158e4233a4368875f232d6234ee576 100644 (file)
--- a/src/XGUI/XGUI_ModuleConnector.cpp
+++ b/src/XGUI/XGUI_ModuleConnector.cpp
@@ -13,6 +13,8 @@
 #include "XGUI_Displayer.h"
 #include "XGUI_PropertyPanel.h"
 
+#include <ModuleBase_IModule.h>
+
 #include <AIS_Shape.hxx>
 
 
@@ -83,6 +85,14 @@ void XGUI_ModuleConnector::deactivateSubShapesSelection()
   XGUI_Displayer* aDisp = myWorkshop->displayer();
   // Clear selection modes
   QIntList aModes;
+  // TODO: check on OCC6.9.0
+  // the module current active modes should not be deactivated in order to save the objects selected
+  // the deactivate object in the mode of selection leads to the object is deselected in the viewer.
+  // But, in OCC6.8.0 this deselection does not happened automatically. It is necessary to call
+  // ClearOutdatedSelection, but this method has an error in the realization, which should be fixed in
+  // the OCC6.9.0 release. Moreother, it is possible that ClearOutdatedSelection will be called inside
+  // Deactivate method of AIS_InteractiveContext. In this case, we need not call it.
+  module()->activeSelectionModes(aModes);
   aDisp->activateObjects(aModes);
   // The document limitation selection has to be only during operation
   //aDisp->removeSelectionFilter(myDocumentShapeFilter);
@@ -104,7 +114,11 @@ ObjectPtr XGUI_ModuleConnector::findPresentedObject(const AISObjectPtr& theAIS)
 void XGUI_ModuleConnector::setSelected(const QObjectPtrList& theFeatures)
 {
   XGUI_Displayer* aDisp = myWorkshop->displayer();
-  aDisp->setSelected(theFeatures);
+  if (theFeatures.isEmpty()) {
+    myWorkshop->selector()->clearSelection();
+  } else {
+    aDisp->setSelected(theFeatures);
+  }    
 }
 
 bool XGUI_ModuleConnector::canStartOperation(QString theId)