X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=segmentation%2FclitkFilterWithAnatomicalFeatureDatabaseManagement.cxx;h=6db7c4b934dee61ba449fc65164c4838159a09c8;hb=6a235229f0eca8ea2fad16d8068cc96d5ae5e8d8;hp=343e839a2c049120767db5e03c560a78bdd6246b;hpb=c4376513182f90792e51416ff39fccb983ddc736;p=clitk.git

diff --git a/segmentation/clitkFilterWithAnatomicalFeatureDatabaseManagement.cxx b/segmentation/clitkFilterWithAnatomicalFeatureDatabaseManagement.cxx
index 343e839..6db7c4b 100644
--- a/segmentation/clitkFilterWithAnatomicalFeatureDatabaseManagement.cxx
+++ b/segmentation/clitkFilterWithAnatomicalFeatureDatabaseManagement.cxx
@@ -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
-  ======================================================================-====*/
+  ===========================================================================**/
 
 // clitk
 #include "clitkFilterWithAnatomicalFeatureDatabaseManagement.h"
@@ -24,7 +24,8 @@ clitk::FilterWithAnatomicalFeatureDatabaseManagement::
 FilterWithAnatomicalFeatureDatabaseManagement() 
 {
   m_AFDB = NULL; 
-  SetAFDBFilename("noname.afdb");
+  SetAFDBFilename("default.afdb");
+  SetAFDBPath("./");
 }
 //--------------------------------------------------------------------
 
@@ -42,16 +43,22 @@ void clitk::FilterWithAnatomicalFeatureDatabaseManagement::WriteAFDB()
 void clitk::FilterWithAnatomicalFeatureDatabaseManagement::LoadAFDB() 
 {
   GetAFDB()->SetFilename(GetAFDBFilename());
-  GetAFDB()->Load();
+  GetAFDB()->SetPath(GetAFDBPath());
+  try {
+    GetAFDB()->Load();
+  } catch (clitk::ExceptionObject e) {
+    std::cout << "******* Could not read '" << GetAFDBFilename() << "', create one AFDB. ********" << std::endl;
+    GetAFDB();
+  }
 }
 //--------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------
-clitk::AnatomicalFeatureDatabase * clitk::FilterWithAnatomicalFeatureDatabaseManagement::GetAFDB() 
+clitk::AnatomicalFeatureDatabase::Pointer clitk::FilterWithAnatomicalFeatureDatabaseManagement::GetAFDB() 
 {
-  if (m_AFDB == NULL) {
-    m_AFDB = new clitk::AnatomicalFeatureDatabase;
+  if (!m_AFDB) {
+    m_AFDB = clitk::AnatomicalFeatureDatabase::New();
   }
   return m_AFDB;
 }