X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=segmentation%2FclitkFilterWithAnatomicalFeatureDatabaseManagement.h;h=a44405b7a1ff677db47d7f4745aa72ce2b9fe0fb;hb=ccd824211632f1a00462735f08bfec4bae64d04b;hp=9bcd9d96526ddc81cb5fd821c61b7bde59516d90;hpb=44ebb81a500e42cf19964d209e14a59812a0dd4d;p=clitk.git

diff --git a/segmentation/clitkFilterWithAnatomicalFeatureDatabaseManagement.h b/segmentation/clitkFilterWithAnatomicalFeatureDatabaseManagement.h
index 9bcd9d9..a44405b 100644
--- a/segmentation/clitkFilterWithAnatomicalFeatureDatabaseManagement.h
+++ b/segmentation/clitkFilterWithAnatomicalFeatureDatabaseManagement.h
@@ -3,7 +3,7 @@
 
   Authors belong to: 
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-  ======================================================================-====*/
+  ===========================================================================**/
 
 #ifndef CLITKFILTERWITHANATOMICALFEATUREDATABASEMANAGEMENT_H
 #define CLITKFILTERWITHANATOMICALFEATUREDATABASEMANAGEMENT_H
@@ -41,19 +41,20 @@ namespace clitk {
     // Run-time type information (and related methods)
     itkTypeMacro(FilterWithAnatomicalFeatureDatabaseManagement, Object);
 
-    // Set/Get filename 
-    itkBooleanMacro(AFDBFilenameGivenFlag);
-    itkSetMacro(AFDBFilenameGivenFlag, bool);
-    itkGetConstMacro(AFDBFilenameGivenFlag, bool);
-    GGO_DefineOption_Flag(afdb, SetAFDBFilenameGivenFlag);
-
     itkSetMacro(AFDBFilename, std::string);
     itkGetConstMacro(AFDBFilename, std::string);
-    GGO_DefineOption_WithTest(afdb, SetAFDBFilename, std::string, AFDBFilenameGivenFlag);
+
+    itkSetMacro(AFDBPath, std::string);
+    itkGetConstMacro(AFDBPath, std::string);
+
+    itkGetConstMacro(DisplayUsedStructuresOnlyFlag, bool);
+    itkSetMacro(DisplayUsedStructuresOnlyFlag, bool);
+    itkBooleanMacro(DisplayUsedStructuresOnlyFlag);
 
     void WriteAFDB();
     void LoadAFDB();
-    AnatomicalFeatureDatabase * GetAFDB();
+
+    AnatomicalFeatureDatabase::Pointer GetAFDB();
     void SetAFDB(AnatomicalFeatureDatabase * a) { m_AFDB = a; }
 
   protected:
@@ -61,8 +62,13 @@ namespace clitk {
     virtual ~FilterWithAnatomicalFeatureDatabaseManagement() {}    
     
     std::string m_AFDBFilename;
-    bool m_AFDBFilenameGivenFlag;
-    clitk::AnatomicalFeatureDatabase * m_AFDB;
+    std::string m_AFDBPath;
+    clitk::AnatomicalFeatureDatabase::Pointer m_AFDB;
+
+    // For debug: display used structures but do not perform
+    // segmentation
+    bool m_DisplayUsedStructuresOnlyFlag;
+    void AddUsedStructures(std::string station, std::string structure);    
 
   private:
     FilterWithAnatomicalFeatureDatabaseManagement(const Self&); //purposely not implemented