X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ModuleConnector.cpp;h=486b89b85a29448deef094eeb51ea9302e85ce22;hb=a94eeab620f6c2a559f5fea9b7d638423d010e62;hp=d1b2d8d2b4cb8f227565fd6db591807f39d600d2;hpb=6ebb0f00477866099d80a8373d2b306d8ed0906e;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ModuleConnector.cpp b/src/XGUI/XGUI_ModuleConnector.cpp
index d1b2d8d2b..486b89b85 100644
--- a/src/XGUI/XGUI_ModuleConnector.cpp
+++ b/src/XGUI/XGUI_ModuleConnector.cpp
@@ -11,6 +11,9 @@
 #include "XGUI_Selection.h"
 #include "XGUI_OperationMgr.h"
 #include "XGUI_Displayer.h"
+#include "XGUI_PropertyPanel.h"
+
+#include <ModuleBase_IModule.h>
 
 #include <AIS_Shape.hxx>
 
@@ -23,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
@@ -47,34 +47,47 @@ ModuleBase_IViewer* XGUI_ModuleConnector::viewer() const
   return myWorkshop->viewer();
 }
 
+ModuleBase_IPropertyPanel* XGUI_ModuleConnector::propertyPanel() const
+{
+  return myWorkshop->propertyPanel();
+}
+
 ModuleBase_Operation* XGUI_ModuleConnector::currentOperation() const
 {
   return myWorkshop->operationMgr()->currentOperation();
 }
 
 
+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) {
-    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()
+{
+  // Clear selection modes
+  activateModuleSelectionModes();
+}
+
+void XGUI_ModuleConnector::activateModuleSelectionModes()
 {
   XGUI_Displayer* aDisp = myWorkshop->displayer();
-  // The document limitation selection has to be only during operation
-  //aDisp->removeSelectionFilter(myDocumentShapeFilter);
-  aDisp->closeLocalContexts(false);
+  QIntList aModes;
+  module()->activeSelectionModes(aModes);
+  aDisp->activateObjects(aModes, activeObjects(aDisp->displayedObjects()));
 }
 
 AISObjectPtr XGUI_ModuleConnector::findPresentation(const ObjectPtr& theObject) const
@@ -89,13 +102,18 @@ 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();
-  aDisp->setSelected(theFeatures);
+  if (theValues.isEmpty()) {
+    myWorkshop->selector()->clearSelection();
+  } else {
+    aDisp->setSelected(theValues);
+  }    
 }
 
 bool XGUI_ModuleConnector::canStartOperation(QString theId)
 {
   return myWorkshop->operationMgr()->canStartOperation(theId);
 }
+