Issue #1412: Activate selection mode FACES for sketcher only in operations with selector:

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

diff --git a/src/XGUI/XGUI_ModuleConnector.cpp b/src/XGUI/XGUI_ModuleConnector.cpp
index 486b89b85a29448deef094eeb51ea9302e85ce22..4163952e319710d777fcd7b81f62fc5893dbd2e6 100644 (file)
--- a/src/XGUI/XGUI_ModuleConnector.cpp
+++ b/src/XGUI/XGUI_ModuleConnector.cpp
@@ -12,11 +12,18 @@
 #include "XGUI_OperationMgr.h"
 #include "XGUI_Displayer.h"
 #include "XGUI_PropertyPanel.h"
+#include "XGUI_ActionsMgr.h"
 
 #include <ModuleBase_IModule.h>
+#include <ModuleBase_ViewerPrs.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),
@@ -72,8 +79,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 +95,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
@@ -99,10 +107,11 @@ AISObjectPtr XGUI_ModuleConnector::findPresentation(const ObjectPtr& theObject)
 ObjectPtr XGUI_ModuleConnector::findPresentedObject(const AISObjectPtr& theAIS) const
 {
   XGUI_Displayer* aDisp = myWorkshop->displayer();
-  return aDisp->getObject(theAIS);
+  ObjectPtr anObject = aDisp->getObject(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()) {
@@ -112,8 +121,51 @@ void XGUI_ModuleConnector::setSelected(const QList<ModuleBase_ViewerPrs>& theVal
   }    
 }
 
+void XGUI_ModuleConnector::setStatusBarMessage(const QString& theMessage)
+{
+  myWorkshop->setStatusBarMessage(theMessage);
+}
+
 bool XGUI_ModuleConnector::canStartOperation(QString theId)
 {
   return myWorkshop->operationMgr()->canStartOperation(theId);
 }
 
+ModuleBase_Operation* XGUI_ModuleConnector::findStartedOperation(const QString& theId)
+{
+  return myWorkshop->operationMgr()->findOperation(theId);
+}
+
+bool XGUI_ModuleConnector::canStopOperation(ModuleBase_Operation* theOperation)
+{
+  return myWorkshop->operationMgr()->canStopOperation(theOperation);
+}
+
+void XGUI_ModuleConnector::abortOperation(ModuleBase_Operation* theOperation)
+{
+  myWorkshop->operationMgr()->abortOperation(theOperation);
+}
+
+void XGUI_ModuleConnector::updateCommandStatus()
+{
+  myWorkshop->updateCommandStatus();
+}
+
+QMainWindow* XGUI_ModuleConnector::desktop() const 
+{ 
+  return myWorkshop->desktop(); 
+}
+
+
+std::shared_ptr<Config_FeatureMessage> XGUI_ModuleConnector::featureInfo(const QString& theId) const
+{
+#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
+}