X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Displayer.cpp;h=20a6f721e9f38e7285b3440405e7e18a2edf67e5;hb=00265e8a59b2eff159cef64eef8de47ed4b9b728;hp=4803c578df03b201ae433d3f94fa75ded37c0f18;hpb=13386fb08ef3453b9560d9459ce72885ef9a0afb;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_Displayer.cpp b/src/XGUI/XGUI_Displayer.cpp
index 4803c578d..20a6f721e 100644
--- a/src/XGUI/XGUI_Displayer.cpp
+++ b/src/XGUI/XGUI_Displayer.cpp
@@ -4,6 +4,8 @@
 
 #include "XGUI_Displayer.h"
 #include "XGUI_Viewer.h"
+#include "XGUI_Workshop.h"
+#include "XGUI_ViewerProxy.h"
 
 #include <ModelAPI_Document.h>
 
@@ -13,9 +15,9 @@
 
 #include <AIS_Shape.hxx>
 
-XGUI_Displayer::XGUI_Displayer(const Handle(AIS_InteractiveContext)& theAIS)
+XGUI_Displayer::XGUI_Displayer(XGUI_Workshop* theWorkshop)
 {
-  myAISContext = theAIS;
+  myWorkshop = theWorkshop;
 }
 
 XGUI_Displayer::~XGUI_Displayer()
@@ -38,63 +40,105 @@ void XGUI_Displayer::Display(boost::shared_ptr<ModelAPI_Feature> theFeature,
   Handle(AIS_InteractiveContext) aContext = AISContext();
 
   Handle(AIS_Shape) anAIS = new AIS_Shape(theShape);
-  std::vector<Handle(AIS_InteractiveObject)> aDispAIS;
-  if (myFeature2AISObjectMap.find(theFeature) != myFeature2AISObjectMap.end()) {
-    aDispAIS = myFeature2AISObjectMap[theFeature];
-  }
-  aDispAIS.push_back(anAIS);
-  myFeature2AISObjectMap[theFeature] = aDispAIS;
+  myFeature2AISObjectMap[theFeature] = anAIS;
 
   aContext->Display(anAIS, Standard_False);
-
   if (isUpdateViewer)
     aContext->UpdateCurrentViewer();
 }
 
