Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

[clitk.git] / vv / vvLandmarks.h

diff --git a/vv/vvLandmarks.h b/vv/vvLandmarks.h
index 6bfe82e4469e22241599fcd13f821429c2a5dbd2..0abaf61ff13440334c4d04e34dd0d10a5275cfe1 100644 (file)
--- a/vv/vvLandmarks.h
+++ b/vv/vvLandmarks.h
@@ -24,6 +24,7 @@
 #include "vtkPolyData.h"
 #include "vtkPoints.h"
 #include "vvLandmarksGlyph.h"
+#include "vtkStringArray.h"
 
 //typedef
 struct vvLandmark {
@@ -38,7 +39,7 @@ public :
     vvLandmarks(int size);
     ~vvLandmarks();
 
-    void LoadFile(std::string filename);
+    bool LoadFile(std::string filename);
     void SaveFile(std::string filename);
 
     void AddLandmark(float x,float y,float z,float t,double value);
@@ -67,8 +68,13 @@ private:
     std::vector<vtkPoints*> mPoints;
     vtkFloatArray* mIds;
     //std::vector<vvLandmarksGlyph*> mText;
+    vtkStringArray* mLabels;
     std::string mFilename;
     int mFormatVersion;
+
+    bool LoadTxtFile(std::string filename);
+    bool LoadPtsFile(std::string filename);
+  
 };
 
 #endif