X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvLandmarks.h;h=cd564dc1c8aced4cab057d5f148931b75612451b;hb=8410a88a08678a4b2e026b5bc2c61adaef763c05;hp=0abaf61ff13440334c4d04e34dd0d10a5275cfe1;hpb=327bd2cb8bb469b5fcfa9d5d4424b8be2303d7be;p=clitk.git

diff --git a/vv/vvLandmarks.h b/vv/vvLandmarks.h
index 0abaf61..cd564dc 100644
--- a/vv/vvLandmarks.h
+++ b/vv/vvLandmarks.h
@@ -39,7 +39,7 @@ public :
     vvLandmarks(int size);
     ~vvLandmarks();
 
-    bool LoadFile(std::string filename);
+    bool LoadFile(std::vector<std::string> filename);
     void SaveFile(std::string filename);
 
     void AddLandmark(float x,float y,float z,float t,double value);
@@ -49,7 +49,7 @@ public :
     float* GetCoordinates(int index);
     double GetPixelValue(int index);
     std::string GetComments(int index);
-    unsigned int GetNumberOfPoints() { return (unsigned int) mLandmarks.size(); }
+    unsigned int GetNumberOfPoints() { return (unsigned int) mLandmarks[mTime].size(); }
     //int GetNumberOfSources(){return mText.size();}
 
     vtkPolyData* GetOutput() {
@@ -57,23 +57,28 @@ public :
     }
     //vtkPolyData* GetSources(int i){return mText[i]->GetOutput();}
     void SetTime(int time);
+    int GetTime() {return mTime; }
 
     bool ErrorMsg(int num,const char * text);
 
 private:
     ///Helper function to tackle the use of the comma as the decimal separator
     std::string replace_dots(std::string input);
-    std::vector<vvLandmark> mLandmarks;
+    
+    typedef std::vector<vvLandmark> LandmarkContainerType;
+    std::vector<LandmarkContainerType> mLandmarks;
+    
     vtkPolyData *mPolyData;
     std::vector<vtkPoints*> mPoints;
-    vtkFloatArray* mIds;
+    std::vector<vtkFloatArray*> mIds;
     //std::vector<vvLandmarksGlyph*> mText;
-    vtkStringArray* mLabels;
-    std::string mFilename;
+    std::vector<vtkStringArray*> mLabels;
+    std::vector<std::string> mFilenames;
     int mFormatVersion;
+    int mTime;
 
-    bool LoadTxtFile(std::string filename);
-    bool LoadPtsFile(std::string filename);
+    bool LoadTxtFile(std::vector<std::string> filenames);
+    bool LoadPtsFile(std::vector<std::string> filenames);
   
 };