X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=filters%2FclitkBinarizeImageGenericFilter.txx;h=61a427733a50876db4d6e4e2fc999c95b838d1a8;hb=f1016340d797dbe6e0672e6e06a583baaafc738b;hp=fb474906162521437fc73fb188aac1278190ea31;hpb=3df64b5b331590863ed677550441a68fbbbd76e7;p=clitk.git

diff --git a/filters/clitkBinarizeImageGenericFilter.txx b/filters/clitkBinarizeImageGenericFilter.txx
index fb47490..61a4277 100644
--- a/filters/clitkBinarizeImageGenericFilter.txx
+++ b/filters/clitkBinarizeImageGenericFilter.txx
@@ -1,7 +1,7 @@
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Authors belong to: 
+  Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
   - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
@@ -23,91 +23,88 @@
 #include "itkBinaryThresholdImageFilter.h"
 #include "itkMaskImageFilter.h"
 #include "itkMaskNegatedImageFilter.h"
+
 #include <clitkCommon.h>
 // #include <tiff.h>
 
 namespace clitk
 {
-  
-  //--------------------------------------------------------------------
-  template<class args_info_type>
-  BinarizeImageGenericFilter<args_info_type>::BinarizeImageGenericFilter():
-    ImageToImageGenericFilter<Self>("Binarize") {
-    InitializeImageType<2>();
-    InitializeImageType<3>();
-    InitializeImageType<4>();
-  }
-  //--------------------------------------------------------------------
-
-
-  //--------------------------------------------------------------------
-  template<class args_info_type>
-  template<unsigned int Dim>
-  void BinarizeImageGenericFilter<args_info_type>::InitializeImageType() {      
-    ADD_IMAGE_TYPE(Dim, char);
-    ADD_IMAGE_TYPE(Dim, uchar);
-    ADD_IMAGE_TYPE(Dim, short);
-    ADD_IMAGE_TYPE(Dim, ushort);
-    ADD_IMAGE_TYPE(Dim, int);
-    // ADD_IMAGE_TYPE(Dim, uint16);
-    ADD_IMAGE_TYPE(Dim, float);
-    ADD_IMAGE_TYPE(Dim, double);
+
+//--------------------------------------------------------------------
+template<class args_info_type>
+BinarizeImageGenericFilter<args_info_type>::BinarizeImageGenericFilter():
+  ImageToImageGenericFilter<Self>("Binarize")
+{
+  InitializeImageType<2>();
+  InitializeImageType<3>();
+  InitializeImageType<4>();
+}
+//--------------------------------------------------------------------
+
+
+//--------------------------------------------------------------------
+template<class args_info_type>
+template<unsigned int Dim>
+void BinarizeImageGenericFilter<args_info_type>::InitializeImageType()
+{
+  ADD_DEFAULT_IMAGE_TYPES(Dim);
+}
+//--------------------------------------------------------------------
+
+
+//--------------------------------------------------------------------
+template<class args_info_type>
+void BinarizeImageGenericFilter<args_info_type>::SetArgsInfo(const args_info_type & a)
+{
+  mArgsInfo=a;
+  SetIOVerbose(mArgsInfo.verbose_flag);
+  if (mArgsInfo.imagetypes_flag) this->PrintAvailableImageTypes();
+
+  if (mArgsInfo.input_given) {
+    SetInputFilename(mArgsInfo.input_arg);
   }
-  //--------------------------------------------------------------------
-  
-
-  //--------------------------------------------------------------------
-  template<class args_info_type>
-  void BinarizeImageGenericFilter<args_info_type>::SetArgsInfo(const args_info_type & a) {
-    mArgsInfo=a;
-    SetIOVerbose(mArgsInfo.verbose_flag);
-    if (mArgsInfo.imagetypes_flag) this->PrintAvailableImageTypes();
-
-    if (mArgsInfo.input_given) {
-      SetInputFilename(mArgsInfo.input_arg);
-    }
-    if (mArgsInfo.output_given) {
-      SetOutputFilename(mArgsInfo.output_arg);
-    }
+  if (mArgsInfo.output_given) {
+    SetOutputFilename(mArgsInfo.output_arg);
   }
-  //--------------------------------------------------------------------
-
-  //--------------------------------------------------------------------
-  // Update with the number of dimensions and the pixeltype
-  //--------------------------------------------------------------------
-  template<class args_info_type>
-  template<class InputImageType>
-  void 
-  BinarizeImageGenericFilter<args_info_type>::UpdateWithInputImageType()
-  {
-
-    // Reading input
-    typename InputImageType::Pointer input = this->template GetInput<InputImageType>(0);
-
-    // Main filter
-    typedef typename InputImageType::PixelType PixelType;
-    typedef itk::Image<char, InputImageType::ImageDimension> OutputImageType;
-
-    // Filter
-    typedef itk::BinaryThresholdImageFilter<InputImageType, OutputImageType> BinaryThresholdImageFilterType;
-    typename BinaryThresholdImageFilterType::Pointer thresholdFilter=BinaryThresholdImageFilterType::New();
-    thresholdFilter->SetInput(input);
-    thresholdFilter->SetInsideValue(mArgsInfo.fg_arg);
- 
-    if (mArgsInfo.lower_given) thresholdFilter->SetLowerThreshold(static_cast<PixelType>(mArgsInfo.lower_arg));
-    if (mArgsInfo.upper_given) thresholdFilter->SetUpperThreshold(static_cast<PixelType>(mArgsInfo.upper_arg));
-
-    // DD(mArgsInfo.lower_given);
-    // DD(mArgsInfo.upper_given);
-    // DD(mArgsInfo.lower_arg);
-    // DD(mArgsInfo.upper_arg);
-    // DD(mArgsInfo.fg_arg);
-    // DD(mArgsInfo.bg_arg);
-    // DD(mArgsInfo.fg_given);
-    // DD(mArgsInfo.bg_given);
-    // DD(mArgsInfo.mode_arg);
-
-// <<<<<<< clitkBinarizeImageGenericFilter.txx
+}
+//--------------------------------------------------------------------
+
+
+//--------------------------------------------------------------------
+// Update with the number of dimensions and the pixeltype
+//--------------------------------------------------------------------
+template<class args_info_type>
+template<class InputImageType>
+void
+BinarizeImageGenericFilter<args_info_type>::UpdateWithInputImageType()
+{
+
+  // Reading input
+  typename InputImageType::Pointer input = this->template GetInput<InputImageType>(0);
+
+  // Main filter
+  typedef typename InputImageType::PixelType PixelType;
+  typedef itk::Image<uchar, InputImageType::ImageDimension> OutputImageType;
+
+  // Filter
+  typedef itk::BinaryThresholdImageFilter<InputImageType, OutputImageType> BinaryThresholdImageFilterType;
+  typename BinaryThresholdImageFilterType::Pointer thresholdFilter=BinaryThresholdImageFilterType::New();
+  thresholdFilter->SetInput(input);
+  thresholdFilter->SetInsideValue(mArgsInfo.fg_arg);
+
+  if (mArgsInfo.lower_given) thresholdFilter->SetLowerThreshold(static_cast<PixelType>(mArgsInfo.lower_arg));
+  if (mArgsInfo.upper_given) thresholdFilter->SetUpperThreshold(static_cast<PixelType>(mArgsInfo.upper_arg));
+
+  // DD(mArgsInfo.lower_given);
+  // DD(mArgsInfo.upper_given);
+  // DD(mArgsInfo.lower_arg);
+  // DD(mArgsInfo.upper_arg);
+  // DD(mArgsInfo.fg_arg);
+  // DD(mArgsInfo.bg_arg);
+  // DD(mArgsInfo.fg_given);
+  // DD(mArgsInfo.bg_given);
+  // DD(mArgsInfo.mode_arg);
+
 //     DD(mArgsInfo.useFG_flag);
 //     DD(mArgsInfo.useBG_flag);
 
@@ -128,46 +125,44 @@ namespace clitk
 //     // If setFG -> FG BG have been changed
 //     if (mArgsInfo.useBG_flag && mArgsInfo.useFG_flag) {
 // =======
-    /* Three modes : 
-       - FG -> only use FG value for pixel in the Foreground (or Inside), keep input values for outside
-       - BG -> only use BG value for pixel in the Background (or Outside), keep input values for inside
-       - both -> use FG and BG (real binary image)
-    */
-      if (mArgsInfo.mode_arg == std::string("both")) {
-      thresholdFilter->SetOutsideValue(mArgsInfo.bg_arg);
-      thresholdFilter->Update();
-      //>>>>>>> 1.5
-      typename OutputImageType::Pointer outputImage = thresholdFilter->GetOutput();
-      this->template SetNextOutput<OutputImageType>(outputImage);
-    }
-    else {
-      typename InputImageType::Pointer outputImage;
-      thresholdFilter->SetOutsideValue(0);
-      if (mArgsInfo.mode_arg == std::string("BG")) {
-	typedef itk::MaskImageFilter<InputImageType,OutputImageType> maskFilterType;
-	typename maskFilterType::Pointer maskFilter = maskFilterType::New();
-	maskFilter->SetInput1(input);
-	maskFilter->SetInput2(thresholdFilter->GetOutput());
-	maskFilter->SetOutsideValue(mArgsInfo.bg_arg);
-	maskFilter->Update();
-	outputImage = maskFilter->GetOutput();
-      }
-      else {
-	typedef itk::MaskNegatedImageFilter<InputImageType,OutputImageType> maskFilterType;
-	typename maskFilterType::Pointer maskFilter = maskFilterType::New();
-	maskFilter->SetInput1(input);
-	maskFilter->SetInput2(thresholdFilter->GetOutput());
-	maskFilter->SetOutsideValue(mArgsInfo.fg_arg);
-	maskFilter->Update();
-	outputImage = maskFilter->GetOutput();
-      }
-      // Write/Save results
-      this->template SetNextOutput<InputImageType>(outputImage);
+  /* Three modes :
+     - FG -> only use FG value for pixel in the Foreground (or Inside), keep input values for outside
+     - BG -> only use BG value for pixel in the Background (or Outside), keep input values for inside
+     - both -> use FG and BG (real binary image)
+  */
+  if (mArgsInfo.mode_arg == std::string("both")) {
+    thresholdFilter->SetOutsideValue(mArgsInfo.bg_arg);
+    thresholdFilter->Update();
+    //>>>>>>> 1.5
+    typename OutputImageType::Pointer outputImage = thresholdFilter->GetOutput();
+    this->template SetNextOutput<OutputImageType>(outputImage);
+  } else {
+    typename InputImageType::Pointer outputImage;
+    thresholdFilter->SetOutsideValue(0);
+    if (mArgsInfo.mode_arg == std::string("BG")) {
+      typedef itk::MaskImageFilter<InputImageType,OutputImageType> maskFilterType;
+      typename maskFilterType::Pointer maskFilter = maskFilterType::New();
+      maskFilter->SetInput1(input);
+      maskFilter->SetInput2(thresholdFilter->GetOutput());
+      maskFilter->SetOutsideValue(mArgsInfo.bg_arg);
+      maskFilter->Update();
+      outputImage = maskFilter->GetOutput();
+    } else {
+      typedef itk::MaskNegatedImageFilter<InputImageType,OutputImageType> maskFilterType;
+      typename maskFilterType::Pointer maskFilter = maskFilterType::New();
+      maskFilter->SetInput1(input);
+      maskFilter->SetInput2(thresholdFilter->GetOutput());
+      maskFilter->SetOutsideValue(mArgsInfo.fg_arg);
+      maskFilter->Update();
+      outputImage = maskFilter->GetOutput();
     }
+    // Write/Save results
+    this->template SetNextOutput<InputImageType>(outputImage);
   }
-  //--------------------------------------------------------------------
+}
+//--------------------------------------------------------------------
 
 
 }//end clitk
- 
+
 #endif //#define clitkBinarizeImageGenericFilter_txx