X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=segmentation%2FclitkExtractLymphStationsFilter.txx;h=9051ec154df9cf5c8a8cc94cb640556a27f73819;hb=eb79c2aca4b0158e4a9a034540954c01bf2b9050;hp=03fb77ec2d614a4314b555290d41727459328965;hpb=d8491513127692da553a367ac5460a63a45f7129;p=clitk.git

diff --git a/segmentation/clitkExtractLymphStationsFilter.txx b/segmentation/clitkExtractLymphStationsFilter.txx
index 03fb77e..9051ec1 100644
--- a/segmentation/clitkExtractLymphStationsFilter.txx
+++ b/segmentation/clitkExtractLymphStationsFilter.txx
@@ -62,7 +62,11 @@ ExtractLymphStationsFilter():
   ExtractStation_2RL_SetDefaultValues();
   ExtractStation_3A_SetDefaultValues();
   ExtractStation_1RL_SetDefaultValues();
+  ExtractStation_4RL_SetDefaultValues();
+  ExtractStation_5_SetDefaultValues();
+  ExtractStation_6_SetDefaultValues();
 
+  // TODO
   ExtractStation_7_SetDefaultValues();
   ExtractStation_8_SetDefaultValues();
 }
@@ -121,17 +125,14 @@ GenerateOutputInformation() {
     this->StopSubStep();  
   }
 
-  // Extract Station3P
+  // Extract Stations
   ExtractStation_3P();
-
-  // Extract Station3A
   ExtractStation_3A();
-
-  // Extract Station2RL
   ExtractStation_2RL();
-
-  // Extract Station1RL
   ExtractStation_1RL();
+  ExtractStation_4RL();
+  ExtractStation_5();
+  ExtractStation_6();
 
   // ---------- TODO -----------------------
 
@@ -143,14 +144,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 +303,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