std::string vs wxString

[creaImageIO.git] / src / creaImageIOMultiThreadImageReader.h

diff --git a/src/creaImageIOMultiThreadImageReader.h b/src/creaImageIOMultiThreadImageReader.h
index 3c4da098f2c3141ec156bdd07a9b018afc687bfb..c5a9ef9574081937cf4849933c0eed44409a62da 100644 (file)
--- 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);
 
     /// 
@@ -100,8 +107,9 @@ namespace creaImageIO
                                        vtkImageData* image);
     
   protected:
+         bool mDone;
     int GetMaximalPriorityWithoutLocking();
-    // 
+    ///Class that represents an image to be loaded
     class ImageToLoad
     {
     public:
@@ -204,7 +212,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;