From 56257bd2b3a35e3054db4d5b411a34bb8019d4dc Mon Sep 17 00:00:00 2001
From: apo <apo@opencascade.com>
Date: Mon, 10 Oct 2005 05:49:41 +0000
Subject: [PATCH] To provide correct memory management

---
 src/OBJECT/VISU_Actor.cxx         |  4 ++--
 src/OBJECT/VISU_Actor.h           |  5 ++++-
 src/OBJECT/VISU_ActorFactory.h    |  4 ++++
 src/VISU_I/VISU_Prs3d_i.cc        | 10 +++++++++-
 src/VISU_I/VISU_Prs3d_i.hh        |  4 ++++
 src/VISU_I/VISU_TimeAnimation.cxx |  2 --
 src/VISU_I/VISU_ViewManager_i.cc  |  1 -
 7 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/OBJECT/VISU_Actor.cxx b/src/OBJECT/VISU_Actor.cxx
index 1f455ff8..89407e70 100644
--- a/src/OBJECT/VISU_Actor.cxx
+++ b/src/OBJECT/VISU_Actor.cxx
@@ -67,7 +67,7 @@ using namespace std;
 static int MYVTKDEBUG = 0;
 
 #ifdef _DEBUG_
-static int MYDEBUG = 0;
+static int MYDEBUG = 1;
 #else
 static int MYDEBUG = 0;
 #endif
@@ -368,7 +368,7 @@ VISU_Actor
 {
   theRenderer->RemoveActor(myAnnotationActor.GetPointer());
   Superclass::RemoveFromRender(theRenderer); 
-  
+  myActorFactory->RemoveActor(this);
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/OBJECT/VISU_Actor.h b/src/OBJECT/VISU_Actor.h
index cf8efe7d..466010d7 100644
--- a/src/OBJECT/VISU_Actor.h
+++ b/src/OBJECT/VISU_Actor.h
@@ -35,6 +35,7 @@
 #include <string>
 #include <vtkSmartPointer.h>
 #include <boost/signals/signal1.hpp>
+#include <boost/signals/trackable.hpp>
 
 class vtkProp;
 class vtkProperty;
@@ -57,7 +58,9 @@ namespace VISU
 }
 
 //----------------------------------------------------------------------------
-class VTKOCC_EXPORT VISU_Actor : public SALOME_Actor 
+class VTKOCC_EXPORT VISU_Actor : 
+  public SALOME_Actor,
+  public boost::bsignals::trackable
 {
  public:
   vtkTypeMacro(VISU_Actor,SALOME_Actor);
diff --git a/src/OBJECT/VISU_ActorFactory.h b/src/OBJECT/VISU_ActorFactory.h
index 29367eba..2cda6668 100644
--- a/src/OBJECT/VISU_ActorFactory.h
+++ b/src/OBJECT/VISU_ActorFactory.h
@@ -39,6 +39,10 @@ namespace VISU
     virtual 
     void
     UpdateActor(VISU_Actor* theActor) = 0;
+
+    virtual 
+    void
+    RemoveActor(VISU_Actor* theActor) = 0;
   };
 }
 
diff --git a/src/VISU_I/VISU_Prs3d_i.cc b/src/VISU_I/VISU_Prs3d_i.cc
index a2486ce2..0fd66505 100644
--- a/src/VISU_I/VISU_Prs3d_i.cc
+++ b/src/VISU_I/VISU_Prs3d_i.cc
@@ -40,7 +40,7 @@ using namespace VISU;
 using namespace std;
 
 #ifdef _DEBUG_
-static int MYDEBUG = 0;
+static int MYDEBUG = 1;
 #else
 static int MYDEBUG = 0;
 #endif
@@ -238,6 +238,14 @@ VISU::Prs3d_i
   theActor->Modified();
 }
 
+void
+VISU::Prs3d_i
+::RemoveActor(VISU_Actor* theActor) 
+{
+  if(MYDEBUG) MESSAGE("Prs3d_i::RemoveActor - this = "<<this<<"; theActor = "<<theActor);
+  myActorCollection->RemoveItem(theActor);
+}
+
 void
 VISU::Prs3d_i
 ::UpdateActors()
diff --git a/src/VISU_I/VISU_Prs3d_i.hh b/src/VISU_I/VISU_Prs3d_i.hh
index 5d560d70..7bad0b68 100644
--- a/src/VISU_I/VISU_Prs3d_i.hh
+++ b/src/VISU_I/VISU_Prs3d_i.hh
@@ -124,6 +124,10 @@ namespace VISU
     VISU_Actor* 
     CreateActor(const Handle(SALOME_InteractiveObject)& theIO = NULL) = 0;
 
+    virtual 
+    void
+    RemoveActor(VISU_Actor* theActor);
+
     virtual 
     void
     UpdateActor(VISU_Actor* theActor);
diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx
index 46ec8a89..c4049d7a 100644
--- a/src/VISU_I/VISU_TimeAnimation.cxx
+++ b/src/VISU_I/VISU_TimeAnimation.cxx
@@ -125,7 +125,6 @@ void VISU_TimeAnimation::clearData(FieldData& theData) {
     for (int i = 0, iEnd = theData.myActors.size(); i < iEnd; i++) {
       if (theData.myActors[i] != 0) {
 	theData.myActors[i]->RemoveFromRender(aRen);
-	theData.myActors[i]->Delete();
       }
     }
     theData.myActors.clear();
@@ -333,7 +332,6 @@ void VISU_TimeAnimation::clearView() {
       for (int i = 0, iEnd = aData.myActors.size(); i < iEnd; i++) {
 	if (aData.myActors[i] != 0) {
 	  aData.myActors[i]->RemoveFromRender(aRen);
-	  aData.myActors[i]->Delete();
 	}
       }
       aData.myActors.clear();
diff --git a/src/VISU_I/VISU_ViewManager_i.cc b/src/VISU_I/VISU_ViewManager_i.cc
index 2db4d2a3..df191e3e 100644
--- a/src/VISU_I/VISU_ViewManager_i.cc
+++ b/src/VISU_I/VISU_ViewManager_i.cc
@@ -694,7 +694,6 @@ namespace VISU {
             }
             if (anActor) {
 	      vw->RemoveActor(anActor);
-	      anActor->Delete();
             }
           }
         }
-- 
2.39.2