From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Thu, 29 Sep 2011 05:25:55 +0000 (+0200)
Subject: Add S4ARL station extraction
X-Git-Tag: v1.3.0~210
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=25972b1f582ecc43351be34ce8180e1c3e572687;p=clitk.git

Add S4ARL station extraction
---

diff --git a/segmentation/clitkExtractLymphStationsFilter.h b/segmentation/clitkExtractLymphStationsFilter.h
index 2db65b0..60a73e0 100644
--- a/segmentation/clitkExtractLymphStationsFilter.h
+++ b/segmentation/clitkExtractLymphStationsFilter.h
@@ -224,6 +224,17 @@ namespace clitk {
     void ExtractStation_1RL_Ant_Limits();
     void ExtractStation_1RL_Post_Limits();
 
+    // Station 4RL
+    void ExtractStation_4RL_SetDefaultValues();
+    void ExtractStation_4RL();
+    void ExtractStation_4RL_SI_Limits();
+    void ExtractStation_4RL_LR_Limits();
+    void ExtractStation_4RL_AP_Limits();
+    MaskImagePointer m_RightSupport;
+    MaskImagePointer m_LeftSupport;
+
+
+
     // Station 7
     void ExtractStation_7();
     void ExtractStation_7_SetDefaultValues();
@@ -252,14 +263,6 @@ namespace clitk {
 				     ListOfPointsType & LR, 
 				     ListOfPointsType & Ant, 
 				     ListOfPointsType & Post);
-    // Station 4RL
-    void ExtractStation_4RL();
-    void ExtractStation_4RL_SI_Limits();
-    void ExtractStation_4RL_LR_Limits();
-    void ExtractStation_4RL_AP_Limits();
-    MaskImagePointer m_RightSupport;
-    MaskImagePointer m_LeftSupport;
-
   private:
     ExtractLymphStationsFilter(const Self&); //purposely not implemented
     void operator=(const Self&); //purposely not implemented
diff --git a/segmentation/clitkExtractLymphStationsFilter.txx b/segmentation/clitkExtractLymphStationsFilter.txx
index 03fb77e..f12d3bc 100644
--- a/segmentation/clitkExtractLymphStationsFilter.txx
+++ b/segmentation/clitkExtractLymphStationsFilter.txx
@@ -62,6 +62,7 @@ ExtractLymphStationsFilter():
   ExtractStation_2RL_SetDefaultValues();
   ExtractStation_3A_SetDefaultValues();
   ExtractStation_1RL_SetDefaultValues();
+  ExtractStation_4RL_SetDefaultValues();
 
   ExtractStation_7_SetDefaultValues();
   ExtractStation_8_SetDefaultValues();
@@ -133,6 +134,9 @@ GenerateOutputInformation() {
   // Extract Station1RL
   ExtractStation_1RL();
 
+  // Extract Station1RL
+  ExtractStation_4RL();
+
   // ---------- TODO -----------------------
 
   // Extract Station8
@@ -143,14 +147,7 @@ GenerateOutputInformation() {
   this->StartSubStep();
   ExtractStation_7();
   this->StopSubStep();
-
-  if (0) { // temporary suppress
-    // Extract Station4RL
-    this->StartNewStep("Station 4RL");
-    this->StartSubStep();
-    //ExtractStation_4RL();
-    this->StopSubStep();
-  }
+  
 }
 //--------------------------------------------------------------------
 
@@ -309,23 +306,6 @@ void ComputeImageBoundariesCoordinates(typename ImageType::Pointer image,
 //--------------------------------------------------------------------
 
 
-//--------------------------------------------------------------------
-template <class TImageType>
-void 
-clitk::ExtractLymphStationsFilter<TImageType>::
-ExtractStation_4RL() {
-  DD("TODO");
-  exit(0);
-  /*
-    WARNING ONLY 4R FIRST !!! (not same inf limits)
-  */    
-  ExtractStation_4RL_SI_Limits();
-  ExtractStation_4RL_LR_Limits();
-  ExtractStation_4RL_AP_Limits();
-}
-//--------------------------------------------------------------------
-
-
 //--------------------------------------------------------------------
 template <class ImageType>
 void