X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ModuleConnector.cpp;h=b832fbb3071833f34b1eb610a7dcef366587b1c3;hb=4c763543675ec80cad142d3a2f8b4766ca64ac0f;hp=301b1019285ed126fa4d9407c4146b606394b80b;hpb=8c61cbe058ed744affb3ae76379c8f3ce1d1cdf2;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ModuleConnector.cpp b/src/XGUI/XGUI_ModuleConnector.cpp
index 301b10192..b832fbb30 100644
--- a/src/XGUI/XGUI_ModuleConnector.cpp
+++ b/src/XGUI/XGUI_ModuleConnector.cpp
@@ -1,8 +1,22 @@
-// 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"
@@ -12,11 +26,20 @@
 #include "XGUI_OperationMgr.h"
 #include "XGUI_Displayer.h"
 #include "XGUI_PropertyPanel.h"
+#include "XGUI_ActionsMgr.h"
+#include "XGUI_ErrorMgr.h"
 
 #include <ModuleBase_IModule.h>
+#include <ModuleBase_ViewerPrs.h>
+#include <ModuleBase_OperationDescription.h>
 
 #include <AIS_Shape.hxx>
 
+#ifndef HAVE_SALOME
+#include "AppElements_Command.h"
+#else
+#include "XGUI_SalomeConnector.h"
+#endif
 
 XGUI_ModuleConnector::XGUI_ModuleConnector(XGUI_Workshop* theWorkshop)
     : ModuleBase_IWorkshop(theWorkshop),
@@ -24,8 +47,6 @@ XGUI_ModuleConnector::XGUI_ModuleConnector(XGUI_Workshop* theWorkshop)
 {
   XGUI_SelectionMgr* aSelector = myWorkshop->selector();
   connect(aSelector, SIGNAL(selectionChanged()), this, SIGNAL(selectionChanged()));
-  
-  XGUI_OperationMgr* anOperationMgr = myWorkshop->operationMgr();
 }
 
 XGUI_ModuleConnector::~XGUI_ModuleConnector()
@@ -52,6 +73,11 @@ ModuleBase_IPropertyPanel* XGUI_ModuleConnector::propertyPanel() const
   return myWorkshop->propertyPanel();
 }
 
+ModuleBase_IErrorMgr* XGUI_ModuleConnector::errorMgr() const
+{
+  return myWorkshop->errorMgr();
+}
+
 ModuleBase_Operation* XGUI_ModuleConnector::currentOperation() const
 {
   return myWorkshop->operationMgr()->currentOperation();
@@ -72,8 +98,11 @@ QObjectPtrList XGUI_ModuleConnector::activeObjects(const QObjectPtrList& theObjL
 
 void XGUI_ModuleConnector::activateSubShapesSelection(const QIntList& theTypes)
 {
+  QIntList aTypes = theTypes;
+
   XGUI_Displayer* aDisp = myWorkshop->displayer();
-  aDisp->activateObjects(theTypes, activeObjects(aDisp->displayedObjects()));
+  myWorkshop->module()->customSubShapesSelectionModes(aTypes);
+  aDisp->activateObjects(aTypes, activeObjects(aDisp->displayedObjects()));
 }
 
 void XGUI_ModuleConnector::deactivateSubShapesSelection()
@@ -85,9 +114,7 @@ void XGUI_ModuleConnector::deactivateSubShapesSelection()
 void XGUI_ModuleConnector::activateModuleSelectionModes()
 {
   XGUI_Displayer* aDisp = myWorkshop->displayer();
-  QIntList aModes;
-  module()->activeSelectionModes(aModes);
-  aDisp->activateObjects(aModes, activeObjects(aDisp->displayedObjects()));
+  myWorkshop->activateObjectsSelection(activeObjects(aDisp->displayedObjects()));
 }
 
 AISObjectPtr XGUI_ModuleConnector::findPresentation(const ObjectPtr& theObject) const
@@ -103,19 +130,41 @@ ObjectPtr XGUI_ModuleConnector::findPresentedObject(const AISObjectPtr& theAIS)
   return anObject;
 }
 
-void XGUI_ModuleConnector::setSelected(const QList<ModuleBase_ViewerPrs>& theValues)
+void XGUI_ModuleConnector::setSelected(const QList<ModuleBase_ViewerPrsPtr>& theValues)
 {
   XGUI_Displayer* aDisp = myWorkshop->displayer();
   if (theValues.isEmpty()) {
     myWorkshop->selector()->clearSelection();
-  } else {
+  } else
     aDisp->setSelected(theValues);
-  }    
 }
 
