X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FclitkAutoCropFilter.txx;h=71f9ab08b0f07e93e3c3ec3495cef208e104c563;hb=4f4d79533d2bdd0c13d90cde6bbb67e5f313b638;hp=cc2c137abdf7e2c8bf04bf1ba5a5fc3979909fcb;hpb=dcf1b58a69fbd464fb447bf4bddef182d1a2dfd4;p=clitk.git

diff --git a/itk/clitkAutoCropFilter.txx b/itk/clitkAutoCropFilter.txx
index cc2c137..71f9ab0 100644
--- a/itk/clitkAutoCropFilter.txx
+++ b/itk/clitkAutoCropFilter.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,14 +14,13 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-  ======================================================================-====*/
+  ===========================================================================**/
 
 #ifndef CLITKAUTOCROPFILTER_TXX
 #define CLITKAUTOCROPFILTER_TXX
 
 // clitk
 #include "clitkCommon.h"
-#include "clitkSegmentationUtils.h"
 
 // itk
 #include "itkAutoCropLabelMapFilter.h"
@@ -39,6 +38,7 @@ namespace clitk {
   AutoCropFilter():itk::ImageToImageFilter<ImageType, ImageType>() {
     this->SetNumberOfRequiredInputs(1);
     m_BackgroundValue  = 0;
+    UseBorderOff();
   }
   //--------------------------------------------------------------------
 
@@ -95,8 +95,16 @@ namespace clitk {
     typedef itk::AutoCropLabelMapFilter<LabelMapType> AutoCropFilterType;
     typename AutoCropFilterType::Pointer autoCropFilter = AutoCropFilterType::New();
     autoCropFilter->SetInput(imageToLabelFilter->GetOutput());
-    autoCropFilter->ReleaseDataFlagOff(); 
-    
+    //    autoCropFilter->ReleaseDataFlagOff(); 
+    if (GetUseBorder()) {
+      DD("UseBorder seems buggy ?");
+      exit(0);
+      typename ImageType::SizeType s;
+      for(uint i=0; i<ImageType::ImageDimension; i++) s[i] = 1;
+      autoCropFilter->SetCropBorder(s);
+    }
+    autoCropFilter->ReleaseDataFlagOn(); 
+
     // Convert to LabelImage
     typedef itk::LabelMapToLabelImageFilter<LabelMapType, ImageType> MapToImageFilterType;
     typename MapToImageFilterType::Pointer labelToImageFilter = MapToImageFilterType::New();       
@@ -110,10 +118,13 @@ namespace clitk {
     m_Region = m_labeImage->GetLargestPossibleRegion();
     // Sometimes the index is 9223372036854775807 ???
     if (m_Region.GetIndex()[0] > 99999) {
+      std::cerr << "Warning !! BUG int clitkAutoCropFilter ?" << std::endl;
       typename ImageType::IndexType index; 
       index.Fill(0);
       m_Region.SetIndex(index);
     }
+
+    // Set the region to output
     output->SetLargestPossibleRegion(m_Region);
     output->SetRequestedRegion(m_Region);
     output->SetBufferedRegion(m_Region);
@@ -129,20 +140,18 @@ namespace clitk {
     // Get input pointers
     ImageConstPointer input = dynamic_cast<const ImageType*>(itk::ProcessObject::GetInput(0));
   
-    // Extract the region
+    // Extract the region with RegionOfInterestImageFilter or ExtractImageFilter ? 
+    // The second is when reducing the nb of dimension (index always zero)
+    // The first keep index. 
+    // OLD : typedef itk::ExtractImageFilter<ImageType, ImageType> CropFilterType;
+    // OLD : cropFilter->SetExtractionRegion(m_Region);
 
-    //TO CHANGE WITH EXTRACTIMAGEFILTER ! 
-
-    //    typedef itk::RegionOfInterestImageFilter<ImageType, ImageType> CropFilterType;
-    typedef itk::ExtractImageFilter<ImageType, ImageType> CropFilterType;
+    typedef itk::RegionOfInterestImageFilter<ImageType, ImageType> CropFilterType;
     m_labeImage->SetRequestedRegion(m_labeImage->GetLargestPossibleRegion());
     typename CropFilterType::Pointer cropFilter = CropFilterType::New();
     cropFilter->SetInput(m_labeImage);
-
-    // cropFilter->SetRegionOfInterest(m_Region);
-    cropFilter->SetExtractionRegion(m_Region);
-
-    cropFilter->ReleaseDataFlagOff();
+    cropFilter->SetReleaseDataFlag(this->GetReleaseDataFlag());
+    cropFilter->SetRegionOfInterest(m_Region);
 
     // Go ! 
     cropFilter->Update();