X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=filters%2FclitkBinarizeImageGenericFilter.txx;h=206b1431380bf14a54f1c4cbf30e4dba093b6bfe;hb=942f4fcf5d6d3d813e9da546331f599f61dee0ac;hp=80837bd05900ac59d4351bac0e4672c8e7cf9873;hpb=71d769c28f63906bc4872127e4d2d4b7b9f8e5ed;p=clitk.git

diff --git a/filters/clitkBinarizeImageGenericFilter.txx b/filters/clitkBinarizeImageGenericFilter.txx
index 80837bd..206b143 100644
--- a/filters/clitkBinarizeImageGenericFilter.txx
+++ b/filters/clitkBinarizeImageGenericFilter.txx
@@ -22,9 +22,9 @@ namespace clitk
   template<class args_info_type>
   BinarizeImageGenericFilter<args_info_type>::BinarizeImageGenericFilter():
     ImageToImageGenericFilter<Self>("Binarize") {
-    //    InitializeImageType<2>();
+    InitializeImageType<2>();
     InitializeImageType<3>();
-    //InitializeImageType<4>();
+    InitializeImageType<4>();
   }
   //--------------------------------------------------------------------
 
@@ -33,9 +33,9 @@ namespace clitk
   template<class args_info_type>
   template<unsigned int Dim>
   void BinarizeImageGenericFilter<args_info_type>::InitializeImageType() {      
-    //ADD_IMAGE_TYPE(Dim, char);
+    ADD_IMAGE_TYPE(Dim, char);
     ADD_IMAGE_TYPE(Dim, short);
-    //ADD_IMAGE_TYPE(Dim, int);
+    ADD_IMAGE_TYPE(Dim, int);
     //ADD_IMAGE_TYPE(Dim, float);
   }
   //--------------------------------------------------------------------
@@ -93,6 +93,27 @@ namespace clitk
     DD(mArgsInfo.bg_given);
     DD(mArgsInfo.mode_arg);
 
+// <<<<<<< clitkBinarizeImageGenericFilter.txx
+//     DD(mArgsInfo.useFG_flag);
+//     DD(mArgsInfo.useBG_flag);
+
+//     thresholdFilter->SetInsideValue(mArgsInfo.fg_arg);
+
+//     // Keep BG value to 0 if maskFilterType is used after
+//     if (mArgsInfo.useBG_flag && mArgsInfo.useFG_flag) {
+//       thresholdFilter->SetOutsideValue(mArgsInfo.bg_arg);
+//     }
+//     else {
+//       DD("0");
+//       thresholdFilter->SetOutsideValue(0);
+//     }
+
+//     // thresholdFilter->Update();
+
+//     // If no BG or no FG : new image, copy input with MaskImageFilter
+//     // 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
@@ -101,6 +122,7 @@ namespace clitk
       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);
     }