0023005: Unjustified memory grow during undo/redo operation

diff --git a/src/NIS/NIS_Drawer.cxx b/src/NIS/NIS_Drawer.cxx
index e1d793c2739a993bd9afb7c4e0e008c00a457f35..8c70653ac76bcbf50effc20c63b51900d208ae25 100755 (executable)
--- a/src/NIS/NIS_Drawer.cxx
+++ b/src/NIS/NIS_Drawer.cxx
@@ -281,6 +281,8 @@ void NIS_Drawer::removeObject (const NIS_InteractiveObject * theObj,
     SetDynamicHilighted (Standard_False, theObj);
   if (myMapID.IsEmpty()) {
     UpdateExListId(NULL);
+    // Remove the drawer from context.
+    myCtx->myDrawers.Remove(this);
   }
   // Set Updated for the draw type.
   else if (theObj->IsHidden() == Standard_False && isUpdateViews)

diff --git a/src/NIS/NIS_InteractiveContext.cxx b/src/NIS/NIS_InteractiveContext.cxx
index 828dfcd21f06c82529d15478eec013024f77c5e8..37b680644d18b2feac6c5db1a486b229b683c997 100755 (executable)
--- a/src/NIS/NIS_InteractiveContext.cxx
+++ b/src/NIS/NIS_InteractiveContext.cxx
@@ -22,12 +22,14 @@ static void markAllDrawersUpdated   (const NCollection_Map<Handle_NIS_Drawer>&);
 
 NIS_InteractiveContext::NIS_InteractiveContext ()
   : myAllocator       (new NIS_Allocator(1024*100)),
+    myLastObjectId    (0),
+    myObjects         (1000),
 //     myDrawers       (101, myAllocator),
     mySelectionMode   (Mode_NoSelection),
     myIsShareDrawList (Standard_True)
 {
   // ID == 0 is invalid so we reserve this item from subsequent allocation.
-  myObjects.Append (NULL);
+  myObjects.SetValue(myLastObjectId, NULL);
 }
 
 //=======================================================================
@@ -107,6 +109,22 @@ void NIS_InteractiveContext::DetachView (const Handle_NIS_View& theView)
   }
 }
 
+//=======================================================================
+//function : GetObject
+//purpose  : 
+//=======================================================================
+
+const Handle_NIS_InteractiveObject& NIS_InteractiveContext::GetObject
+                   (const Standard_Integer theID) const
+{
+  if (!myObjects.IsBound(theID))
+  {
+    static Handle_NIS_InteractiveObject aNull;
+    return aNull;
+  }
+  return myObjects(theID);
+}
+
 //=======================================================================
 //function : redraw
 //purpose  : 
@@ -236,7 +254,8 @@ void NIS_InteractiveContext::Remove (const Handle_NIS_InteractiveObject& theObj,
         aDrawer->removeObject(theObj.operator->(), isUpdateViews);
       theObj->myID = 0;
       theObj->myDrawer.Nullify();
-      myObjects(anID).Nullify();
+      myObjects.UnsetValue(anID);
+      myMapNonSelectableObjects.Remove(anID);
     }
   }
 }