-bool XGUI_ModuleConnector::canStartOperation(QString theId)
+void XGUI_ModuleConnector::setStatusBarMessage(const QString& theMessage)
 {
-  return myWorkshop->operationMgr()->canStartOperation(theId);
+  myWorkshop->setStatusBarMessage(theMessage);
+}
+
+bool XGUI_ModuleConnector::canStartOperation(QString theId, bool& isCommitted)
+{
+  return myWorkshop->operationMgr()->canStartOperation(theId, isCommitted);
+}
+
+void XGUI_ModuleConnector::processLaunchOperation(ModuleBase_Operation* theOperation)
+{
+  XGUI_OperationMgr* anOperationMgr = workshop()->operationMgr();
+
+  if (anOperationMgr->startOperation(theOperation)) {
+    ModuleBase_OperationFeature* aFOperation =
+      dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+    if (aFOperation) {
+      workshop()->propertyPanel()->updateContentWidget(aFOperation->feature());
+      workshop()->propertyPanel()->createContentPanel(aFOperation->feature());
+    }
+    if (!theOperation->getDescription()->hasXmlRepresentation()) {
+      if (theOperation->commit())
+        workshop()->updateCommandStatus();
+    }
+  }
 }
 
 ModuleBase_Operation* XGUI_ModuleConnector::findStartedOperation(const QString& theId)
@@ -123,12 +172,41 @@ ModuleBase_Operation* XGUI_ModuleConnector::findStartedOperation(const QString&
   return myWorkshop->operationMgr()->findOperation(theId);
 }
 
-bool XGUI_ModuleConnector::canStopOperation()
+bool XGUI_ModuleConnector::canStopOperation(ModuleBase_Operation* theOperation)
+{
+  return myWorkshop->operationMgr()->canStopOperation(theOperation);
+}
+
+void XGUI_ModuleConnector::stopOperation(ModuleBase_Operation* theOperation,
+                                         bool& isCommitted)
+{
+  myWorkshop->operationMgr()->stopOperation(theOperation, isCommitted);
+}
+
+void XGUI_ModuleConnector::updateCommandStatus()
+{
+  myWorkshop->updateCommandStatus();
+}
+
+QMainWindow* XGUI_ModuleConnector::desktop() const
+{
+  return myWorkshop->desktop();
+}
+
+bool XGUI_ModuleConnector::hasSHIFTPressed() const
 {
-  return myWorkshop->operationMgr()->canStopOperation();
+  return myWorkshop->operationMgr()->hasSHIFTPressed();
 }
 
-void XGUI_ModuleConnector::abortOperation(ModuleBase_Operation* theOperation)
+std::shared_ptr<Config_FeatureMessage> XGUI_ModuleConnector::featureInfo(const QString& theId) const
 {
-  myWorkshop->operationMgr()->abortOperation(theOperation);
+#ifdef HAVE_SALOME
+  return myWorkshop->salomeConnector()->featureInfo(theId);
+#else
+  AppElements_Command* aAction =
+    dynamic_cast<AppElements_Command*>(myWorkshop->actionsMgr()->action(theId));
+  if (aAction)
+    return aAction->featureMessage();
+  return std::shared_ptr<Config_FeatureMessage>();
+#endif
 }