Minimization of activate/deactivate calls.

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

diff --git a/src/XGUI/XGUI_ModuleConnector.cpp b/src/XGUI/XGUI_ModuleConnector.cpp
index b83edb4c8d158e4233a4368875f232d6234ee576..486b89b85a29448deef094eeb51ea9302e85ce22 100644 (file)
--- a/src/XGUI/XGUI_ModuleConnector.cpp
+++ b/src/XGUI/XGUI_ModuleConnector.cpp
@@ -26,13 +26,10 @@ XGUI_ModuleConnector::XGUI_ModuleConnector(XGUI_Workshop* theWorkshop)
   connect(aSelector, SIGNAL(selectionChanged()), this, SIGNAL(selectionChanged()));
   
   XGUI_OperationMgr* anOperationMgr = myWorkshop->operationMgr();
-
-  //myDocumentShapeFilter = new ModuleBase_ShapeDocumentFilter(this);
 }
 
 XGUI_ModuleConnector::~XGUI_ModuleConnector()
 {
-  //myDocumentShapeFilter.Nullify();
 }
 
 ModuleBase_ISelection* XGUI_ModuleConnector::selection() const
@@ -61,42 +58,36 @@ ModuleBase_Operation* XGUI_ModuleConnector::currentOperation() const
 }
 
 
+QObjectPtrList XGUI_ModuleConnector::activeObjects(const QObjectPtrList& theObjList) const
+{
+  QObjectPtrList aActiveOPbjects;
+  ModuleBase_IModule* aModule = myWorkshop->module();
+  // Activate objects only which can be activated
+  foreach (ObjectPtr aObj, theObjList) {
+    if (aModule->canActivateSelection(aObj))
+      aActiveOPbjects.append(aObj);
+  }
+  return aActiveOPbjects;
+}
+
 void XGUI_ModuleConnector::activateSubShapesSelection(const QIntList& theTypes)
 {
   XGUI_Displayer* aDisp = myWorkshop->displayer();
-  // Close context if it was opened in order to clear stsndard selection modes
-  //aDisp->closeLocalContexts(false);
-  //aDisp->openLocalContext();
-  // Convert shape types to selection types
-  QIntList aModes;
-  foreach(int aType, theTypes) {
-    if (aType > TopAbs_SHAPE) 
-      aModes.append(aType);
-    else
-      aModes.append(AIS_Shape::SelectionMode((TopAbs_ShapeEnum)aType));
-  }
-  aDisp->activateObjects(aModes);
-  //TODO: We have to open Local context because at neutral point filters don't work (bug 25340)
-  //aDisp->addSelectionFilter(myDocumentShapeFilter);
+  aDisp->activateObjects(theTypes, activeObjects(aDisp->displayedObjects()));
 }
 
 void XGUI_ModuleConnector::deactivateSubShapesSelection()
 {
-  XGUI_Displayer* aDisp = myWorkshop->displayer();
   // Clear selection modes
+  activateModuleSelectionModes();
+}
+
+void XGUI_ModuleConnector::activateModuleSelectionModes()
+{
+  XGUI_Displayer* aDisp = myWorkshop->displayer();
   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);
-  //aDisp->closeLocalContexts(false);
+  aDisp->activateObjects(aModes, activeObjects(aDisp->displayedObjects()));
 }
 
 AISObjectPtr XGUI_ModuleConnector::findPresentation(const ObjectPtr& theObject) const
@@ -111,13 +102,13 @@ ObjectPtr XGUI_ModuleConnector::findPresentedObject(const AISObjectPtr& theAIS)
   return aDisp->getObject(theAIS);
 }
 
-void XGUI_ModuleConnector::setSelected(const QObjectPtrList& theFeatures)
+void XGUI_ModuleConnector::setSelected(const QList<ModuleBase_ViewerPrs>& theValues)
 {
   XGUI_Displayer* aDisp = myWorkshop->displayer();
-  if (theFeatures.isEmpty()) {
+  if (theValues.isEmpty()) {
     myWorkshop->selector()->clearSelection();
   } else {
-    aDisp->setSelected(theFeatures);
+    aDisp->setSelected(theValues);
   }    
 }