X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FclitkComposeVF.cxx;h=c2cead24fd92e323f35d0a70ed2839c576b874ce;hb=85d87a4260fedf7ce53875ebd8654787a2dd941c;hp=ed510d9e5de4f2b5826cf04f2d5836a5eb504b5c;hpb=a26cd8a19e1b9ad8344ab501436045f171a73713;p=clitk.git

diff --git a/tools/clitkComposeVF.cxx b/tools/clitkComposeVF.cxx
old mode 100755
new mode 100644
index ed510d9..c2cead2
--- a/tools/clitkComposeVF.cxx
+++ b/tools/clitkComposeVF.cxx
@@ -3,7 +3,7 @@
 
   Authors belong to: 
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,45 +14,44 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
-#ifndef CLITKCOMPOSEVF_CXX
-#define CLITKCOMPOSEVF_CXX
-
-/**
- * @file   clitkComposeVF.cxx
- * @author Jef Vandemeulebroucke <jefvdmb@gmail.com>
- * @date   July 20  10:14:53 2007
- * 
- * @brief  Read in two  VF (ex mhd, vf)compose them using lirear interpolation. 
- * 
- */
+===========================================================================**/
 
 // clitk include
 #include "clitkComposeVF_ggo.h"
-#include "clitkIO.h"
-#include "clitkImageCommon.h"
+#include "clitkCommon.h"
 #include "clitkComposeVFGenericFilter.h"
 
+//--------------------------------------------------------------------
 int main( int argc, char *argv[] )
 {
   
   // Init command line
   GGO(clitkComposeVF, args_info);
   CLITK_INIT;
+
+  if (args_info.type_arg == 1 && !args_info.like_given) {
+    std::cerr << "--like must be used when type = 1" << std::endl;
+    return -1;
+  }
+
   
   //Creation of the generic filter
   clitk::ComposeVFGenericFilter::Pointer ComposeVFGenericFilter= clitk::ComposeVFGenericFilter::New();
-
+  
   //Pass the parameters
   ComposeVFGenericFilter->SetInput1(args_info.input1_arg);
   ComposeVFGenericFilter->SetInput2(args_info.input2_arg);
   ComposeVFGenericFilter->SetOutput(args_info.output_arg);
+  ComposeVFGenericFilter->SetInputType(args_info.type_arg);
+  if (args_info.like_given)
+    ComposeVFGenericFilter->SetLikeImage(args_info.like_arg);
   //JV how to pass for different dims?
   //ComposeVFGenericFilter->SetEdgePaddingValue(args_info.pad_arg);
   ComposeVFGenericFilter->SetVerbose(args_info.verbose_flag);
-  ComposeVFGenericFilter->Update();  
+  CLITK_TRY_CATCH_EXIT(ComposeVFGenericFilter->Update());  
 
   return EXIT_SUCCESS;
 }
-#endif
+//--------------------------------------------------------------------
+