From e2d7642f14070c6450fe7653219f645b46a3d598 Mon Sep 17 00:00:00 2001
From: isk <isk@opencascade.com>
Date: Mon, 1 Aug 2016 15:30:40 +0300
Subject: [PATCH] 0027680: Visualization - AIS_InteractiveContext::Remove()
 should remove all presentation of the object

---
 src/AIS/AIS_InteractiveContext.cxx        | 12 +--------
 src/AIS/AIS_LocalContext.cxx              |  1 -
 src/PrsMgr/PrsMgr_PresentationManager.cxx | 30 ++++++++++++++++-------
 src/PrsMgr/PrsMgr_PresentationManager.hxx |  1 +
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx
index 0a840234bc..d77c18d3dc 100644
--- a/src/AIS/AIS_InteractiveContext.cxx
+++ b/src/AIS/AIS_InteractiveContext.cxx
@@ -2484,17 +2484,8 @@ void AIS_InteractiveContext::ClearGlobal (const Handle(AIS_InteractiveObject)& t
 
   Handle(AIS_GlobalStatus) aStatus = myObjects (theIObj);
   unhighlightOwners (theIObj);
-  for (TColStd_ListIteratorOfListOfInteger aDispModeIter (aStatus->DisplayedModes()); aDispModeIter.More(); aDispModeIter.Next())
-  {
-    myMainPM->Erase (theIObj, aDispModeIter.Value());
-    myMainPM->Clear (theIObj, aDispModeIter.Value());
-  }
 
-  if (aStatus->IsHilighted()
-   && theIObj->HasHilightMode())
-  {
-    myMainPM->Unhighlight (theIObj, theIObj->HilightMode());
-  }
+  myMainPM->Erase (theIObj, -1);
 
   // Object removes from Detected sequence
   for(Standard_Integer aDetIter = 1; aDetIter < myAISDetectedSeq.Length(); ++aDetIter)
@@ -2555,7 +2546,6 @@ void AIS_InteractiveContext::ClearGlobalPrs (const Handle(AIS_InteractiveObject)
     }
 
     myMainPM->Erase (theIObj, theMode);
-    myMainPM->Clear (theIObj, theMode);
   }
 
   if (aStatus->GraphicStatus() == AIS_DS_Displayed
diff --git a/src/AIS/AIS_LocalContext.cxx b/src/AIS/AIS_LocalContext.cxx
index 4481c93f3f..d5eb7656f1 100644
--- a/src/AIS/AIS_LocalContext.cxx
+++ b/src/AIS/AIS_LocalContext.cxx
@@ -453,7 +453,6 @@ Standard_Boolean AIS_LocalContext::Remove(const Handle(AIS_InteractiveObject)& a
     }
 
     myMainPM->Erase (aSelectable, Att->DisplayMode());
-    myMainPM->Clear (aSelectable, Att->DisplayMode());
     if (myMainPM->IsDisplayed (aSelectable, Att->HilightMode()))
     {
       myMainPM->Erase (aSelectable, Att->HilightMode());
diff --git a/src/PrsMgr/PrsMgr_PresentationManager.cxx b/src/PrsMgr/PrsMgr_PresentationManager.cxx
index 234049e482..9511ad2c86 100644
--- a/src/PrsMgr/PrsMgr_PresentationManager.cxx
+++ b/src/PrsMgr/PrsMgr_PresentationManager.cxx
@@ -89,19 +89,31 @@ void PrsMgr_PresentationManager::Erase (const Handle(PrsMgr_PresentableObject)&
   }
 
   PrsMgr_Presentations& aPrsList = thePrsObj->Presentations();
-  for (Standard_Integer aPrsIter = 1; aPrsIter <= aPrsList.Length(); ++aPrsIter)
+  for (PrsMgr_Presentations::Iterator anIt (aPrsList); anIt.More();)
   {
-    const PrsMgr_ModedPresentation&           aModedPrs = aPrsList.Value (aPrsIter);
-    const Handle(PrsMgr_PresentationManager)& aPrsMgr   = aModedPrs.Presentation()->PresentationManager();
-    if (theMode == aPrsList (aPrsIter).Mode()
-     && this    == aPrsMgr)
+    const PrsMgr_ModedPresentation& aModedPrs = anIt.Value();
+    if (aModedPrs.Presentation().IsNull())
     {
-      if (!aModedPrs.Presentation().IsNull())
+      anIt.Next();
+      continue;
+    }
+
+    const Handle(PrsMgr_PresentationManager)& aPrsMgr = aModedPrs.Presentation()->PresentationManager();
+    if ((theMode == aModedPrs.Mode() || theMode == -1)
+     && (this == aPrsMgr))
+    {
+      aModedPrs.Presentation()->Erase();
+
+      aPrsList.Remove (anIt);
+
+      if (theMode != -1)
       {
-        aModedPrs.Presentation()->Erase();
+        return;
       }
-      aPrsList.Remove (aPrsIter);
-      return;
+    }
+    else
+    {
+      anIt.Next();
     }
   }
 }
diff --git a/src/PrsMgr/PrsMgr_PresentationManager.hxx b/src/PrsMgr/PrsMgr_PresentationManager.hxx
index 7f612190bd..86a2ccb483 100644
--- a/src/PrsMgr/PrsMgr_PresentationManager.hxx
+++ b/src/PrsMgr/PrsMgr_PresentationManager.hxx
@@ -59,6 +59,7 @@ public:
   
   //! erases the presentation of the object in the given
   //! Presentation manager with the given mode.
+  //! If @theMode is -1, then erases all presentations of the object.
   Standard_EXPORT void Erase (const Handle(PrsMgr_PresentableObject)& thePrsObject, const Standard_Integer theMode = 0);