Issue #273: A package AppElements is added to store sources which are not used in...

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

diff --git a/src/XGUI/XGUI_Selection.cpp b/src/XGUI/XGUI_Selection.cpp
index 8e4636fb92b07e38ab0160022ba5d1c9ec61654b..59a5d2cce022a2b5355c03a7edcd9f16d95283ec 100644 (file)
--- a/src/XGUI/XGUI_Selection.cpp
+++ b/src/XGUI/XGUI_Selection.cpp
@@ -14,65 +14,96 @@
 
 #include <set>
 
-
 XGUI_Selection::XGUI_Selection(XGUI_Workshop* theWorkshop)
-: myWorkshop(theWorkshop)
+    : myWorkshop(theWorkshop)
 {
 }
 
-std::list<ModuleBase_ViewerPrs> XGUI_Selection::getSelected(int theShapeTypeToSkip) const
+QList<ModuleBase_ViewerPrs> XGUI_Selection::getSelected(int theShapeTypeToSkip) const
 {
-  std::set<ObjectPtr> aPrsFeatures;
-  std::list<ModuleBase_ViewerPrs> aPresentations;
-
-  Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
-  for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) {
-    Handle(AIS_InteractiveObject) anIO = aContext->SelectedInteractive();
-    TopoDS_Shape aShape = aContext->SelectedShape();
+  QList<long> aSelectedIds; // Remember of selected address in order to avoid duplicates
 
-    if (theShapeTypeToSkip >= 0 && !aShape.IsNull() && aShape.ShapeType() == theShapeTypeToSkip)
-      continue;
+  QList<ModuleBase_ViewerPrs> aPresentations;
+  XGUI_Displayer* aDisplayer = myWorkshop->displayer();
 
-    ObjectPtr aFeature = myWorkshop->displayer()->getObject(anIO);
-    if (aPrsFeatures.find(aFeature) != aPrsFeatures.end())
-      continue;
-    Handle(SelectMgr_EntityOwner) anOwner = aContext->SelectedOwner();
-    aPresentations.push_back(ModuleBase_ViewerPrs(aFeature, aShape, anOwner));
-    aPrsFeatures.insert(aFeature);
+  Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
+  if (aContext->HasOpenedContext()) {
+    for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) {
+      ModuleBase_ViewerPrs aPrs;
+      Handle(AIS_InteractiveObject) anIO = aContext->SelectedInteractive();
+      if (aSelectedIds.contains((long)anIO.Access()))
+        continue;
+    
+      aSelectedIds.append((long)anIO.Access());
+      aPrs.setInteractive(anIO);
+
+      ObjectPtr aFeature = aDisplayer->getObject(anIO);
+      // we should not check the appearance of this feature because there can be some selected shapes
+      // for one feature
+      TopoDS_Shape aShape = aContext->SelectedShape();
+      if (!aShape.IsNull() && (aShape.ShapeType() != theShapeTypeToSkip))
+        aPrs.setShape(aShape);
+      Handle(SelectMgr_EntityOwner) anOwner = aContext->SelectedOwner();
+      aPrs.setOwner(anOwner);
+      aPrs.setFeature(aFeature);
+      aPresentations.append(aPrs);
+    }
+  } else {
+    for (aContext->InitCurrent(); aContext->MoreCurrent(); aContext->NextCurrent()) {
+      ModuleBase_ViewerPrs aPrs;
+      Handle(AIS_InteractiveObject) anIO = aContext->Current();
+      if (aSelectedIds.contains((long)anIO.Access()))
+        continue;
+    
+      aSelectedIds.append((long)anIO.Access());
+      aPrs.setInteractive(anIO);
+
+      ObjectPtr aFeature = aDisplayer->getObject(anIO);
+      aPrs.setFeature(aFeature);
+      aPresentations.append(aPrs);
+    }
   }
   return aPresentations;
 }
 
