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

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

diff --git a/src/XGUI/XGUI_SelectionMgr.cpp b/src/XGUI/XGUI_SelectionMgr.cpp
index 481db73366a3a4f06714ef767a03a414fbefd2fa..25bfd703030c8ab6fa309019005b5cc87d6786bb 100644 (file)
--- a/src/XGUI/XGUI_SelectionMgr.cpp
+++ b/src/XGUI/XGUI_SelectionMgr.cpp
@@ -9,16 +9,15 @@
 #include "XGUI_Selection.h"
 
 #include <ModelAPI_Feature.h>
-#include <ModelAPI_PluginManager.h>
+#include <ModelAPI_Session.h>
 #include <ModelAPI_AttributeDocRef.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Result.h>
 #include <ModelAPI_Object.h>
 
-
-
-XGUI_SelectionMgr::XGUI_SelectionMgr(XGUI_Workshop* theParent) :
-  QObject(theParent), myWorkshop(theParent)
+XGUI_SelectionMgr::XGUI_SelectionMgr(XGUI_Workshop* theParent)
+    : QObject(theParent),
+      myWorkshop(theParent)
 {
   mySelection = new XGUI_Selection(myWorkshop);
 }
@@ -31,33 +30,26 @@ XGUI_SelectionMgr::~XGUI_SelectionMgr()
 //**************************************************************
 void XGUI_SelectionMgr::connectViewers()
 {
-  connect(myWorkshop->objectBrowser(), SIGNAL(selectionChanged()), 
-    this, SLOT(onObjectBrowserSelection()));
+  connect(myWorkshop->objectBrowser(), SIGNAL(selectionChanged()), this,
+          SLOT(onObjectBrowserSelection()));
 
   //Connect to other viewers
-  connect(myWorkshop->viewer(), SIGNAL(selectionChanged()),
-    this, SLOT(onViewerSelection()));
+  connect(myWorkshop->viewer(), SIGNAL(selectionChanged()), this, SLOT(onViewerSelection()));
 }
 
 //**************************************************************
 void XGUI_SelectionMgr::onObjectBrowserSelection()
 {
-  QList<ObjectPtr> aObjects = myWorkshop->objectBrowser()->selectedObjects();
-  QResultList aResults;
-  foreach(ObjectPtr aObject, aObjects) {
-    ResultPtr aRes = boost::dynamic_pointer_cast<ModelAPI_Result>(aObject);
-    if (aRes)
-      aResults.append(aRes);
-  }
+  QObjectPtrList aObjects = myWorkshop->objectBrowser()->selectedObjects();
   XGUI_Displayer* aDisplayer = myWorkshop->displayer();
-  aDisplayer->setSelected(aResults);
+  aDisplayer->setSelected(aObjects);
   emit selectionChanged();
 }
 
 //**************************************************************
 void XGUI_SelectionMgr::onViewerSelection()
 {
-  QList<ObjectPtr> aFeatures;
+  QObjectPtrList aFeatures;
   Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
   for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) {
     Handle(AIS_InteractiveObject) anIO = aContext->SelectedInteractive();
@@ -65,39 +57,42 @@ void XGUI_SelectionMgr::onViewerSelection()
     if (aResult)
       aFeatures.append(aResult);
   }
+  bool aBlocked = myWorkshop->objectBrowser()->blockSignals(true);
   myWorkshop->objectBrowser()->setObjectsSelected(aFeatures);
+  myWorkshop->objectBrowser()->blockSignals(aBlocked);
+
   emit selectionChanged();
 }
 
 //**************************************************************
 /*QFeatureList XGUI_SelectionMgr::selectedFeatures() const 
-{ 
-  return myWorkshop->objectBrowser()->selectedFeatures(); 
-}
+ { 
+ return myWorkshop->objectBrowser()->selectedFeatures(); 
+ }
 
-//**************************************************************
-QModelIndexList XGUI_SelectionMgr::selectedIndexes() const 
-{ 
-  return myWorkshop->objectBrowser()->selectedIndexes();
-}
+ //**************************************************************
+ QModelIndexList XGUI_SelectionMgr::selectedIndexes() const 
+ { 
+ return myWorkshop->objectBrowser()->selectedIndexes();
+ }
 
-//**************************************************************
-void XGUI_SelectionMgr::selectedAISObjects(AIS_ListOfInteractive& theList) const
-{
-  Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
-  theList.Clear();
-  for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected())
-    theList.Append(aContext->SelectedInteractive());
-}
+ //**************************************************************
+ void XGUI_SelectionMgr::selectedAISObjects(AIS_ListOfInteractive& theList) const
+ {
+ Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
+ theList.Clear();
+ for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected())
+ theList.Append(aContext->SelectedInteractive());
+ }
 
-//**************************************************************
-void XGUI_SelectionMgr::selectedShapes(NCollection_List<TopoDS_Shape>& theList) const
-{
-  theList.Clear();
-  Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
-  for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) {
-    TopoDS_Shape aShape = aContext->SelectedShape();
-    if (!aShape.IsNull())
-      theList.Append(aShape);
-  }
-}*/
+ //**************************************************************
+ void XGUI_SelectionMgr::selectedShapes(NCollection_List<TopoDS_Shape>& theList) const
+ {
+ theList.Clear();
+ Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
+ for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) {
+ TopoDS_Shape aShape = aContext->SelectedShape();
+ if (!aShape.IsNull())
+ theList.Append(aShape);
+ }
+ }*/