X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=segmentation%2FclitkExtractLymphStationsFilter.h;h=d67dfa2bce61a4d6daf83e503e7bb2fd766c6268;hb=119a42cb1444930c78314e862e590f54c2f7678d;hp=8c7b329429116b937e874aea87017c06c9a1a95e;hpb=bf4928c59a1d39f53fe03deb4b73ecb7e1cf214b;p=clitk.git

diff --git a/segmentation/clitkExtractLymphStationsFilter.h b/segmentation/clitkExtractLymphStationsFilter.h
index 8c7b329..d67dfa2 100644
--- a/segmentation/clitkExtractLymphStationsFilter.h
+++ b/segmentation/clitkExtractLymphStationsFilter.h
@@ -71,6 +71,7 @@ namespace clitk {
     typedef typename MaskImageType::PointType    MaskImagePointType; 
 
     typedef itk::Image<MaskImagePixelType, 2>    MaskSliceType;
+    typedef typename MaskSliceType::Pointer      MaskSlicePointer;
 
     /** ImageDimension constants */
     itkStaticConstMacro(ImageDimension, unsigned int, ImageType::ImageDimension);
@@ -91,12 +92,14 @@ namespace clitk {
     itkSetMacro(FuzzyThresholdForS8, double);
     itkGetConstMacro(FuzzyThresholdForS8, double);
 
+    itkSetMacro(InjectedThresholdForS8, double);
+    itkGetConstMacro(InjectedThresholdForS8, double);
+
     // Station 7
-    itkSetMacro(FuzzyThreshold, double);
-    itkGetConstMacro(FuzzyThreshold, double);
-    itkSetMacro(Station7Filename, std::string);
-    itkGetConstMacro(Station7Filename, std::string);
-    
+    void SetFuzzyThresholdForS7(std::string tag, double value);
+    double GetFuzzyThresholdForS7(std::string tag);
+
+    // All stations
     bool GetComputeStation(std::string s);
     void AddComputeStation(std::string station) ;
 
@@ -117,6 +120,7 @@ namespace clitk {
     std::map<std::string, bool> m_ComputeStationMap;
 
     bool CheckForStation(std::string station);
+    void Remove_Structures(std::string s);
 
     // Station 8
     double m_DistanceMaxToAnteriorPartOfTheSpine;
@@ -124,6 +128,8 @@ namespace clitk {
     double m_CarinaZ;
     double m_OriginOfRightMiddleLobeBronchusZ;
     double m_FuzzyThresholdForS8;
+    double m_InjectedThresholdForS8;
+    MaskImagePointer m_Esophagus;
     MaskImagePointType m_EsophagusDiltationForAnt;
     MaskImagePointType m_EsophagusDiltationForRight;
     MaskImagePointer EnlargeEsophagusDilatationRadiusInferiorly(MaskImagePointer & eso);
@@ -131,26 +137,45 @@ namespace clitk {
     void ExtractStation_8_SetDefaultValues();
     void ExtractStation_8_SI_Limits();
     void ExtractStation_8_Post_Limits();
-    void ExtractStation_8_Ant_Limits();
+    void ExtractStation_8_Ant_Sup_Limits();
+    void ExtractStation_8_Ant_Inf_Limits();
+    void ExtractStation_8_Ant_Injected_Limits();
+    void ExtractStation_8_LR_1_Limits();
+    void ExtractStation_8_LR_2_Limits();
+    void ExtractStation_8_Single_CCL_Limits();
     void ExtractStation_8_LR_Limits();
+    void ExtractStation_8_Remove_Structures();
     void ExtractStation_8_LR_Limits_old();
+    void ExtractStation_8_LR_Limits_old2();
     
     // Station 3P
     void ExtractStation_3P();
     void ExtractStation_3P_SetDefaultValues();
     void ExtractStation_3P_SI_Limits();
- 
+    void ExtractStation_3P_Remove_Structures();
+    void ExtractStation_3P_Ant_Limits();
+    void ExtractStation_3P_Post_Limits();
+    void ExtractStation_3P_LR_sup_Limits();
+    void ExtractStation_3P_LR_sup_Limits_2();
+    void ExtractStation_3P_LR_inf_Limits();
+
+    // Station 3A
+    void ExtractStation_3A();
+    void ExtractStation_3A_SetDefaultValues();
+    void ExtractStation_3A_SI_Limits();
+    void ExtractStation_3A_Ant_Limits();
+
     // Station 7
     void ExtractStation_7();
+    void ExtractStation_7_SetDefaultValues();
     void ExtractStation_7_SI_Limits();
     void ExtractStation_7_RL_Limits();
     void ExtractStation_7_Posterior_Limits();   
-    std::string      m_Station7Filename;
-    MaskImagePointer m_working_trachea;
-    double           m_FuzzyThreshold;
+    void ExtractStation_7_Remove_Structures();
+    MaskImagePointer m_Working_Trachea;
+    std::map<std::string, double> m_FuzzyThresholdForS7;
     MaskImagePointer m_LeftBronchus;
     MaskImagePointer m_RightBronchus;
-    MaskImagePointer m_Station7;
     typedef std::vector<MaskImageType::PointType> ListOfPointsType;
     ListOfPointsType  m_RightMostInLeftBronchus;
     ListOfPointsType  m_AntMostInLeftBronchus;
@@ -187,6 +212,7 @@ namespace clitk {
 #include "clitkExtractLymphStationsFilter.txx"
 #include "clitkExtractLymphStation_8.txx"
 #include "clitkExtractLymphStation_3P.txx"
+#include "clitkExtractLymphStation_3A.txx"
 #include "clitkExtractLymphStation_7.txx"
 #include "clitkExtractLymphStation_4RL.txx"
 #endif