X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuImageChangeInformation.cxx;fp=bbtk%2Fsrc%2FbbmaracasvisuImageChangeInformation.cxx;h=b956413ec6464a5ec823f63f58958306be973b12;hb=b57f054e2ccec0a3f36c3fbff8250860dc7d9c3f;hp=3ced61e9bf20037c59fe2731ef2af6e231f0d932;hpb=c6fea780dac325eca6315ac9b297080952e53589;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuImageChangeInformation.cxx b/bbtk/src/bbmaracasvisuImageChangeInformation.cxx
index 3ced61e..b956413 100644
--- a/bbtk/src/bbmaracasvisuImageChangeInformation.cxx
+++ b/bbtk/src/bbmaracasvisuImageChangeInformation.cxx
@@ -32,25 +32,19 @@ 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);		
 		mchange->SetInput( img );
-//EED 2016 15 06
-//		mchange->SetExtentTranslation( -ext[0], -ext[2], -ext[4] );
-		mchange->SetOutputOrigin (0, 0, 0);
 		mchange->SetOutputExtentStart(0,0,0);
 		if (bbGetInputNewSpacing().size()==3)
 		{
@@ -59,12 +53,29 @@ 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;