From: David Sarrut <david.sarrut@gmail.com>
Date: Fri, 4 Nov 2011 09:26:51 +0000 (+0100)
Subject: Simplify 4R 4L seg
X-Git-Tag: v1.3.0~174^2~5
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b2d621a8346ec8e8e711b4049e8035f5690525b4;p=clitk.git

Simplify 4R 4L seg
---

diff --git a/segmentation/clitkExtractLymphStation_4RL.txx b/segmentation/clitkExtractLymphStation_4RL.txx
index 1520187..8eb1fbd 100644
--- a/segmentation/clitkExtractLymphStation_4RL.txx
+++ b/segmentation/clitkExtractLymphStation_4RL.txx
@@ -14,20 +14,42 @@ ExtractStation_4RL_SetDefaultValues()
 template <class TImageType>
 void 
 clitk::ExtractLymphStationsFilter<TImageType>::
-ExtractStation_4RL() {
-  if ((!CheckForStation("4R")) && (!CheckForStation("4L"))) return;
-
-  StartNewStep("Stations 4RL");
+ExtractStation_4R() {
+  if (!CheckForStation("4R")) return;
+  StartNewStep("Stations 4R");
   StartSubStep(); 
 
   // Get the current support 
-  StartNewStep("[Station 4RL] Get the current 4RL suppport");
+  StartNewStep("[Station 4R] Get the current 4RL suppport");
   m_ListOfStations["4R"] = m_ListOfSupports["S4R"];
-  m_ListOfStations["4L"] = m_ListOfSupports["S4L"];
   StopCurrentStep<MaskImageType>(m_ListOfStations["4R"]);
     
   // Generic RelativePosition processes
   m_ListOfStations["4R"] = this->ApplyRelativePositionList("Station_4R", m_ListOfStations["4R"]);
+
+  // Store image filenames into AFDB 
+  WriteImageStation("4R");
+  StopSubStep();
+  ComputeOverlapWithRef("4R");
+}
+//--------------------------------------------------------------------
+
+
+//--------------------------------------------------------------------
+template <class TImageType>
+void 
+clitk::ExtractLymphStationsFilter<TImageType>::
+ExtractStation_4L() {
+  if (!CheckForStation("4L")) return;
+  StartNewStep("Stations 4L");
+  StartSubStep(); 
+
+  // Get the current support 
+  StartNewStep("[Station 4L] Get the current 4RL suppport");
+  m_ListOfStations["4L"] = m_ListOfSupports["S4L"];
+  StopCurrentStep<MaskImageType>(m_ListOfStations["4L"]);
+    
+  // Generic RelativePosition processes
   m_ListOfStations["4L"] = this->ApplyRelativePositionList("Station_4L", m_ListOfStations["4L"]);
 
   // Separation Ant/Post
@@ -43,13 +65,9 @@ ExtractStation_4RL() {
   StopCurrentStep<MaskImageType>(m_ListOfStations["4L"]);
 
   // Store image filenames into AFDB 
-  writeImage<MaskImageType>(m_ListOfStations["4R"], "seg/Station4R.mhd");
-  writeImage<MaskImageType>(m_ListOfStations["4L"], "seg/Station4L.mhd");
-  GetAFDB()->SetImageFilename("Station4R", "seg/Station4R.mhd"); 
-  GetAFDB()->SetImageFilename("Station4L", "seg/Station4L.mhd"); 
-  WriteAFDB(); 
+  WriteImageStation("4L");
   StopSubStep();
-
+  ComputeOverlapWithRef("4L");
 }
 //--------------------------------------------------------------------