ModuleBase_ViewerPrs is wrapped into shared_ptr.

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

diff --git a/src/XGUI/XGUI_SelectionMgr.cpp b/src/XGUI/XGUI_SelectionMgr.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 517f248..75ac126
--- a/src/XGUI/XGUI_SelectionMgr.cpp
+++ b/src/XGUI/XGUI_SelectionMgr.cpp
@@ -9,7 +9,9 @@
 #include "XGUI_Displayer.h"
 #include "XGUI_Selection.h"
 
+#ifndef HAVE_SALOME
 #include <AppElements_MainWindow.h>
+#endif
 
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Session.h>
@@ -50,12 +52,14 @@ void XGUI_SelectionMgr::setSelectedOwners(const SelectMgr_IndexedMapOfOwner& the
   selection()->selectedOwners(aSelectedOwners);
 
   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;
+  if (!aContext.IsNull()) {
+    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);
+      aContext->AddOrRemoveSelected(anOwner, isUpdateViewer);
+    }
   }
 }
 
@@ -63,6 +67,9 @@ void XGUI_SelectionMgr::setSelectedOwners(const SelectMgr_IndexedMapOfOwner& the
 void XGUI_SelectionMgr::updateSelectedOwners(bool isUpdateViewer)
 {
   Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
+  if (aContext.IsNull())
+    return;
+
   const SelectMgr_ListOfFilter& aFilters = aContext->Filters();
 
   SelectMgr_IndexedMapOfOwner anOwnersToDeselect;
@@ -86,9 +93,26 @@ void XGUI_SelectionMgr::updateSelectedOwners(bool isUpdateViewer)
 //**************************************************************
 void XGUI_SelectionMgr::onObjectBrowserSelection()
 {
-  QObjectPtrList aObjects = myWorkshop->objectBrowser()->selectedObjects();
-  QList<ModuleBase_ViewerPrs> aSelectedPrs = ModuleBase_ISelection::getViewerPrs(aObjects);
-
+  QList<ModuleBase_ViewerPrsPtr> aSelectedPrs =
+             myWorkshop->selector()->selection()->getSelected(ModuleBase_ISelection::Browser);
+
+  QList<ModuleBase_ViewerPrsPtr> aTmpList = aSelectedPrs;
+  ObjectPtr aObject;
+  FeaturePtr aFeature;
+  foreach(ModuleBase_ViewerPrsPtr aPrs, aTmpList) {
+    aObject = aPrs->object();
+    if (aObject.get()) {
+      aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObject);
+      if (aFeature.get()) {
+        const std::list<std::shared_ptr<ModelAPI_Result>> aResList = aFeature->results();
+        std::list<ResultPtr>::const_iterator aIt;
+        for (aIt = aResList.cbegin(); aIt != aResList.cend(); ++aIt) {
+          aSelectedPrs.append(std::shared_ptr<ModuleBase_ViewerPrs>(
+               new ModuleBase_ViewerPrs((*aIt), GeomShapePtr(), NULL)));
+        }
+      }
+    }
+  }
   XGUI_Displayer* aDisplayer = myWorkshop->displayer();
   aDisplayer->setSelected(aSelectedPrs);
   emit selectionChanged();
@@ -97,13 +121,27 @@ void XGUI_SelectionMgr::onObjectBrowserSelection()
 //**************************************************************
 void XGUI_SelectionMgr::onViewerSelection()
 {
+  SessionPtr aMgr = ModelAPI_Session::get();
+  DocumentPtr anActiveDocument = aMgr->activeDocument();
   QObjectPtrList aFeatures;
+  ResultPtr aResult;
+  FeaturePtr aFeature;
   Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
-  for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) {
-    Handle(AIS_InteractiveObject) anIO = aContext->SelectedInteractive();
-    ObjectPtr aResult = myWorkshop->displayer()->getObject(anIO);
-    if (aResult)
-      aFeatures.append(aResult);
+  if (!aContext.IsNull()) {
+    QList<ModuleBase_ViewerPrsPtr> aPresentations = selection()->getSelected(ModuleBase_ISelection::Viewer);
+    foreach(ModuleBase_ViewerPrsPtr aPrs, aPresentations) {
+      if (aPrs.object().get()) {
+        aFeatures.append(aPrs.object());
+        if (aPrs.shape().get()) {
+          aResult = std::dynamic_pointer_cast<ModelAPI_Result>(aPrs.object());
+          if (aResult.get()) {
+            aFeature = anActiveDocument->producedByFeature(aResult, aPrs.shape());
+            if (aFeature.get() && (!aFeatures.contains(aFeature)))
+              aFeatures.append(aFeature);
+          }
+        }
+      }
+    }
   }
   bool aBlocked = myWorkshop->objectBrowser()->blockSignals(true);
   myWorkshop->objectBrowser()->setObjectsSelected(aFeatures);
@@ -112,6 +150,17 @@ void XGUI_SelectionMgr::onViewerSelection()
   emit selectionChanged();
 }
 
+//**************************************************************
+void XGUI_SelectionMgr::updateSelectionBy(const ModuleBase_ISelection::SelectionPlace& thePlace)
+{
+  QList<ModuleBase_ViewerPrsPtr> aSelectedPrs =
+               myWorkshop->selector()->selection()->getSelected(thePlace);
+  if (thePlace == ModuleBase_ISelection::Browser) {
+    XGUI_Displayer* aDisplayer = myWorkshop->displayer();
+    aDisplayer->setSelected(aSelectedPrs);
+  }
+
+}
 //**************************************************************
 void XGUI_SelectionMgr::clearSelection()
 {
@@ -119,7 +168,9 @@ void XGUI_SelectionMgr::clearSelection()
   bool aBlocked = myWorkshop->objectBrowser()->blockSignals(true);
   myWorkshop->objectBrowser()->setObjectsSelected(aFeatures);
   myWorkshop->objectBrowser()->blockSignals(aBlocked);
-  QList<ModuleBase_ViewerPrs> aSelectedPrs = ModuleBase_ISelection::getViewerPrs(aFeatures);
+  
+  QList<ModuleBase_ViewerPrsPtr> aSelectedPrs =
+             myWorkshop->selector()->selection()->getSelected(ModuleBase_ISelection::Browser);
 
   XGUI_Displayer* aDisplayer = myWorkshop->displayer();
   aDisplayer->setSelected(aSelectedPrs);