X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuImageChangeInformation.cxx;h=f32c600b64234a71e479fa267a9e330576a63b1b;hb=cf87bb498ccc24b1fb1aa2104957e0cb1afad2f2;hp=e0b3f1cc43adc7f1415c038742ff1d4753c477c4;hpb=2942218e39481160338e30ceb53df96c6423f005;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuImageChangeInformation.cxx b/bbtk/src/bbmaracasvisuImageChangeInformation.cxx
index e0b3f1c..f32c600 100644
--- a/bbtk/src/bbmaracasvisuImageChangeInformation.cxx
+++ b/bbtk/src/bbmaracasvisuImageChangeInformation.cxx
@@ -32,25 +32,26 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ImageChangeInformation)
 BBTK_BLACK_BOX_IMPLEMENTATION(ImageChangeInformation,bbtk::AtomicBlackBox);
 void ImageChangeInformation::Process()
 {
-	int ext[6];
-	double spc[3];
-	vtkImageData* img = bbGetInputIn();
-	if(img!=NULL){
+	int 			ext[6];
+	double 			spc[3];
+	double 			origin[3];
+	vtkImageData	*img = bbGetInputIn();
+	if(img!=NULL)
+	{
 		if(mchange != NULL)
 		{
 			mchange->Delete();
 		}
 		mchange = vtkImageChangeInformation::New();
 		img->GetExtent( ext );	
-		double origin[3];
-		origin[0] = 0.0;
-		origin[1] = 0.0;
-		origin[2] = 0.0;
-		img->SetOrigin(origin);		
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		mchange->SetInput( img );
-//EED 2016 15 06
-//		mchange->SetExtentTranslation( -ext[0], -ext[2], -ext[4] );
-		mchange->SetOutputOrigin (0, 0, 0);
+#else
+		mchange->SetInputData( img );
+#endif
+
 		mchange->SetOutputExtentStart(0,0,0);
 		if (bbGetInputNewSpacing().size()==3)
 		{
@@ -59,12 +60,30 @@ void ImageChangeInformation::Process()
 			spc[2] = bbGetInputNewSpacing()[2];
 			mchange->SetOutputSpacing( spc[0] , spc[1] , spc [2] );    //spacing
 		}
+		if (bbGetInputNewOrigin().size()==3)
+		{
+			if ( (bbGetInputNewOrigin()[0]==-1) && (bbGetInputNewOrigin()[1]==-1) && (bbGetInputNewOrigin()[2]==-1) )
+			{
+				img->GetOrigin( origin );	
+			} else {
+				origin[0] = bbGetInputNewOrigin()[0];
+				origin[1] = bbGetInputNewOrigin()[1];
+				origin[2] = bbGetInputNewOrigin()[2];
+			}
+		} else {
+			origin[0] = 0;
+			origin[1] = 0;
+			origin[2] = 0;
+		}
+		mchange->SetOutputOrigin( origin );
 		mchange->Modified();    //important
 		mchange->Update();    //important
 		bbSetOutputOut( mchange->GetOutput() );
-	}  
+	}  // if img
+
 }
 
+
 void ImageChangeInformation::bbUserSetDefaultValues()
 {
   	mchange = NULL;