Merge branch 'master' into extentSimon

[clitk.git] / tools / clitkElastixTransformToMatrix.cxx

diff --git a/tools/clitkElastixTransformToMatrix.cxx b/tools/clitkElastixTransformToMatrix.cxx
index 59bf49e60ae955abcdd504e1f588fab0e33b88bf..08113b2441481f38b7b3a3ca04bcab86d1cad160 100644 (file)
--- a/tools/clitkElastixTransformToMatrix.cxx
+++ b/tools/clitkElastixTransformToMatrix.cxx
@@ -19,6 +19,8 @@
 // clitk
 #include "clitkElastixTransformToMatrix_ggo.h"
 #include "clitkAffineTransformGenericFilter.h"
+#include "clitkElastix.h"
+#include "clitkMatrix.h"
 
 //--------------------------------------------------------------------
 int main(int argc, char * argv[])
@@ -29,21 +31,15 @@ int main(int argc, char * argv[])
   CLITK_INIT;
 
   // Use static fct of AffineTransformGenericFilter
-  typedef clitk::AffineTransformGenericFilter<args_info_clitkElastixTransformToMatrix> FilterType;
-  std::vector<std::string> l;
-  l.push_back(args_info.input_arg);
-  itk::Matrix<double, 4, 4> m = 
-    FilterType::createMatrixFromElastixFile<3, int>(l, args_info.verbose_flag);
+  std::string filename(args_info.input_arg);
+  itk::Matrix<double, 4, 4> m = clitk::createMatrixFromElastixFile<3>(filename,
+                                                                      args_info.verbose_flag);
 
   // Print matrix
   std::ofstream os;
   clitk::openFileForWriting(os, args_info.output_arg);
-  for(unsigned int i=0; i<4; i++) {
-    for(unsigned int j=0; j<4; j++)
-      os << m[i][j] << " ";
-    os << std::endl;
-  }
-  os.close();  
+  os << clitk::Get4x4MatrixDoubleAsString(m, 16);
+  os.close();
 
   return EXIT_SUCCESS;
 }// end main