X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=bbtk%2Fsrc%2FbbmaracasvisuDrawAxe3D.cxx;h=14db3707048d91771fe441748d9161dcca544684;hb=4ed4922b791cc64cd91c56d5fa285b5cfedc0811;hp=0ee60277cf703f9f0850ad3000737a0ea354df33;hpb=4970ac35d6d4bc3cea54e8e6033b34c01c3103fb;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
index 0ee6027..14db370 100644
--- a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
+++ b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
@@ -4,12 +4,12 @@
 
 #include "vtkImageData.h"
 #include "vtkActor.h"
-#include "vtkPolyDataMapper.h"
 #include "vtkPoints.h"
 #include "vtkCellArray.h"
 #include "vtkProperty.h"
 
 
+#include "vtkLinearTransform.h"
 namespace bbcreaMaracasVisu
 {
 
@@ -38,7 +38,7 @@ void DrawAxe3D::Process()
 
 		for( i = 0; i < vectx.size( ); i++) {	
 			//multiplicar ver parametros spacing, en maracas cuando se toca la imagen y se ve dycom
-			//hay parámetro dycom, vtkImagedata valor spacing y esos datos hay que multiplicar al polydata
+			//hay par·metro dycom, vtkImagedata valor spacing y esos datos hay que multiplicar al polydata
 			allPoints->InsertNextPoint( vectx[i]*spc[0],  vecty[i]*spc[1], vectz[i]*spc[2] );
 			allTopology->InsertCellPoint( i );
 		} // rof
@@ -52,6 +52,10 @@ void DrawAxe3D::Process()
 										bbGetInputColour()[1], 
 										bbGetInputColour()[2] );
 
+	if ( bbGetInputTransform()!=NULL )
+	{
+		mvtkactor->SetUserTransform( bbGetInputTransform() );
+	}
 
      // Interface Update
      if ((firsttime==true) && (bbGetInputRenderer()!=NULL ))
@@ -62,16 +66,13 @@ void DrawAxe3D::Process()
 
 }
 
-void DrawAxe3D::bbUserConstructor()
+void DrawAxe3D::bbUserSetDefaultValues()
 {
 	firsttime							= true;
-	mallData							= vtkPolyData::New( );
-	vtkPolyDataMapper* polydatamapper	= vtkPolyDataMapper::New();
-	mvtkactor							= vtkActor::New();
-	polydatamapper->SetInput(mallData);
-	mvtkactor->SetMapper(polydatamapper);
-	bbSetOutputOut(mvtkactor);
-
+	mallData							= NULL;
+	polydatamapper						= NULL;
+	mvtkactor							= NULL;
+	
     std::vector<double> colour;
     colour.push_back(1.0);
     colour.push_back(0.0);
@@ -79,12 +80,47 @@ void DrawAxe3D::bbUserConstructor()
     bbSetInputColour(colour);
 }
 
-void DrawAxe3D::bbUserCopyConstructor()
-{
-}
-void DrawAxe3D::bbUserDestructor()
-{
-}
+
+	
+	//-----------------------------------------------------------------	
+	void DrawAxe3D::bbUserInitializeProcessing()
+	{
+		mallData		= vtkPolyData::New( );
+		polydatamapper	= vtkPolyDataMapper::New();
+		mvtkactor		= vtkActor::New();
+		
+		polydatamapper->SetInput(mallData);
+		mvtkactor->SetMapper(polydatamapper);
+		bbSetOutputOut(mvtkactor);
+	}
+	
+	//-----------------------------------------------------------------	
+	void DrawAxe3D::bbUserFinalizeProcessing()
+	{
+		if (mallData!=NULL)
+		{
+			mallData->Delete();
+			mallData=NULL;
+		}	  
+		
+		if (polydatamapper!=NULL)
+		{
+			polydatamapper->Delete();
+			polydatamapper=NULL;
+		}	  
+		
+		if (mvtkactor!=NULL)
+		{
+			mvtkactor->Delete();
+			mvtkactor=NULL;
+		}	  
+		
+	}
+	
+	//-----------------------------------------------------------------	
+	
+	
+
 
 }