X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=segmentation%2FclitkAnatomicalFeatureDatabase.cxx;h=8bf17fbb57873f6f37150363512a7675ad9b7455;hb=1fea92ac237c16c1f027ffabdb42066f6f4f6114;hp=afd082e0d1c9453dedfef87aaa003d970a275a6b;hpb=44ebb81a500e42cf19964d209e14a59812a0dd4d;p=clitk.git

diff --git a/segmentation/clitkAnatomicalFeatureDatabase.cxx b/segmentation/clitkAnatomicalFeatureDatabase.cxx
index afd082e..8bf17fb 100644
--- a/segmentation/clitkAnatomicalFeatureDatabase.cxx
+++ b/segmentation/clitkAnatomicalFeatureDatabase.cxx
@@ -22,11 +22,13 @@
 // std
 #include <iterator>
 #include <sstream>
+#include <cctype>
+#include <functional>
 
 //--------------------------------------------------------------------
 clitk::AnatomicalFeatureDatabase::AnatomicalFeatureDatabase() 
 { 
-  SetFilename("noname.afdb"); 
+  SetFilename("default.afdb"); 
 }
 //--------------------------------------------------------------------
 
@@ -47,9 +49,29 @@ void clitk::AnatomicalFeatureDatabase::Write()
 //--------------------------------------------------------------------
 
 
+//--------------------------------------------------------------------
+//http://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-stdstring
+// trim from start
+static inline std::string &ltrim(std::string &s) {
+  s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not1(std::ptr_fun<int, int>(std::isspace))));
+  return s;
+}
+// trim from end
+static inline std::string &rtrim(std::string &s) {
+  s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
+  return s;
+}
+// trim from both ends
+static inline std::string &trim(std::string &s) {
+  return ltrim(rtrim(s));
+}
+//--------------------------------------------------------------------
+
+
 //--------------------------------------------------------------------
 void clitk::AnatomicalFeatureDatabase::Load() 
 {
+  m_MapOfTag.clear();
   // open file
   std::ifstream is;
   openFileForReading(is, GetFilename());
@@ -57,10 +79,14 @@ void clitk::AnatomicalFeatureDatabase::Load()
   while (!is.fail()) {
     std::string tag;
     is >> tag; 
-    std::string value;
-    std::getline(is,value,'\n');
-    m_MapOfTag[tag] = value;
+    if (tag != "") {
+      std::string value;
+      std::getline(is,value,'\n');
+      ltrim(value); // remove leading space
+      m_MapOfTag[tag] = value;
+    }
   }
+  is.close();
 }
 //--------------------------------------------------------------------
 
@@ -75,6 +101,16 @@ void clitk::AnatomicalFeatureDatabase::SetPoint3D(std::string tag, PointType3D &
 //--------------------------------------------------------------------
 
 
+//--------------------------------------------------------------------
+double clitk::AnatomicalFeatureDatabase::GetPoint3D(std::string tag, int dim)
+{
+  PointType3D p;
+  GetPoint3D(tag, p);
+  return p[dim];
+}
+//--------------------------------------------------------------------
+
+
 //--------------------------------------------------------------------
 void clitk::AnatomicalFeatureDatabase::GetPoint3D(std::string tag, PointType3D & p)
 {
@@ -95,9 +131,13 @@ void clitk::AnatomicalFeatureDatabase::GetPoint3D(std::string tag, PointType3D &
 
     // parse the string into 3 doubles
     for(int i=0; i<3; i++) {
-      DD(results[i]);
-      p[i] = atof(results[i].c_str());
-      DD(p[i]);
+
+      if (!clitk::fromString<double>(p[i], results[i].c_str())) {
+        clitkExceptionMacro("Error while reading Point3D, could not convert '" 
+                            << results[i].c_str() << "' into double.");
+      }
+
+        //      p[i] = atof(results[i].c_str());
     }
 
     /*
@@ -109,12 +149,22 @@ void clitk::AnatomicalFeatureDatabase::GetPoint3D(std::string tag, PointType3D &
     boost::tokenizer<boost::char_separator<char> > tokens(s, sep);
     int i=0;
     BOOST_FOREACH(std::string t, tokens) {
-      std::cout << t << "." << std::endl;
-      p[i] = atof(t.c_str());
-      i++;
+    std::cout << t << "." << std::endl;
+    p[i] = atof(t.c_str());
+    i++;
     }
     */
   }
 }
 //--------------------------------------------------------------------
 
+
+//--------------------------------------------------------------------
+void clitk::AnatomicalFeatureDatabase::SetImageFilename(std::string tag, std::string f)
+{
+  m_MapOfTag[tag] = f;
+}
+//--------------------------------------------------------------------
+
+
+