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 b83edb4c8d158e4233a4368875f232d6234ee576..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),
@@ -26,13 +33,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
@@ -61,42 +65,37 @@ ModuleBase_Operation* XGUI_ModuleConnector::currentOperation() const
 }
 
 
+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)
 {
+  QIntList aTypes = 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) {
-    if (aType > TopAbs_SHAPE) 
-      aModes.append(aType);
-    else
-      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);
+  myWorkshop->module()->customSubShapesSelectionModes(aTypes);
+  aDisp->activateObjects(aTypes, activeObjects(aDisp->displayedObjects()));
 }
 
 void XGUI_ModuleConnector::deactivateSubShapesSelection()
 {
-  XGUI_Displayer* aDisp = myWorkshop->displayer();
   // Clear selection modes
-  QIntList aModes;
-  // TODO: check on OCC6.9.0
-  // the module current active modes should not be deactivated in order to save the objects selected
-  // the deactivate object in the mode of selection leads to the object is deselected in the viewer.
-  // But, in OCC6.8.0 this deselection does not happened automatically. It is necessary to call
-  // ClearOutdatedSelection, but this method has an error in the realization, which should be fixed in
-  // the OCC6.9.0 release. Moreother, it is possible that ClearOutdatedSelection will be called inside
-  // Deactivate method of AIS_InteractiveContext. In this case, we need not call it.
-  module()->activeSelectionModes(aModes);
-  aDisp->activateObjects(aModes);
-  // The document limitation selection has to be only during operation
-  //aDisp->removeSelectionFilter(myDocumentShapeFilter);
-  //aDisp->closeLocalContexts(false);
+  activateModuleSelectionModes();
+}
+
+void XGUI_ModuleConnector::activateModuleSelectionModes()
+{
+  XGUI_Displayer* aDisp = myWorkshop->displayer();
+  myWorkshop->activateObjectsSelection(activeObjects(aDisp->displayedObjects()));
 }
 
 AISObjectPtr XGUI_ModuleConnector::findPresentation(const ObjectPtr& theObject) const
@@ -108,21 +107,65 @@ 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 QObjectPtrList& theFeatures)
+void XGUI_ModuleConnector::setSelected(const QList<ModuleBase_ViewerPrsPtr>& theValues)
 {
   XGUI_Displayer* aDisp = myWorkshop->displayer();
-  if (theFeatures.isEmpty()) {
+  if (theValues.isEmpty()) {
     myWorkshop->selector()->clearSelection();
   } else {
-    aDisp->setSelected(theFeatures);
+    aDisp->setSelected(theValues);
   }    
 }
 
+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
+}