From: apo <apo@opencascade.com>
Date: Fri, 23 Sep 2005 05:51:40 +0000 (+0000)
Subject: To implement automatic memory management by introducing VISU_Actor::RemoveFromRendere... 
X-Git-Tag: BR-D5-38-2003_D2005-12-10~153
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=65bbf17b570875262a8122d5192b0933bfa46645;p=modules%2Fvisu.git

To implement automatic memory management by introducing VISU_Actor::RemoveFromRenderer(void) method
---

diff --git a/src/OBJECT/VISU_Actor.cxx b/src/OBJECT/VISU_Actor.cxx
index 596705fc..6afb6871 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 = 1;
+static int MYDEBUG = 0;
 #else
 static int MYDEBUG = 0;
 #endif
@@ -89,8 +89,7 @@ VISU_Actor
   myAnnotationMapper(vtkTextMapper::New()),
   myAnnotationActor(vtkTextActor::New())
 {
-  if(MYDEBUG) MESSAGE("VISU_Actor() - this = "<<this);
-  SetDebug(MYVTKDEBUG);
+  if(MYDEBUG) MESSAGE("VISU_Actor::VISU_Actor - this = "<<this);
 
   myMapper->Delete();
   myShrinkFilter->Delete();
@@ -125,6 +124,7 @@ VISU_Actor
 {
   if(MYDEBUG) MESSAGE("~VISU_Actor() - this = "<<this);
   Superclass::SetProperty(NULL);
+  SetDebug(MYVTKDEBUG);
 }
 
 //----------------------------------------------------------------------------
@@ -166,6 +166,7 @@ VISU_Actor
   myActorFactory = theActorFactory;
 }
 
+//----------------------------------------------------------------------------
 void
 VISU_Actor
 ::Update()
@@ -174,6 +175,12 @@ VISU_Actor
   Superclass::Update();
 }
 
+void
+VISU_Actor
+::RemoveFromRender()
+{
+  RemoveFromRender(GetRenderer());
+}
 
 //----------------------------------------------------------------------------
 void
diff --git a/src/OBJECT/VISU_Actor.h b/src/OBJECT/VISU_Actor.h
index 523a5e74..7aae1496 100644
--- a/src/OBJECT/VISU_Actor.h
+++ b/src/OBJECT/VISU_Actor.h
@@ -90,10 +90,15 @@ class VTKOCC_EXPORT VISU_Actor : public SALOME_Actor
   void
   SetFactory(VISU::TActorFactory* theActorFactory);
 
+  //----------------------------------------------------------------------------
   virtual
   void
   Update();
 
+  virtual
+  void
+  RemoveFromRender();
+
   //----------------------------------------------------------------------------
   virtual
   VISU_PipeLine* 
diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx
index f1b65371..76ae269c 100644
--- a/src/OBJECT/VISU_GaussPtsAct.cxx
+++ b/src/OBJECT/VISU_GaussPtsAct.cxx
@@ -65,6 +65,14 @@
 #include <vtkCell.h>
 #include <vtkMath.h>
 
+#include "utilities.h"
+
+#ifdef _DEBUG_
+static int MYDEBUG = 1;
+#else
+static int MYDEBUG = 0;
+#endif
+
 //
 ///////////////////////////////////////////////////////////////////////////
 //
@@ -249,6 +257,8 @@ VISU_GaussPtsAct
   mySphereActor(vtkActor::New()),
   myCursorPyramid(VISU_CursorPyramid::New())
 {
+  if(MYDEBUG) MESSAGE("VISU_GaussPtsAct::VISU_GaussPtsAct - this = "<<this);
+
   myEventCallbackCommand->Delete();
 
   myEventCallbackCommand->SetClientData(this); 
@@ -434,13 +444,11 @@ VISU_GaussPtsAct
   if(myInteractor)
     myInteractor->RemoveObserver(myEventCallbackCommand.GetPointer());
   
-  
   if(theInteractor)
     theInteractor->AddObserver(vtkCommand::CharEvent, 
 			       myEventCallbackCommand.GetPointer(), 
 			       0.0);
   
-
   Superclass::SetInteractor(theInteractor);
 
   Modified();