X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuImageChangeInformation.cxx;h=6cc53a3615ae61d0fa63a97f47827e01bb3f4b89;hb=d79fc05657cfa43ed1cd6937a5acaeaf70e09b45;hp=de4e0fc125400976ae792f080943cdeae05eb4c9;hpb=fd5809bcc472277366296dec8e2cf13ef0fd970c;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuImageChangeInformation.cxx b/bbtk/src/bbmaracasvisuImageChangeInformation.cxx
index de4e0fc..6cc53a3 100644
--- a/bbtk/src/bbmaracasvisuImageChangeInformation.cxx
+++ b/bbtk/src/bbmaracasvisuImageChangeInformation.cxx
@@ -25,6 +25,7 @@
 
 #include "bbmaracasvisuImageChangeInformation.h"
 #include "bbcreaMaracasVisuPackage.h"
+
 namespace bbcreaMaracasVisu
 {
 
@@ -32,27 +33,27 @@ 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){
-		if(mchange != 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 );
-		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)
 		{
 			spc[0] = bbGetInputNewSpacing()[0];
@@ -60,20 +61,35 @@ 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;
-   bbSetOutputOut( NULL);
-   bbSetInputIn(NULL);
+  	mchange = NULL;
+   	bbSetOutputOut( NULL);
+   	bbSetInputIn(NULL);
 }
 
 void ImageChangeInformation::bbUserInitializeProcessing()