X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=segmentation%2FclitkExtractPatientGenericFilter.txx;h=ae87cc8363afc36d6225d90cb36fef33505dec6b;hb=a1ec529a24b721fcfb2c5725f95bcc2c9125b28d;hp=9435288d1e262519c03ccde50cb0d0fd2b2d8c35;hpb=fbeb37a42e28477c9e92e866e3610f99e57f2449;p=clitk.git

diff --git a/segmentation/clitkExtractPatientGenericFilter.txx b/segmentation/clitkExtractPatientGenericFilter.txx
index 9435288..ae87cc8 100644
--- a/segmentation/clitkExtractPatientGenericFilter.txx
+++ b/segmentation/clitkExtractPatientGenericFilter.txx
@@ -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,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-  ======================================================================-====*/
+  ===========================================================================**/
 
 #include "clitkImageCommon.h"
 
@@ -36,6 +36,8 @@ template<unsigned int Dim>
 void clitk::ExtractPatientGenericFilter<ArgsInfoType>::InitializeImageType() 
 {  
   ADD_IMAGE_TYPE(Dim, short);
+  ADD_IMAGE_TYPE(Dim, unsigned short);
+  ADD_IMAGE_TYPE(Dim, float);
   // ADD_IMAGE_TYPE(Dim, int);
   // ADD_IMAGE_TYPE(Dim, float);
 }
@@ -47,10 +49,10 @@ template<class ArgsInfoType>
 void clitk::ExtractPatientGenericFilter<ArgsInfoType>::SetArgsInfo(const ArgsInfoType & a) 
 {
   mArgsInfo=a;
-  SetIOVerbose(mArgsInfo.verbose_flag);
+  this->SetIOVerbose(mArgsInfo.verbose_flag);
   if (mArgsInfo.imagetypes_flag) this->PrintAvailableImageTypes();
-  if (mArgsInfo.input_given)  SetInputFilename(mArgsInfo.input_arg);
-  if (mArgsInfo.output_given)  AddOutputFilename(mArgsInfo.output_arg);
+  if (mArgsInfo.input_given)  this->SetInputFilename(mArgsInfo.input_arg);
+  if (mArgsInfo.output_given)  this->AddOutputFilename(mArgsInfo.output_arg);
 }
 //--------------------------------------------------------------------
 
@@ -68,11 +70,14 @@ SetOptionsFromArgsInfoToFilter(FilterType * f)
   f->SetVerboseWarningFlag(!mArgsInfo.verboseWarningOff_flag);
   f->SetVerboseMemoryFlag(mArgsInfo.verboseMemory_flag);
 
-  f->SetAFDBFilename(mArgsInfo.afdb_arg);  
+  if (mArgsInfo.afdb_given)
+    f->SetAFDBFilename(mArgsInfo.afdb_arg);  
+  
   f->SetOutputPatientFilename(mArgsInfo.output_arg);
 
   f->SetUpperThreshold(mArgsInfo.upper_arg);
   f->SetLowerThreshold(mArgsInfo.lower_arg);
+  f->SetPrimaryOpeningRadius(mArgsInfo.openingRadius_arg);
 
   f->SetDecomposeAndReconstructDuringFirstStep(mArgsInfo.erode1_flag);