X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=segmentation%2FclitkMotionMaskGenericFilter.txx;h=0edf047f368778f2e62a5002ce5ed5c020f3e44b;hb=205ae7d81e6049af88e1cf14dde9c3473240887a;hp=95747df21ea26583b02e4f9c2606c156fe13a976;hpb=981c4ae594d096a10a97c39486baf021cb53456e;p=clitk.git

diff --git a/segmentation/clitkMotionMaskGenericFilter.txx b/segmentation/clitkMotionMaskGenericFilter.txx
index 95747df..0edf047 100755
--- a/segmentation/clitkMotionMaskGenericFilter.txx
+++ b/segmentation/clitkMotionMaskGenericFilter.txx
@@ -97,6 +97,28 @@ MotionMaskGenericFilter::GetAirImage(typename itk::Image<PixelType, Dimension>::
     if (m_Verbose) std::cout<<"Reading the air feature image..."<<std::endl;
     featureReader->Update();
     air=featureReader->GetOutput();
+
+    //---------------------------------
+    // Pad
+    //---------------------------------
+    if(m_ArgsInfo.pad_flag) {
+      typedef itk::ImageRegionIteratorWithIndex<InternalImageType> IteratorType;
+      IteratorType it(air, air->GetLargestPossibleRegion());
+      typename InternalImageType::IndexType index;
+      while(!it.IsAtEnd()) {
+        index=it.GetIndex();
+
+        //Pad borders of all dimensions but 2 (cranio-caudal)
+        for (unsigned int i=0; i<Dimension; i++){
+          if(i==2)
+            continue;
+          if(index[i]==air->GetLargestPossibleRegion().GetIndex()[i]
+              || index[i]==(unsigned int)air->GetLargestPossibleRegion().GetIndex()[i]+ (unsigned int) air->GetLargestPossibleRegion().GetSize()[i]-1)
+            it.Set(1);
+        }
+        ++it;
+      }
+    }
   } else {
     if (m_Verbose) std::cout<<"Extracting the air feature image..."<<std::endl;
     //---------------------------------
@@ -109,12 +131,35 @@ MotionMaskGenericFilter::GetAirImage(typename itk::Image<PixelType, Dimension>::
     if (m_Verbose) std::cout<<"Binarizing the image using thresholds "<<m_ArgsInfo.lowerThresholdAir_arg
                               <<", "<<m_ArgsInfo.upperThresholdAir_arg<<"..."<<std::endl;
     binarizeFilter->Update();
+    air = binarizeFilter->GetOutput();
+
+    //---------------------------------
+    // Pad
+    //---------------------------------
+    if(m_ArgsInfo.pad_flag) {
+      typedef itk::ImageRegionIteratorWithIndex<InternalImageType> IteratorType;
+      IteratorType it(air, air->GetLargestPossibleRegion());
+      typename InternalImageType::IndexType index;
+      while(!it.IsAtEnd()) {
+        index=it.GetIndex();
+
+        //Pad borders of all dimensions but 2 (cranio-caudal)
+        for (unsigned int i=0; i<Dimension; i++){
+          if(i==2)
+            continue;
+          if(index[i]==air->GetLargestPossibleRegion().GetIndex()[i]
+              || index[i]==(unsigned int)air->GetLargestPossibleRegion().GetIndex()[i]+ (unsigned int) air->GetLargestPossibleRegion().GetSize()[i]-1)
+            it.Set(binarizeFilter->GetInsideValue());
+        }
+        ++it;
+      }
+    }
 
     //---------------------------------
     // Remove lungs (in place)
     //---------------------------------
     typedef itk::ImageRegionIterator<InternalImageType> IteratorType;
-    IteratorType itAir(binarizeFilter->GetOutput(), binarizeFilter->GetOutput()->GetLargestPossibleRegion());
+    IteratorType itAir(air, binarizeFilter->GetOutput()->GetLargestPossibleRegion());
     IteratorType itLungs(lungs, binarizeFilter->GetOutput()->GetLargestPossibleRegion()); //lungs padded, used air region
     itAir.GoToBegin();
     itLungs.GoToBegin();
@@ -176,23 +221,6 @@ MotionMaskGenericFilter::GetAirImage(typename itk::Image<PixelType, Dimension>::
   air=mirrorPadImageFilter->GetOutput();
   //writeImage<InternalImageType>(air,"/home/srit/tmp/air.mhd");
 
-  //---------------------------------
-  // Pad
-  //---------------------------------
-  if(m_ArgsInfo.pad_flag) {
-    typedef itk::ImageRegionIteratorWithIndex<InternalImageType> IteratorType;
-    IteratorType it(air, air->GetLargestPossibleRegion());
-    typename InternalImageType::IndexType index;
-    while(!it.IsAtEnd()) {
-      index=it.GetIndex();
-      for (unsigned int i=0; i<Dimension; i++)
-        if(index[i]==air->GetLargestPossibleRegion().GetIndex()[i]
-            || index[i]==(unsigned int)air->GetLargestPossibleRegion().GetIndex()[i]+ (unsigned int) air->GetLargestPossibleRegion().GetSize()[i]-1)
-          it.Set(0);
-      ++it;
-    }
-  }
-
   return air;
 }