@@ -249,7 +268,8 @@ void NIS_InteractiveContext::Remove (const Handle_NIS_InteractiveObject& theObj,
 void NIS_InteractiveContext::DisplayAll ()
 {
   // UnHide all objects in the Context
-  NCollection_Vector <Handle_NIS_InteractiveObject>::Iterator anIter(myObjects);
+  NCollection_SparseArray <Handle_NIS_InteractiveObject>::ConstIterator
+    anIter(myObjects);
   for (; anIter.More(); anIter.Next()) {
     const Handle(NIS_InteractiveObject)& anObj = anIter.Value();
     if (anObj.IsNull() == Standard_False)
@@ -278,7 +298,8 @@ void NIS_InteractiveContext::DisplayAll ()
 void NIS_InteractiveContext::EraseAll ()
 {
   // Hide all objects in the Context
-  NCollection_Vector <Handle_NIS_InteractiveObject>::Iterator anIter(myObjects);
+  NCollection_SparseArray <Handle_NIS_InteractiveObject>::ConstIterator
+    anIter(myObjects);
   for (; anIter.More(); anIter.Next()) {
     const Handle(NIS_InteractiveObject)& anObj = anIter.Value();
     if (anObj.IsNull() == Standard_False) {
@@ -319,7 +340,8 @@ void NIS_InteractiveContext::EraseAll ()
 void NIS_InteractiveContext::RemoveAll ()
 {
   // Remove objects from the Context
-  NCollection_Vector <Handle_NIS_InteractiveObject>::Iterator anIter(myObjects);
+  NCollection_SparseArray <Handle_NIS_InteractiveObject>::Iterator
+    anIter(myObjects);
   for (; anIter.More(); anIter.Next()) {
     Handle(NIS_InteractiveObject)& anObj = anIter.ChangeValue();
     if (anObj.IsNull() == Standard_False) {
@@ -352,14 +374,13 @@ void NIS_InteractiveContext::RemoveAll ()
   myAllocator->Reset();
   myAllocator->ResetCounters();
 
-  myDrawers.Clear();
-
   // Remove objects from maps
   myMapObjects[0].Clear();
   myMapObjects[1].Clear();
   myMapObjects[2].Clear();
   myMapObjects[3].Clear();
   myMapNonSelectableObjects.Clear();
+  myObjects.Clear();
 }
 
 //=======================================================================
@@ -634,7 +655,7 @@ Standard_Real NIS_InteractiveContext::selectObject
   if (mySelectionMode != Mode_NoSelection || isOnlySel == Standard_False)
   {
     DetectedEnt anEnt;
-    NCollection_Vector <Handle_NIS_InteractiveObject>::Iterator
+    NCollection_SparseArray <Handle_NIS_InteractiveObject>::ConstIterator
       anIter(myObjects);
     for (; anIter.More(); anIter.Next()) {
       const Handle(NIS_InteractiveObject)& anObj = anIter.Value();
@@ -716,7 +737,7 @@ Standard_Boolean NIS_InteractiveContext::selectObjects
 {
   Standard_Boolean aResult (Standard_False);
   if (mySelectionMode != Mode_NoSelection) {
-    NCollection_Vector <Handle_NIS_InteractiveObject>::Iterator
+    NCollection_SparseArray <Handle_NIS_InteractiveObject>::ConstIterator
       anIter(myObjects);
     for (; anIter.More(); anIter.Next()) {
       const Handle(NIS_InteractiveObject)& anObj = anIter.Value();
@@ -758,7 +779,7 @@ Standard_Boolean NIS_InteractiveContext::selectObjects
   Standard_Boolean aResult (Standard_False);
 
   if (mySelectionMode != Mode_NoSelection) {
-    NCollection_Vector <Handle_NIS_InteractiveObject>::Iterator
+    NCollection_SparseArray <Handle_NIS_InteractiveObject>::ConstIterator
       anIter(myObjects);
 
     for (; anIter.More(); anIter.Next()) {
@@ -894,8 +915,8 @@ void NIS_InteractiveContext::objectForDisplay
     Handle(NIS_InteractiveObject) anObj;
     theObj->Clone(myAllocator, anObj);
     theObj = anObj;
-    anObj->myID = myObjects.Length();
-    myObjects.Append (anObj);
+    anObj->myID = ++myLastObjectId;
+    myObjects.SetValue (myLastObjectId, anObj);
     myMapObjects[theDrawType].Add(anObj->myID);
     anObj->myDrawType = theDrawType;
   }
@@ -928,7 +949,7 @@ Handle_NIS_Allocator NIS_InteractiveContext::compactObjects()
       // Compact the memory: clone all objects to a new allocator, release
       // the old allocator instance.
       aNewAlloc = new NIS_Allocator;
-      NCollection_Vector<Handle_NIS_InteractiveObject>::Iterator
+      NCollection_SparseArray<Handle_NIS_InteractiveObject>::Iterator
         anIter(myObjects);
       for (; anIter.More(); anIter.Next()) {
         if (anIter.Value().IsNull() == Standard_False) {

diff --git a/src/NIS/NIS_InteractiveContext.hxx b/src/NIS/NIS_InteractiveContext.hxx
index 29b8360d3b7393026ef1f89a2d91ed6c4960444f..295726bc0a1a861e6db45d120690d744d3507d47 100755 (executable)
--- a/src/NIS/NIS_InteractiveContext.hxx
+++ b/src/NIS/NIS_InteractiveContext.hxx
@@ -10,7 +10,7 @@
 #include <Handle_NIS_InteractiveObject.hxx>
 #include <Handle_NIS_View.hxx>
 #include <NCollection_Map.hxx>
-#include <NCollection_Vector.hxx>
+#include <NCollection_SparseArray.hxx>
 #include <NIS_Allocator.hxx>
 #include <NIS_Drawer.hxx>
 #include <NIS_SelectFilter.hxx>
@@ -155,9 +155,8 @@ class NIS_InteractiveContext : public Standard_Transient
   /**
    * Query the InteractiveObject instance by its ID.
    */
-  inline const Handle_NIS_InteractiveObject&
-                       GetObject  (const Standard_Integer theID) const
-  { return myObjects(theID); }
+  Standard_EXPORT const Handle_NIS_InteractiveObject&
+                       GetObject  (const Standard_Integer theID) const;
 
   /**
    * Query the total number of InteractiveObject instances. This number can be
@@ -572,10 +571,15 @@ private:
    */
   Handle_NIS_Allocator                              myAllocator;
 
+  /**
+   * The last added object ID.
+   */
+  Standard_Integer                                  myLastObjectId;
   /**
    * Container of InteractiveObject instances.
    */ 
-  NCollection_Vector <Handle_NIS_InteractiveObject> myObjects;
+  NCollection_SparseArray <Handle_NIS_InteractiveObject>
+                                                    myObjects;
 
   /**
    * List of Views.

diff --git a/src/NIS/NIS_ObjectsIterator.cxx b/src/NIS/NIS_ObjectsIterator.cxx
index b78527ce81b225bc01ff9e1c88b1421ee8eec072..729425d124c95b2f7cd455f064e353e1b12ce66f 100755 (executable)
--- a/src/NIS/NIS_ObjectsIterator.cxx
+++ b/src/NIS/NIS_ObjectsIterator.cxx
@@ -16,7 +16,7 @@ void NIS_ObjectsIterator::Initialize
                         (const Handle(NIS_InteractiveContext)& theCtx)
 {
   if (theCtx.IsNull())
-    myIter = NCollection_Vector <Handle_NIS_InteractiveObject>::Iterator();
+    myIter = NCollection_SparseArray <Handle_NIS_InteractiveObject>::Iterator();
   else
     for (myIter.Init (theCtx->myObjects); myIter.More(); myIter.Next())
       if (myIter.Value().IsNull() == Standard_False)

diff --git a/src/NIS/NIS_ObjectsIterator.hxx b/src/NIS/NIS_ObjectsIterator.hxx
index 58421de3d80584ef542ba0e8d701c1cbbf76be5a..a324fa3e87e9eaf3885e96771f8ac7ce105e9baf 100755 (executable)
--- a/src/NIS/NIS_ObjectsIterator.hxx
+++ b/src/NIS/NIS_ObjectsIterator.hxx
@@ -7,7 +7,7 @@
 #ifndef NIS_ObjectsIterator_HeaderFile
 #define NIS_ObjectsIterator_HeaderFile
 
-#include <NCollection_Vector.hxx>
+#include <NCollection_SparseArray.hxx>
 #include <Handle_NIS_InteractiveObject.hxx>
 
 class Handle_NIS_InteractiveContext;
@@ -80,7 +80,7 @@ class NIS_ObjectsIterator
  protected:
   // ---------- PROTECTED FIELDS ----------
 
-  NCollection_Vector <Handle_NIS_InteractiveObject>::Iterator myIter;
+  NCollection_SparseArray <Handle_NIS_InteractiveObject>::ConstIterator myIter;
 
 };