X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=bbtk%2Fsrc%2FbbmaracasvisuImageActor.cxx;h=3d54751919513861682490cd1b3327f3ccd2da4b;hb=5ac54b0302d96c441a9c5880d7cdfd453283a551;hp=166901c2a7dd663602194a87ad967caac8d3582b;hpb=1d12f84a5b356a129eee9bff6116bf52f36a1f45;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuImageActor.cxx b/bbtk/src/bbmaracasvisuImageActor.cxx
index 166901c..3d54751 100644
--- a/bbtk/src/bbmaracasvisuImageActor.cxx
+++ b/bbtk/src/bbmaracasvisuImageActor.cxx
@@ -11,24 +11,37 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ImageActor,bbtk::AtomicBlackBox);
 void ImageActor::Process()
 {
 
- 	if ((bbGetInputIn()!=NULL) && (bbGetInputRenderer()!=NULL))
-	{
+		//JCP 04/04/09
+		vtkRenderer *render				= bbGetInputRenderer();
+		vtkImageData *img				= bbGetInputIn();
+		vtkLinearTransform* transform	= bbGetInputTransform();
+
+		if(img != NULL){
+			
+			imageshiftscale->SetInput( img );	
+			imageshiftscale->SetOutputScalarTypeToUnsignedChar();	
+			imageactor->SetInput( imageshiftscale->GetOutput() );	
+			if (transform!=NULL){
+			  imageactor->SetUserTransform( transform );	
+			} // transform
+			if(render != NULL ){
+				render->AddActor( imageactor );
+			} // render
+			bbSetOutputOut(imageactor);
+		} // img
+			
+			
+		// Interface Update
+		if ((firsttime==true) && (bbGetInputRenderer()!=NULL ))
+		{
+				firsttime=false;
+				bbGetInputRenderer()->AddActor( imageactor );
+		}
 		
-		imageactor = vtkImageActor::New();
-		vtkImageShiftScale *imageshiftscale = vtkImageShiftScale::New();
-		imageshiftscale->SetInput( bbGetInputIn() );	
-		imageshiftscale->SetOutputScalarTypeToUnsignedChar();	
-		imageactor->SetInput( imageshiftscale->GetOutput() );	
-		imageactor->SetUserTransform( bbGetInputTransform() );	
-	}
-	// Interface Update
-	if ((firsttime==true) && (bbGetInputRenderer()!=NULL ))
-	{
-      		firsttime=false;
-       		bbGetInputRenderer()->AddActor( imageactor );
-     	}
+		bbSetOutputOut(imageactor);
+	
 }
-void ImageActor::bbUserConstructor()
+void ImageActor::bbUserSetDefaultValues()
 {
     firsttime = true;
     imageactor = NULL;
@@ -38,16 +51,21 @@ void ImageActor::bbUserConstructor()
     bbSetInputRenderer(NULL);
   
 }
-void ImageActor::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
 
-  
-}
-void ImageActor::bbUserDestructor()
-{
-
-  
-}
+	
+	//-----------------------------------------------------------------	
+	void ImageActor::bbUserInitializeProcessing()
+	{
+		imageactor = vtkImageActor::New();
+		imageshiftscale = vtkImageShiftScale::New();
+	}
+	
+	//-----------------------------------------------------------------	
+	void ImageActor::bbUserFinalizeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
 }
 // EO namespace bbcreaMaracasVisu