X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ModuleConnector.cpp;h=5c67a3d5037b62d454236c5de5ec2b8b403b1c11;hb=8949ea64bcce6c1ce9f5694523f3ad427255dff6;hp=4e599649fa3eb786a10decc12b93eebe725d5eb1;hpb=7074394f8f08413d885f63be01df6bd5007b868c;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ModuleConnector.cpp b/src/XGUI/XGUI_ModuleConnector.cpp
index 4e599649f..5c67a3d50 100644
--- a/src/XGUI/XGUI_ModuleConnector.cpp
+++ b/src/XGUI/XGUI_ModuleConnector.cpp
@@ -21,13 +21,15 @@
 #include "XGUI_ModuleConnector.h"
 #include "XGUI_Workshop.h"
 #include "XGUI_ViewerProxy.h"
-#include "XGUI_SelectionMgr.h"
 #include "XGUI_Selection.h"
+#include "XGUI_SelectionActivate.h"
+#include "XGUI_SelectionMgr.h"
 #include "XGUI_OperationMgr.h"
 #include "XGUI_Displayer.h"
 #include "XGUI_PropertyPanel.h"
 #include "XGUI_ActionsMgr.h"
 #include "XGUI_ErrorMgr.h"
+#include "XGUI_ObjectsBrowser.h"
 
 #include <ModuleBase_IModule.h>
 #include <ModuleBase_ViewerPrs.h>
@@ -78,6 +80,11 @@ ModuleBase_IErrorMgr* XGUI_ModuleConnector::errorMgr() const
   return myWorkshop->errorMgr();
 }
 
+ModuleBase_ISelectionActivate* XGUI_ModuleConnector::selectionActivate() const
+{
+  return myWorkshop->selectionActivate();
+}
+
 ModuleBase_Operation* XGUI_ModuleConnector::currentOperation() const
 {
   return myWorkshop->operationMgr()->currentOperation();
@@ -96,32 +103,18 @@ QObjectPtrList XGUI_ModuleConnector::activeObjects(const QObjectPtrList& theObjL
   return aActiveOPbjects;
 }
 
-void XGUI_ModuleConnector::activateSubShapesSelection(const QIntList& theTypes)
+AISObjectPtr XGUI_ModuleConnector::findPresentation(const ObjectPtr& theObject) const
 {
-  QIntList aTypes = theTypes;
-
   XGUI_Displayer* aDisp = myWorkshop->displayer();
-  myWorkshop->module()->customSubShapesSelectionModes(aTypes);
-  aDisp->activateObjects(aTypes, activeObjects(aDisp->displayedObjects()));
-}
-
-void XGUI_ModuleConnector::deactivateSubShapesSelection()
-{
-  // Clear selection modes
-  activateModuleSelectionModes();
+  return aDisp->getAISObject(theObject);
 }
 
-void XGUI_ModuleConnector::activateModuleSelectionModes()
+bool XGUI_ModuleConnector::isVisible(const ObjectPtr& theObject) const
 {
   XGUI_Displayer* aDisp = myWorkshop->displayer();
-  myWorkshop->activateObjectsSelection(activeObjects(aDisp->displayedObjects()));
+  return aDisp->isVisible(theObject);
 }
 
-AISObjectPtr XGUI_ModuleConnector::findPresentation(const ObjectPtr& theObject) const
-{
-  XGUI_Displayer* aDisp = myWorkshop->displayer();
-  return aDisp->getAISObject(theObject);
-}
 
 ObjectPtr XGUI_ModuleConnector::findPresentedObject(const AISObjectPtr& theAIS) const
 {
@@ -133,10 +126,21 @@ ObjectPtr XGUI_ModuleConnector::findPresentedObject(const AISObjectPtr& theAIS)
 void XGUI_ModuleConnector::setSelected(const QList<ModuleBase_ViewerPrsPtr>& theValues)
 {
   XGUI_Displayer* aDisp = myWorkshop->displayer();
+  XGUI_ObjectsBrowser* aBrowser = myWorkshop->objectBrowser();
   if (theValues.isEmpty()) {
     myWorkshop->selector()->clearSelection();
-  } else
+    aBrowser->treeView()->clearSelection();
+  } else {
     aDisp->setSelected(theValues);
+    // Synchronise the selection with Object browser
+    QObjectPtrList anObjects;
+    foreach(ModuleBase_ViewerPrsPtr aVal, theValues) {
+      anObjects.append(aVal->object());
+    }
+    bool aBlocked = myWorkshop->objectBrowser()->blockSignals(true);
+    aBrowser->setObjectsSelected(anObjects);
+    myWorkshop->objectBrowser()->blockSignals(aBlocked);
+  }
 }
 
 void XGUI_ModuleConnector::setStatusBarMessage(const QString& theMessage)
@@ -193,6 +197,10 @@ QMainWindow* XGUI_ModuleConnector::desktop() const
   return myWorkshop->desktop();
 }
 
+bool XGUI_ModuleConnector::hasSHIFTPressed() const
+{
+  return myWorkshop->operationMgr()->hasSHIFTPressed();
+}
 
 std::shared_ptr<Config_FeatureMessage> XGUI_ModuleConnector::featureInfo(const QString& theId) const
 {