+boost::shared_ptr<ModelAPI_Feature> XGUI_Displayer::GetFeature(const TopoDS_Shape& theShape)
+{
+  boost::shared_ptr<ModelAPI_Feature> aFeature;
+
+  FeatureToAISMap::const_iterator aFIt = myFeature2AISObjectMap.begin(),
+                                  aFLast = myFeature2AISObjectMap.end();
+  for (; aFIt != aFLast && !aFeature; aFIt++)
+  {
+    Handle(AIS_InteractiveObject) anAIS = (*aFIt).second;
+    Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast(anAIS);
+    if (!anAISShape.IsNull() && anAISShape->Shape() == theShape) {
+      aFeature = (*aFIt).first;
+    }
+  }
+  return aFeature;
+}
+
+std::list<XGUI_ViewerPrs> XGUI_Displayer::GetViewerPrs
+                                                (const NCollection_List<TopoDS_Shape>& theShapes)
+{
+  std::list<XGUI_ViewerPrs> aPresentations;
+  if (theShapes.IsEmpty())
+    return aPresentations;
+
+  NCollection_List<TopoDS_Shape>::Iterator anIt(theShapes);
+  for (; anIt.More(); anIt.Next()) {
+    const TopoDS_Shape& aShape = anIt.Value();
+    if (aShape.IsNull())
+      continue;
+    boost::shared_ptr<ModelAPI_Feature> aFeature = GetFeature(aShape);
+    aPresentations.push_back(XGUI_ViewerPrs(aFeature, aShape));
+  }
+
+  return aPresentations;
+}
+
 void XGUI_Displayer::Erase(boost::shared_ptr<ModelAPI_Feature> theFeature,
                            const bool isUpdateViewer)
 {
   if (myFeature2AISObjectMap.find(theFeature) == myFeature2AISObjectMap.end())
     return;
 
-  std::vector<Handle(AIS_InteractiveObject)> aDispAIS = myFeature2AISObjectMap[theFeature];
-  std::vector<Handle(AIS_InteractiveObject)>::const_iterator anIt = aDispAIS.begin(),
-                                                             aLast = aDispAIS.end();
   Handle(AIS_InteractiveContext) aContext = AISContext();
-  for (; anIt != aLast; anIt++) {
-    Handle(AIS_InteractiveObject) anAIS = *anIt;
-    Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast(anAIS);
-    if (anAISShape.IsNull())
-      continue;
-      aContext->Erase(anAISShape);
+  Handle(AIS_InteractiveObject) anAIS = myFeature2AISObjectMap[theFeature];
+  Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast(anAIS);
+  if (!anAISShape.IsNull())
+  {
+    aContext->Erase(anAISShape);
   }
+  myFeature2AISObjectMap.erase(theFeature);
 
   if (isUpdateViewer)
     aContext->UpdateCurrentViewer();
 }
 
-void XGUI_Displayer::DisplayInLocalContext(boost::shared_ptr<ModelAPI_Feature> theFeature,
-                                           const TopoDS_Shape& theShape,
-                                           const int theMode, const bool isUpdateViewer)
+void XGUI_Displayer::RedisplayInLocalContext(boost::shared_ptr<ModelAPI_Feature> theFeature,
+                                             const TopoDS_Shape& theShape,
+                                             const std::list<int>& theModes, const bool isUpdateViewer)
 {
   Handle(AIS_InteractiveContext) aContext = AISContext();
-  
+  // Open local context if there is no one
+  if (!aContext->HasOpenedContext()) {
+    aContext->ClearCurrents(false);
+    aContext->OpenLocalContext(false/*use displayed objects*/, /*true*/false/*use displayed objects*/,
+                         true/*allow shape decomposition*/);
+  }
+  // display or redisplay presentation
+  Handle(AIS_Shape) anAIS;
   if (IsVisible(theFeature)) {
-    Erase(theFeature, false);
+    anAIS = Handle(AIS_Shape)::DownCast(myFeature2AISObjectMap[theFeature]);
+    if (!anAIS.IsNull()) {
+      anAIS->Set(theShape);
+      anAIS->Redisplay();
+    }
   }
-
-  Handle(AIS_Shape) anAIS = new AIS_Shape(theShape);
-  std::vector<Handle(AIS_InteractiveObject)> aDispAIS;
-  if (myFeature2AISObjectMap.find(theFeature) != myFeature2AISObjectMap.end()) {
-    aDispAIS = myFeature2AISObjectMap[theFeature];
+  else {
+    anAIS = new AIS_Shape(theShape);
+    myFeature2AISObjectMap[theFeature] = anAIS;
+    aContext->Display(anAIS, false);
+  }
+  // Activate selection of objects from prs
+  if (!anAIS.IsNull()) {
+    aContext->Load(anAIS, -1, true/*allow decomposition*/);
+    std::list<int>::const_iterator anIt = theModes.begin(), aLast = theModes.end();
+    for (; anIt != aLast; anIt++)
+    {
+      aContext->Activate(anAIS, AIS_Shape::SelectionMode((TopAbs_ShapeEnum)*anIt));
+    }
   }
-  aDispAIS.push_back(anAIS);
-  myFeature2AISObjectMap[theFeature] = aDispAIS;
-  aContext->Display(anAIS, Standard_False);
 
-  AIS_ListOfInteractive anAISList;
-  anAISList.Append(anAIS);
-  activateInLocalContext(anAISList, theMode, true);
+  if (isUpdateViewer)
+    aContext->UpdateCurrentViewer();
 }
 
 void XGUI_Displayer::CloseLocalContexts(const bool isUpdateViewer)
@@ -102,37 +146,6 @@ void XGUI_Displayer::CloseLocalContexts(const bool isUpdateViewer)
   closeAllContexts(true);
 }
 
-void XGUI_Displayer::activateInLocalContext(const AIS_ListOfInteractive& theAISObjects, const int theMode,
-                                            const bool isUpdateViewer)
-{
-  Handle(AIS_InteractiveContext) ic = AISContext();
-
-  // Open local context if there is no one
-  bool allObjects = false; // calculate by AIS shape
-  if (!ic->HasOpenedContext()) {
-    ic->ClearCurrents(false);
-    ic->OpenLocalContext(allObjects, true, true);
-  }
-
-  // Activate selection of objects from prs
-  AIS_ListIteratorOfListOfInteractive aIter(theAISObjects);
-  for (; aIter.More(); aIter.Next()) {
-    Handle(AIS_InteractiveObject) anAIS = aIter.Value();
-    if (!anAIS.IsNull()) {
-      if (anAIS->IsKind(STANDARD_TYPE(AIS_Shape))) {
-        ic->Load(anAIS, -1, false);
-        ic->Activate(anAIS, AIS_Shape::SelectionMode((TopAbs_ShapeEnum)theMode));
-      }
-      else if (anAIS->DynamicType() != STANDARD_TYPE(AIS_Trihedron)) {
-        ic->Load(anAIS, -1, false);
-        ic->Activate(anAIS, theMode);
-      }
-    }
-  }
-  if (isUpdateViewer)
-    ic->UpdateCurrentViewer();
-}
-
 void XGUI_Displayer::closeAllContexts(const bool isUpdateViewer)
 {
   Handle(AIS_InteractiveContext) ic = AISContext();
@@ -142,3 +155,8 @@ void XGUI_Displayer::closeAllContexts(const bool isUpdateViewer)
       ic->UpdateCurrentViewer();
   }
 }
+
+Handle(AIS_InteractiveContext) XGUI_Displayer::AISContext() const 
+{ 
+  return myWorkshop->viewer()->AISContext(); 
+}