X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuContourToControlPoints.cxx;h=fabcee39a1fa987b90ee9b1649aebb0555d18cd3;hb=35a5d83be3d84f9d1544b8d3ad0de044f1e65286;hp=e75ffee08c1b4ff0c4a09a3efc6749ec60d51bda;hpb=056a8fc3fb4917c574fda1495388bc8d04be3318;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuContourToControlPoints.cxx b/bbtk/src/bbmaracasvisuContourToControlPoints.cxx
index e75ffee..fabcee3 100644
--- a/bbtk/src/bbmaracasvisuContourToControlPoints.cxx
+++ b/bbtk/src/bbmaracasvisuContourToControlPoints.cxx
@@ -113,8 +113,10 @@ void ContourToControlPoints::Process()
 		bbSetOutputControlPointZ( &OutContourZ );
 		bbSetOutputImagePropg( _imagedata );
 }
+	
+	
 //------------------------------------------------------------
-void ContourToControlPoints::bbUserConstructor()
+void ContourToControlPoints::bbUserSetDefaultValues()
 {
 		bbSetInputSampling(5.0);
 		bbSetInputSlice(0);
@@ -125,23 +127,42 @@ void ContourToControlPoints::bbUserConstructor()
 		bbSetInputOption(1);
 		bbSetInputLoadContour(0);
 
+		_contprop	= NULL;
+		_propgdata	= NULL;
+		_imagedata	= NULL;
+		_ext2D		= NULL;
+	
+		_fd = NULL;
+		pos = 0;
+}
+
+	
+	//-----------------------------------------------------------------	
+	void ContourToControlPoints::bbUserInitializeProcessing()
+	{
 		_contprop	= new ContourPropagation();
 		_propgdata	= new PropContour();
 		_imagedata	= vtkImageData::New();
 		_ext2D		= new ExtractControlPoints2D();
-		_fd = NULL;
-		pos = 0;
-		//it = NULL;  // JPRx
-		//bool inic = false; // JPRx
-}
-//------------------------------------------------------------
-void ContourToControlPoints::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-}
-//------------------------------------------------------------
-void ContourToControlPoints::bbUserDestructor()
-{
-}
+	}
+	
+	//-----------------------------------------------------------------	
+	void ContourToControlPoints::bbUserFinalizeProcessing()
+	{
+		if (_contprop!=NULL) delete _contprop;
+		if (_propgdata!=NULL) delete _propgdata;
+		if (_imagedata!=NULL) _imagedata->Delete();
+		if (_ext2D!=NULL) delete _ext2D;
+
+		_contprop	= NULL;
+		_propgdata	= NULL;
+		_imagedata	= NULL;
+		_ext2D		= NULL;
+	}
+	
+	//-----------------------------------------------------------------	
+
+	
 
 }
 // EO namespace bbcreaMaracasVisu