Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1

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

diff --git a/src/XGUI/XGUI_ModuleConnector.cpp b/src/XGUI/XGUI_ModuleConnector.cpp
index 5bb4445fe695490c00a5d2208e28fd17533224e6..d1b2d8d2b4cb8f227565fd6db591807f39d600d2 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
@@ -22,17 +24,12 @@ XGUI_ModuleConnector::XGUI_ModuleConnector(XGUI_Workshop* theWorkshop)
   
   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*)));
-
-  myDocumentShapeFilter = new ModuleBase_ShapeDocumentFilter(this);
+  //myDocumentShapeFilter = new ModuleBase_ShapeDocumentFilter(this);
 }
 
 XGUI_ModuleConnector::~XGUI_ModuleConnector()
 {
-  myDocumentShapeFilter.Nullify();
+  //myDocumentShapeFilter.Nullify();
 }
 
 ModuleBase_ISelection* XGUI_ModuleConnector::selection() const
@@ -59,22 +56,24 @@ ModuleBase_Operation* XGUI_ModuleConnector::currentOperation() const
 void XGUI_ModuleConnector::activateSubShapesSelection(const QIntList& 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) {
     aModes.append(AIS_Shape::SelectionMode((TopAbs_ShapeEnum)aType));
   }
-  aDisp->activateObjectsOutOfContext(aModes);
+  aDisp->activateObjects(aModes);
   //TODO: We have to open Local context because at neutral point filters don't work (bug 25340)
-  aDisp->addSelectionFilter(myDocumentShapeFilter);
+  //aDisp->addSelectionFilter(myDocumentShapeFilter);
 }
 
 void XGUI_ModuleConnector::deactivateSubShapesSelection()
 {
   XGUI_Displayer* aDisp = myWorkshop->displayer();
   // The document limitation selection has to be only during operation
-  aDisp->removeSelectionFilter(myDocumentShapeFilter);
+  //aDisp->removeSelectionFilter(myDocumentShapeFilter);
   aDisp->closeLocalContexts(false);
 }
 
@@ -88,4 +87,15 @@ ObjectPtr XGUI_ModuleConnector::findPresentedObject(const AISObjectPtr& theAIS)
 {
   XGUI_Displayer* aDisp = myWorkshop->displayer();
   return aDisp->getObject(theAIS);
-}
\ No newline at end of file
+}
+
+void XGUI_ModuleConnector::setSelected(const QObjectPtrList& theFeatures)
+{
+  XGUI_Displayer* aDisp = myWorkshop->displayer();
+  aDisp->setSelected(theFeatures);
+}
+
+bool XGUI_ModuleConnector::canStartOperation(QString theId)
+{
+  return myWorkshop->operationMgr()->canStartOperation(theId);
+}