X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FclitkAutoCropFilter.txx;h=85ce7be27cc4102825a73e911fccf1c4c6dc6b6c;hb=4af47ddf6c7819cd561e97b454521c29c21ddab8;hp=46e35879d61866db3a03c38b6dc6fd856e31b0b4;hpb=13ddd066e351ce733c75d38d0fb018bb6dba34b9;p=clitk.git

diff --git a/itk/clitkAutoCropFilter.txx b/itk/clitkAutoCropFilter.txx
index 46e3587..85ce7be 100644
--- a/itk/clitkAutoCropFilter.txx
+++ b/itk/clitkAutoCropFilter.txx
@@ -29,34 +29,36 @@
 #include "itkLabelImageToLabelMapFilter.h"
 #include "itkLabelMapToLabelImageFilter.h"
 #include "itkRegionOfInterestImageFilter.h"
+#include "itkExtractImageFilter.h"
 
 namespace clitk {
 
   //--------------------------------------------------------------------
-  template <class TImageType>
-  AutoCropFilter<TImageType>::
-  AutoCropFilter():itk::ImageToImageFilter<TImageType, TImageType>() {
+  template <class ImageType>
+  AutoCropFilter<ImageType>::
+  AutoCropFilter():itk::ImageToImageFilter<ImageType, ImageType>() {
     this->SetNumberOfRequiredInputs(1);
     m_BackgroundValue  = 0;
+    UseBorderOn();
   }
   //--------------------------------------------------------------------
 
 
   //--------------------------------------------------------------------
-  template <class TImageType>
+  template <class ImageType>
   void 
-  AutoCropFilter<TImageType>::
-  SetInput(const TImageType * image) {
+  AutoCropFilter<ImageType>::
+  SetInput(const ImageType * image) {
     // Process object is not const-correct so the const casting is required.
-    this->SetNthInput(0, const_cast<TImageType *>( image ));
+    this->SetNthInput(0, const_cast<ImageType *>( image ));
   }
   //--------------------------------------------------------------------
   
 
   //--------------------------------------------------------------------
-  template <class TImageType>
+  template <class ImageType>
   void 
-  AutoCropFilter<TImageType>::  
+  AutoCropFilter<ImageType>::  
   SetBackgroundValue(ImagePixelType p) {
     m_BackgroundValue = p;
   }
@@ -64,9 +66,9 @@ namespace clitk {
 
 
   //--------------------------------------------------------------------
-  template <class TImageType>
+  template <class ImageType>
   void 
-  AutoCropFilter<TImageType>::
+  AutoCropFilter<ImageType>::
   GenerateOutputInformation() {    
 
     // Superclass
@@ -94,6 +96,13 @@ namespace clitk {
     typedef itk::AutoCropLabelMapFilter<LabelMapType> AutoCropFilterType;
     typename AutoCropFilterType::Pointer autoCropFilter = AutoCropFilterType::New();
     autoCropFilter->SetInput(imageToLabelFilter->GetOutput());
+    //    autoCropFilter->ReleaseDataFlagOff(); 
+    if (GetUseBorder()) {
+      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;
@@ -106,6 +115,15 @@ namespace clitk {
 
     // Update the output size
     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);
@@ -114,18 +132,24 @@ namespace clitk {
   //--------------------------------------------------------------------
    
   //--------------------------------------------------------------------
-  template <class TImageType>
+  template <class ImageType>
   void 
-  AutoCropFilter<TImageType>::
+  AutoCropFilter<ImageType>::
   GenerateData() {
     // 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);
+
     typedef itk::RegionOfInterestImageFilter<ImageType, ImageType> CropFilterType;
     m_labeImage->SetRequestedRegion(m_labeImage->GetLargestPossibleRegion());
     typename CropFilterType::Pointer cropFilter = CropFilterType::New();
     cropFilter->SetInput(m_labeImage);
+    cropFilter->SetReleaseDataFlag(this->GetReleaseDataFlag());
     cropFilter->SetRegionOfInterest(m_Region);
 
     // Go !