-std::list<ModuleBase_ViewerPrs> XGUI_Selection::getHighlighted(int theShapeTypeToSkip) const
+QList<ModuleBase_ViewerPrs> XGUI_Selection::getHighlighted(int theShapeTypeToSkip) const
 {
-  std::set<ObjectPtr> aPrsFeatures;
-  std::list<ModuleBase_ViewerPrs> aPresentations;
+  QList<long> aSelectedIds; // Remember of selected address in order to avoid duplicates
+  QList<ModuleBase_ViewerPrs> aPresentations;
+  XGUI_Displayer* aDisplayer = myWorkshop->displayer();
 
   Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
   for (aContext->InitDetected(); aContext->MoreDetected(); aContext->NextDetected()) {
+    ModuleBase_ViewerPrs aPrs;
     Handle(AIS_InteractiveObject) anIO = aContext->DetectedInteractive();
-    TopoDS_Shape aShape = aContext->DetectedShape();
-    if (theShapeTypeToSkip >= 0 && !aShape.IsNull() && aShape.ShapeType() == theShapeTypeToSkip)
-      continue;
-
-    ObjectPtr aResult = myWorkshop->displayer()->getObject(anIO);
-    if (aPrsFeatures.find(aResult) != aPrsFeatures.end())
+    if (aSelectedIds.contains((long)anIO.Access()))
       continue;
-    aPresentations.push_back(ModuleBase_ViewerPrs(aResult, aShape, NULL));
-    aPrsFeatures.insert(aResult);
+    
+    aSelectedIds.append((long)anIO.Access());
+    aPrs.setInteractive(anIO);
+
+    ObjectPtr aResult = aDisplayer->getObject(anIO);
+    // we should not check the appearance of this feature because there can be some selected shapes
+    // for one feature
+    aPrs.setFeature(aResult);
+    if (aContext->HasOpenedContext()) {
+      TopoDS_Shape aShape = aContext->DetectedShape();
+      if (!aShape.IsNull() && aShape.ShapeType() != theShapeTypeToSkip)
+        aPrs.setShape(aShape);
+    }
+    aPresentations.push_back(aPrs);
   }
-
   return aPresentations;
 }
 
-QList<ObjectPtr> XGUI_Selection::selectedObjects() const
+QObjectPtrList XGUI_Selection::selectedObjects() const
 {
   return myWorkshop->objectBrowser()->selectedObjects();
 }
-  
-QList<ObjectPtr> XGUI_Selection::selectedPresentations() const
+
+QObjectPtrList XGUI_Selection::selectedPresentations() const
 {
-  QList<ObjectPtr> aSelectedList;
+  QObjectPtrList aSelectedList;
 
   Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
   for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) {
@@ -84,10 +115,9 @@ QList<ObjectPtr> XGUI_Selection::selectedPresentations() const
   return aSelectedList;
 }
 
-
 //**************************************************************
-QModelIndexList XGUI_Selection::selectedIndexes() const 
-{ 
+QModelIndexList XGUI_Selection::selectedIndexes() const
+{
   return myWorkshop->objectBrowser()->selectedIndexes();
 }
 
@@ -101,13 +131,22 @@ void XGUI_Selection::selectedAISObjects(AIS_ListOfInteractive& theList) const
 }
 
 //**************************************************************
-void XGUI_Selection::selectedShapes(NCollection_List<TopoDS_Shape>& theList) const
+void XGUI_Selection::selectedShapes(NCollection_List<TopoDS_Shape>& theList, 
+                                    std::list<ObjectPtr>& theOwners) 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())
+    if (!aShape.IsNull()) {
       theList.Append(aShape);
+      Handle(SelectMgr_EntityOwner) aEO = aContext->SelectedOwner();
+      if (!aEO.IsNull()) {
+        Handle(AIS_InteractiveObject) anObj = 
+          Handle(AIS_InteractiveObject)::DownCast(aEO->Selectable());
+        ObjectPtr anObject = myWorkshop->displayer()->getObject(anObj);
+        theOwners.push_back(anObject);
+      }
+    }
   }
 }