1. Check the owner is already selected and do not call for it AddOrRemoveSelected,

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

diff --git a/src/XGUI/XGUI_SelectionMgr.cpp b/src/XGUI/XGUI_SelectionMgr.cpp
index 9f830a74ec5757257915168ab59afcb277ad6e58..b0d22089f8c3da6c6c7fe48836be2822bbe9225d 100644 (file)
--- a/src/XGUI/XGUI_SelectionMgr.cpp
+++ b/src/XGUI/XGUI_SelectionMgr.cpp
@@ -1,87 +1,118 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
 #include "XGUI_SelectionMgr.h"
 
 #include "XGUI_Workshop.h"
-#include "XGUI_MainWindow.h"
 #include "XGUI_ObjectsBrowser.h"
 #include "XGUI_SalomeConnector.h"
 #include "XGUI_ViewerProxy.h"
 #include "XGUI_Displayer.h"
+#include "XGUI_Selection.h"
+
+#include <AppElements_MainWindow.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);
 }
 
 XGUI_SelectionMgr::~XGUI_SelectionMgr()
 {
+  delete mySelection;
 }
 
 //**************************************************************
 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()
+void XGUI_SelectionMgr::setSelectedOwners(const SelectMgr_IndexedMapOfOwner& theSelectedOwners,
+                                          bool isUpdateViewer)
 {
-  QFeatureList aFeatures = selectedFeatures();
-  XGUI_Displayer* aDisplayer = myWorkshop->displayer();
-  aDisplayer->setSelected(aFeatures);
+  SelectMgr_IndexedMapOfOwner aSelectedOwners;
+  selection()->selectedOwners(aSelectedOwners);
 
-  emit selectionChanged();
+  Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
+  for  (Standard_Integer i = 1, n = theSelectedOwners.Extent(); i <= n; i++)  {
+    Handle(SelectMgr_EntityOwner) anOwner = theSelectedOwners(i);
+    if (aSelectedOwners.FindIndex(anOwner) > 0)
+      continue;
+
+    aContext->AddOrRemoveSelected(anOwner, isUpdateViewer);
+  }
 }
 
 //**************************************************************
-void XGUI_SelectionMgr::onViewerSelection()
+void XGUI_SelectionMgr::onObjectBrowserSelection()
 {
+  QObjectPtrList aObjects = myWorkshop->objectBrowser()->selectedObjects();
   XGUI_Displayer* aDisplayer = myWorkshop->displayer();
-  QFeatureList aFeatures = aDisplayer->selectedFeatures();
-  myWorkshop->objectBrowser()->setFeaturesSelected(aFeatures);
+  aDisplayer->setSelected(aObjects);
   emit selectionChanged();
 }
 
 //**************************************************************
-QFeatureList XGUI_SelectionMgr::selectedFeatures() const 
-{ 
-  return myWorkshop->objectBrowser()->selectedFeatures(); 
-}
-
-//**************************************************************
-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::selectedShapes(NCollection_List<TopoDS_Shape>& theList) const
+void XGUI_SelectionMgr::onViewerSelection()
 {
-  theList.Clear();
+  QObjectPtrList aFeatures;
   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);
+    Handle(AIS_InteractiveObject) anIO = aContext->SelectedInteractive();
+    ObjectPtr aResult = myWorkshop->displayer()->getObject(anIO);
+    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(); 
+ }
+
+ //**************************************************************
+ 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::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);
+ }
+ }*/