Issue #1330 selection lost correction: rectangle, fillet, select a point(the line...

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

diff --git a/src/XGUI/XGUI_ModuleConnector.cpp b/src/XGUI/XGUI_ModuleConnector.cpp
index 8ebed4c15f5b33b88fb2da4a3bb2131e481a3915..bc8d74140c16a92a0e5c824875800a9e4aa7c87d 100644 (file)
--- a/src/XGUI/XGUI_ModuleConnector.cpp
+++ b/src/XGUI/XGUI_ModuleConnector.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
 // File:        XGUI_ModuleConnector.cpp
 // Created:     3 June 2014
 // Author:      Vitaly Smetannikov
@@ -8,6 +10,13 @@
 #include "XGUI_SelectionMgr.h"
 #include "XGUI_Selection.h"
 #include "XGUI_OperationMgr.h"
+#include "XGUI_Displayer.h"
+#include "XGUI_PropertyPanel.h"
+
+#include <ModuleBase_IModule.h>
+
+#include <AIS_Shape.hxx>
+
 
 XGUI_ModuleConnector::XGUI_ModuleConnector(XGUI_Workshop* theWorkshop)
     : ModuleBase_IWorkshop(theWorkshop),
@@ -17,11 +26,6 @@ XGUI_ModuleConnector::XGUI_ModuleConnector(XGUI_Workshop* theWorkshop)
   connect(aSelector, SIGNAL(selectionChanged()), this, SIGNAL(selectionChanged()));
   
   XGUI_OperationMgr* anOperationMgr = myWorkshop->operationMgr();
-
-  connect(anOperationMgr, SIGNAL(operationStarted(ModuleBase_Operation*)), 
-    this, SIGNAL(operationStarted(ModuleBase_Operation*)));
-  connect(anOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)), 
-    this, SIGNAL(operationStopped(ModuleBase_Operation*)));
 }
 
 XGUI_ModuleConnector::~XGUI_ModuleConnector()
@@ -43,24 +47,93 @@ ModuleBase_IViewer* XGUI_ModuleConnector::viewer() const
   return myWorkshop->viewer();
 }
 
+ModuleBase_IPropertyPanel* XGUI_ModuleConnector::propertyPanel() const
+{
+  return myWorkshop->propertyPanel();
+}
+
 ModuleBase_Operation* XGUI_ModuleConnector::currentOperation() const
 {
   return myWorkshop->operationMgr()->currentOperation();
 }
 
 
-void XGUI_ModuleConnector::activateSubShapesSelection(const QIntList& theTypes)
+QObjectPtrList XGUI_ModuleConnector::activeObjects(const QObjectPtrList& theObjList) const
 {
-  Handle(AIS_InteractiveContext) aAIS = myWorkshop->viewer()->AISContext();
-  if (!aAIS->HasOpenedContext())
-    aAIS->OpenLocalContext();
-  foreach(int aType, theTypes) {
-    aAIS->ActivateStandardMode((TopAbs_ShapeEnum)aType);
+  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)
+{
+  XGUI_Displayer* aDisp = myWorkshop->displayer();
+  aDisp->activateObjects(theTypes, activeObjects(aDisp->displayedObjects()));
 }
 
 void XGUI_ModuleConnector::deactivateSubShapesSelection()
 {
-  Handle(AIS_InteractiveContext) aAIS = myWorkshop->viewer()->AISContext();
-  aAIS->CloseAllContexts();
+  // Clear selection modes
+  activateModuleSelectionModes();
+}
+
+void XGUI_ModuleConnector::activateModuleSelectionModes()
+{
+  XGUI_Displayer* aDisp = myWorkshop->displayer();
+  QIntList aModes;
+  module()->activeSelectionModes(aModes);
+  aDisp->activateObjects(aModes, activeObjects(aDisp->displayedObjects()));
 }
+
+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
+{
+  XGUI_Displayer* aDisp = myWorkshop->displayer();
+  ObjectPtr anObject = aDisp->getObject(theAIS);
+  return anObject;
+}
+
+void XGUI_ModuleConnector::setSelected(const QList<ModuleBase_ViewerPrs>& theValues)
+{
+  XGUI_Displayer* aDisp = myWorkshop->displayer();
+  if (theValues.isEmpty()) {
+    myWorkshop->selector()->clearSelection();
+  } else {
+    aDisp->setSelected(theValues);
+  }    
+}
+
+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();
+}
\ No newline at end of file