X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOMultiThreadImageReader.h;h=461d2c31397c2a83d6865ed1c24a134bc0214607;hb=43aa503ff4b2cffb2cd8145e28ed5ed7b4caf97d;hp=3c4da098f2c3141ec156bdd07a9b018afc687bfb;hpb=684add23b4f64cb3c6e39e12a4af20d2c2500df6;p=creaImageIO.git

diff --git a/src/creaImageIOMultiThreadImageReader.h b/src/creaImageIOMultiThreadImageReader.h
index 3c4da09..461d2c3 100644
--- a/src/creaImageIOMultiThreadImageReader.h
+++ b/src/creaImageIOMultiThreadImageReader.h
@@ -9,9 +9,13 @@
 #include <wx/thread.h>
 #include <queue>
 
+
+
 namespace creaImageIO
 {
-
+	/**
+	* \ingroup IO
+	*/
   //=====================================================================
   class ThreadedImageReader;
   class MultiThreadImageReader;
@@ -64,6 +68,8 @@ namespace creaImageIO
   //=====================================================================
   /// 
   /// TAKE CARE : For the moment it only supports a **SINGLE USER** 
+
+   ///Class that allows parallel lectures of several images
   class MultiThreadImageReader : public MultiThreadImageReaderUser
   {
   public:
@@ -88,7 +94,8 @@ namespace creaImageIO
 		  int priority );
     
     /// Request the image "filename" immediately 
-    /// (no callback but image returned)
+	/// Blocks until image loaded
+    /// (no user callback but image returned)
     vtkImageData* GetImage(const std::string& filename);
 
     /// 
@@ -98,10 +105,14 @@ namespace creaImageIO
     void OnMultiThreadImageReaderEvent( const std::string& filename,
 					EventType type,
 					vtkImageData* image);
-    
+   
+    /// Function to read attributes for a file 
+	void getAttributes(const std::string filename, std::map <std::string , std::string> &infos, std::vector<std::string> i_attr);
+
   protected:
+	  bool mDone;
     int GetMaximalPriorityWithoutLocking();
-    // 
+    ///Class that represents an image to be loaded
     class ImageToLoad
     {
     public:
@@ -132,6 +143,8 @@ namespace creaImageIO
       int& UnloadIndex() { return mUnloadIndex; }
       vtkImageData* GetImage() const { return mImage; }
       void SetImage( vtkImageData* i ) { mImage=i; }
+
+	  std::map<std::string, std::string> getAttributes(const std::vector<std::string> i_attr);
     private:
       MultiThreadImageReaderUser* mUser;
       std::string mFilename;
@@ -204,7 +217,8 @@ namespace creaImageIO
 		ImageToLoadPtrIndexer> mQueue;
 
     /// The type of list of threaded readers
-    typedef std::vector<ThreadedImageReader*> ThreadedImageReaderListType;
+  	typedef std::vector<boost::shared_ptr<ThreadedImageReader> > ThreadedImageReaderListType;
+	//typedef std::vector<ThreadedImageReader* > ThreadedImageReaderListType;
     ThreadedImageReaderListType mThreadedImageReaderList;
     /// The number of currently running threaded readers
     int mNumberOfThreadedReadersRunning;