X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ModuleConnector.cpp;h=0c7dcd6beba771096d0057cad314e8df2af0a0c4;hb=d4b0a5cb916f4eccf4a0bce02e43a54c7a67cb93;hp=805144797293e3734f9701360ee36fba44914675;hpb=dc0cabde0516396f5f4458574d1d56c857478200;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ModuleConnector.cpp b/src/XGUI/XGUI_ModuleConnector.cpp
index 805144797..0c7dcd6be 100644
--- a/src/XGUI/XGUI_ModuleConnector.cpp
+++ b/src/XGUI/XGUI_ModuleConnector.cpp
@@ -1,18 +1,35 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
-// File:        XGUI_ModuleConnector.cpp
-// Created:     3 June 2014
-// Author:      Vitaly Smetannikov
+// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #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>
@@ -58,6 +75,16 @@ ModuleBase_IPropertyPanel* XGUI_ModuleConnector::propertyPanel() const
   return myWorkshop->propertyPanel();
 }
 
+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();
@@ -76,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
 {
@@ -113,11 +126,19 @@ 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();
+    aBrowser->treeView()->clearSelection();
   } else {
     aDisp->setSelected(theValues);
-  }    
+    // Synchronise the selection with Object browser
+    QObjectPtrList anObjects;
+    foreach(ModuleBase_ViewerPrsPtr aVal, theValues) {
+      anObjects.append(aVal->object());
+    }
+    aBrowser->setObjectsSelected(anObjects);
+  }
 }
 
 void XGUI_ModuleConnector::setStatusBarMessage(const QString& theMessage)
@@ -125,9 +146,9 @@ void XGUI_ModuleConnector::setStatusBarMessage(const QString& theMessage)
   myWorkshop->setStatusBarMessage(theMessage);
 }
 
-bool XGUI_ModuleConnector::canStartOperation(QString theId)
+bool XGUI_ModuleConnector::canStartOperation(QString theId, bool& isCommitted)
 {
-  return myWorkshop->operationMgr()->canStartOperation(theId);
+  return myWorkshop->operationMgr()->canStartOperation(theId, isCommitted);
 }
 
 void XGUI_ModuleConnector::processLaunchOperation(ModuleBase_Operation* theOperation)
@@ -135,7 +156,7 @@ void XGUI_ModuleConnector::processLaunchOperation(ModuleBase_Operation* theOpera
   XGUI_OperationMgr* anOperationMgr = workshop()->operationMgr();
 
   if (anOperationMgr->startOperation(theOperation)) {
-    ModuleBase_OperationFeature* aFOperation = 
+    ModuleBase_OperationFeature* aFOperation =
       dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
     if (aFOperation) {
       workshop()->propertyPanel()->updateContentWidget(aFOperation->feature());
@@ -158,9 +179,10 @@ bool XGUI_ModuleConnector::canStopOperation(ModuleBase_Operation* theOperation)
   return myWorkshop->operationMgr()->canStopOperation(theOperation);
 }
 
-void XGUI_ModuleConnector::stopOperation(ModuleBase_Operation* theOperation)
+void XGUI_ModuleConnector::stopOperation(ModuleBase_Operation* theOperation,
+                                         bool& isCommitted)
 {
-  myWorkshop->operationMgr()->stopOperation(theOperation);
+  myWorkshop->operationMgr()->stopOperation(theOperation, isCommitted);
 }
 
 void XGUI_ModuleConnector::updateCommandStatus()
@@ -168,18 +190,22 @@ void XGUI_ModuleConnector::updateCommandStatus()
   myWorkshop->updateCommandStatus();
 }
 
-QMainWindow* XGUI_ModuleConnector::desktop() const 
-{ 
-  return myWorkshop->desktop(); 
+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
 {
 #ifdef HAVE_SALOME
   return myWorkshop->salomeConnector()->featureInfo(theId);
-#else 
-  AppElements_Command* aAction = 
+#else
+  AppElements_Command* aAction =
     dynamic_cast<AppElements_Command*>(myWorkshop->actionsMgr()->action(theId));
   if (aAction)
     return aAction->featureMessage();