X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FclitkImage2DicomRTStruct.cxx;h=807b073f8c1f01fd214fb2f8fc3ea77394d1640c;hb=378ee630dce37a3e15baf3a8027542c2f8cf43de;hp=d71491ba8d12ea5e6ef26a6f45316a4b8fb44a73;hpb=c4de479fec231c7d53555dcd21d308f06aad17ec;p=clitk.git

diff --git a/tools/clitkImage2DicomRTStruct.cxx b/tools/clitkImage2DicomRTStruct.cxx
index d71491b..807b073 100644
--- a/tools/clitkImage2DicomRTStruct.cxx
+++ b/tools/clitkImage2DicomRTStruct.cxx
@@ -17,8 +17,8 @@
 
   =========================================================================*/
 
+// clitk
 #include "clitkImage2DicomRTStructFilter.h"
-#include "clitkDicomRT_StructureSet.h"
 #include "clitkImage2DicomRTStruct_ggo.h"
 
 //--------------------------------------------------------------------
@@ -27,19 +27,23 @@ int main(int argc, char * argv[]) {
   // Init command line
   GGO(clitkImage2DicomRTStruct, args_info);
 
-  // Read initial 3D image
-  typedef float PixelType;
-  typedef itk::Image<PixelType, 3> ImageType;
-  ImageType::Pointer input = clitk::readImage<ImageType>(args_info.input_arg, true);
+  // Set initial 3D image filenames
+  std::vector<std::string> filenames;
+  for(unsigned int i=0; i< args_info.input_given; i++)
+    filenames.push_back(args_info.input_arg[i]);
 
-  // Create a filter to convert image into dicomRTStruct
+  // Create a filter to convert image into dicomRTStruct and write to disk
+  typedef float PixelType;
   clitk::Image2DicomRTStructFilter<PixelType> filter;
-  filter.SetInput(input);
+  filter.SetVerboseFlag(args_info.verbose_flag);
+  filter.SetInputFilenames(filenames);
+  filter.SetDicomFolder(args_info.dicom_arg);
+  filter.SetStructureSetFilename(args_info.rtstruct_arg);
+  filter.SetOutputFilename(args_info.output_arg);
+  filter.SetROIType(args_info.roitype_arg);
+  filter.SetThresholdValue(args_info.threshold_arg);
+  filter.SetSkipInitialStructuresFlag(args_info.skip_flag);
   filter.Update();
-  
-  // Write result
-  clitk::DicomRT_StructureSet::Pointer s = filter.GetDicomRTStruct();
-  //  s->Write(args_info.output_arg);
 
   // This is the end my friend 
   return 0;