Refresh menu size after chnges in preferences

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

diff --git a/src/XGUI/XGUI_Selection.cpp b/src/XGUI/XGUI_Selection.cpp
index 05b4e0ea6d95cf5b8886669138589ef70a0b2339..b42f8c4b9926c24334bde2944e658ebb099a8fe6 100644 (file)
--- a/src/XGUI/XGUI_Selection.cpp
+++ b/src/XGUI/XGUI_Selection.cpp
@@ -22,46 +22,58 @@ XGUI_Selection::XGUI_Selection(XGUI_Workshop* theWorkshop)
 
 std::list<ModuleBase_ViewerPrs> XGUI_Selection::getSelected(int theShapeTypeToSkip) const
 {
-  std::set<ResultPtr> aPrsFeatures;
+  std::set<ObjectPtr> aPrsFeatures;
   std::list<ModuleBase_ViewerPrs> aPresentations;
+  XGUI_Displayer* aDisplayer = myWorkshop->displayer();
 
   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();
-
-    if (theShapeTypeToSkip >= 0 && !aShape.IsNull() && aShape.ShapeType() == theShapeTypeToSkip)
-      continue;
+    ModuleBase_ViewerPrs aPrs;
 
-    ResultPtr aFeature = myWorkshop->displayer()->getResult(anIO);
-    if (aPrsFeatures.find(aFeature) != aPrsFeatures.end())
-      continue;
+    Handle(AIS_InteractiveObject) anIO = aContext->SelectedInteractive();
+    aPrs.setInteractive(anIO);
+
+    ObjectPtr aFeature = aDisplayer->getObject(anIO);
+    if (aPrsFeatures.find(aFeature) == aPrsFeatures.end()) {
+      aPrs.setFeature(aFeature);
+      aPrsFeatures.insert(aFeature);
+    }
+    if (aContext->HasOpenedContext()) {
+      TopoDS_Shape aShape = aContext->SelectedShape();
+      if (!aShape.IsNull() && (aShape.ShapeType() != theShapeTypeToSkip))
+        aPrs.setShape(aShape);
+    }
     Handle(SelectMgr_EntityOwner) anOwner = aContext->SelectedOwner();
-    aPresentations.push_back(ModuleBase_ViewerPrs(aFeature, aShape, anOwner));
-    aPrsFeatures.insert(aFeature);
+    aPrs.setOwner(anOwner);
+    aPresentations.push_back(aPrs);
   }
   return aPresentations;
 }
 
 std::list<ModuleBase_ViewerPrs> XGUI_Selection::getHighlighted(int theShapeTypeToSkip) const
 {
-  std::set<ResultPtr> aPrsFeatures;
+  std::set<ObjectPtr> aPrsFeatures;
   std::list<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;
-
-    ResultPtr aResult = myWorkshop->displayer()->getResult(anIO);
-    if (aPrsFeatures.find(aResult) != aPrsFeatures.end())
-      continue;
-    aPresentations.push_back(ModuleBase_ViewerPrs(aResult, aShape, NULL));
-    aPrsFeatures.insert(aResult);
+    aPrs.setInteractive(anIO);
+
+    ObjectPtr aResult = aDisplayer->getObject(anIO);
+    if (aPrsFeatures.find(aResult) == aPrsFeatures.end()) {
+      aPrs.setFeature(aResult);
+      aPrsFeatures.insert(aResult);
+    }
+    if (aContext->HasOpenedContext()) {
+      TopoDS_Shape aShape = aContext->DetectedShape();
+      if (!aShape.IsNull() && aShape.ShapeType() != theShapeTypeToSkip)
+        aPrs.setShape(aShape);
+    }
+    aPresentations.push_back(aPrs);
   }
-
   return aPresentations;
 }
 
@@ -70,14 +82,14 @@ QList<ObjectPtr> XGUI_Selection::selectedObjects() const
   return myWorkshop->objectBrowser()->selectedObjects();
 }
   
-QResultList XGUI_Selection::selectedResults() const
+QList<ObjectPtr> XGUI_Selection::selectedPresentations() const
 {
-  QResultList aSelectedList;
+  QList<ObjectPtr> aSelectedList;
 
   Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
   for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) {
     Handle(AIS_InteractiveObject) anIO = aContext->SelectedInteractive();
-    ResultPtr aResult = myWorkshop->displayer()->getResult(anIO);
+    ObjectPtr aResult = myWorkshop->displayer()->getObject(anIO);
     if (aResult)
       aSelectedList.append(aResult);
   }