From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Tue, 21 May 2013 06:50:16 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~231
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0255ca419966ffe3fd22609cdc8693673e3e4cff;hp=05c1da2360564996beca2ef77b91f25e9c17a4e2;p=clitk.git

Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
---

diff --git a/tools/clitkAffineTransform.ggo b/tools/clitkAffineTransform.ggo
index ff2b196..dc64bff 100644
--- a/tools/clitkAffineTransform.ggo
+++ b/tools/clitkAffineTransform.ggo
@@ -15,6 +15,7 @@ option "transform_grid" -       "Apply affine transform to input grid for output
 section "Options"
 option "size"		-	"New output size if different from input"  	int 	no 	multiple
 option "spacing"	-	"New output spacing if different from input" 	double 	no 	multiple
+option "spacinglike"	-	"New output spacing like this image" 	        string  no
 option "origin"		-	"New output origin if different from input" 	double 	no 	multiple
 option "matrix"		m	"Affine matrix (homogene) filename"		string  no
 option "elastix"	e	"Read EulerTransform from elastix output file"	string  no
diff --git a/tools/clitkAffineTransformGenericFilter.txx b/tools/clitkAffineTransformGenericFilter.txx
index 621dfd0..b2d7a53 100644
--- a/tools/clitkAffineTransformGenericFilter.txx
+++ b/tools/clitkAffineTransformGenericFilter.txx
@@ -214,7 +214,7 @@ namespace clitk
       typename itk::Matrix<double, Dimension+1, Dimension+1> invMatrix( matrix.GetInverse() );
       typename itk::Matrix<double, Dimension, Dimension> invRotMatrix( clitk::GetRotationalPartMatrix(invMatrix) );
       typename itk::Vector<double,Dimension> invTrans =  clitk::GetTranslationPartMatrix(invMatrix);
-
+      
       // Display warning
       if (m_ArgsInfo.spacing_given)
         std::cout << "Warning --spacing ignored (because --transform_grid_flag)" << std::endl;
@@ -285,6 +285,29 @@ namespace clitk
 
     }
 
+    if (m_ArgsInfo.spacinglike_given) {
+      typename InputReaderType::Pointer likeReader=InputReaderType::New();
+      likeReader->SetFileName(m_ArgsInfo.spacinglike_arg);
+      likeReader->Update(); 
+
+      // set the support like the image 
+      if (m_ArgsInfo.like_given) {
+        typename OutputImageType::SizeType outputSize;
+        outputSize[0] = ceil(resampler->GetSize()[0]*resampler->GetOutputSpacing()[0]
+                             /likeReader->GetOutput()->GetSpacing()[0]);
+        outputSize[1] = ceil(resampler->GetSize()[1]*resampler->GetOutputSpacing()[1]
+                             /likeReader->GetOutput()->GetSpacing()[1]);
+        outputSize[2] = ceil(resampler->GetSize()[2]*resampler->GetOutputSpacing()[2]
+                             /likeReader->GetOutput()->GetSpacing()[2]);
+        if (m_ArgsInfo.verbose_flag) {
+          std::cout << "Compute the number of pixels such as the support is like " << m_ArgsInfo.like_arg << std::endl;
+        }
+        resampler->SetSize( outputSize );
+      }
+
+      resampler->SetOutputSpacing( likeReader->GetOutput()->GetSpacing() );      
+    }
+
     if (m_ArgsInfo.verbose_flag) {
       std::cout << "Setting the output size to " << resampler->GetSize() << "..." << std::endl;
       std::cout << "Setting the output spacing to " << resampler->GetOutputSpacing() << "..." << std::endl;