X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=segmentation%2FclitkExtractLymphStationsFilter.h;h=6db26a222b138ee0c3fe4cdf24da968631a8f15b;hb=dd629343e9209aa7a536b205f390f59f00247049;hp=e90abd4045c39fb277f6b4ca33c136469c020f09;hpb=e008d74b0ecdc4ca2eaae8c429901a78f9ef5c31;p=clitk.git

diff --git a/segmentation/clitkExtractLymphStationsFilter.h b/segmentation/clitkExtractLymphStationsFilter.h
index e90abd4..6db26a2 100644
--- a/segmentation/clitkExtractLymphStationsFilter.h
+++ b/segmentation/clitkExtractLymphStationsFilter.h
@@ -19,7 +19,9 @@
 #ifndef CLITKEXTRACTLYMPHSTATIONSFILTER_H
 #define CLITKEXTRACTLYMPHSTATIONSFILTER_H
 
+// clitk
 #include "clitkFilterBase.h"
+#include "clitkFilterWithAnatomicalFeatureDatabaseManagement.h"
 
 namespace clitk {
   
@@ -35,14 +37,15 @@ namespace clitk {
   
   template <class TImageType>
   class ITK_EXPORT ExtractLymphStationsFilter: 
-    public clitk::FilterBase, 
-    public itk::ImageToImageFilter<TImageType, TImageType> 
+    public virtual clitk::FilterBase, 
+    public clitk::FilterWithAnatomicalFeatureDatabaseManagement,
+    public itk::ImageToImageFilter<TImageType, TImageType>
   {
 
   public:
     /** Standard class typedefs. */
     typedef itk::ImageToImageFilter<TImageType, TImageType> Superclass;
-    typedef ExtractLymphStationsFilter            Self;
+    typedef ExtractLymphStationsFilter          Self;
     typedef itk::SmartPointer<Self>             Pointer;
     typedef itk::SmartPointer<const Self>       ConstPointer;
     
@@ -61,6 +64,7 @@ namespace clitk {
     typedef typename ImageType::PixelType    ImagePixelType; 
     typedef typename ImageType::SizeType     ImageSizeType; 
     typedef typename ImageType::IndexType    ImageIndexType; 
+    typedef typename ImageType::PointType    ImagePointType; 
         
     /** Connect inputs */
     void SetInputMediastinumLabelImage(const TImageType * image, ImagePixelType bg=0);
@@ -85,9 +89,10 @@ namespace clitk {
     itkGetConstMacro(BackgroundValue, ImagePixelType);
     itkGetConstMacro(ForegroundValue, ImagePixelType);
 
-    itkSetMacro(CarenaZPositionInMM, double);
-    itkGetConstMacro(CarenaZPositionInMM, double);
-    GGO_DefineOption(carenaZposition, SetCarenaZPositionInMM, double);
+    //itkSetMacro(CarinaZPositionInMM, double);
+    void SetCarinaZPositionInMM(double d) { m_CarinaZPositionInMM = d; Modified(); m_CarinaZPositionInMMIsSet = true; }
+    itkGetConstMacro(CarinaZPositionInMM, double);
+    GGO_DefineOption(carenaZposition, SetCarinaZPositionInMM, double);
 
     itkSetMacro(MiddleLobeBronchusZPositionInMM, double);
     itkGetConstMacro(MiddleLobeBronchusZPositionInMM, double);
@@ -100,9 +105,7 @@ namespace clitk {
     itkSetMacro(FuzzyThreshold1, double);
     itkGetConstMacro(FuzzyThreshold1, double);
     GGO_DefineOption(fuzzy1, SetFuzzyThreshold1, double);
-
-
-
+    
   protected:
     ExtractLymphStationsFilter();
     virtual ~ExtractLymphStationsFilter() {}
@@ -125,7 +128,8 @@ namespace clitk {
     ImagePixelType m_BackgroundValue;
     ImagePixelType m_ForegroundValue;
     
-    double m_CarenaZPositionInMM;
+    double m_CarinaZPositionInMM;
+    bool   m_CarinaZPositionInMMIsSet;
     double m_MiddleLobeBronchusZPositionInMM; 
     double m_IntermediateSpacing;
     double m_FuzzyThreshold1;