X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOMultiThreadImageReader.h;h=01d91c508566dcbcde755b6b182b7c9f6d57a91f;hb=refs%2Fheads%2Fvtk8itk5wx3-macos;hp=3c4da098f2c3141ec156bdd07a9b018afc687bfb;hpb=684add23b4f64cb3c6e39e12a4af20d2c2500df6;p=creaImageIO.git

diff --git a/src/creaImageIOMultiThreadImageReader.h b/src/creaImageIOMultiThreadImageReader.h
index 3c4da09..01d91c5 100644
--- a/src/creaImageIOMultiThreadImageReader.h
+++ b/src/creaImageIOMultiThreadImageReader.h
@@ -1,3 +1,30 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------
+*/
+
 #ifndef __creaImageIOThreadedImageReader_h_INCLUDED__
 #define __creaImageIOThreadedImageReader_h_INCLUDED__
 
@@ -9,9 +36,13 @@
 #include <wx/thread.h>
 #include <queue>
 
+
+
 namespace creaImageIO
 {
-
+	/**
+	* \ingroup IO
+	*/
   //=====================================================================
   class ThreadedImageReader;
   class MultiThreadImageReader;
@@ -64,6 +95,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 +121,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 +132,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:
@@ -113,16 +151,18 @@ namespace creaImageIO
 	  mPriority(prio), 
 	  mIndex(-1), 
 	  mUnloadIndex(-1), 
-	  mImage(0)
+	  mImage(NULL)
       {}
+	  
       ~ImageToLoad()
       {
-	if (mImage>0) 
-	  {
-	    //	    std::cout << "Refs = "<<mImage->GetReferenceCount()<<std::endl;
-	    mImage->Delete();
-	  }
+		if (mImage != NULL) 
+		{
+			//	    std::cout << "Refs = "<<mImage->GetReferenceCount()<<std::endl;
+			mImage->Delete();
+		} // if
       }
+	  
       MultiThreadImageReaderUser* GetUser() const { return mUser; }
       void SetUser( MultiThreadImageReaderUser* u ) { mUser = u; }
       const std::string& GetFilename() const { return mFilename; }
@@ -132,18 +172,20 @@ 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;
-      int mPriority;
-      int mIndex;
-      int mUnloadIndex;
-      vtkImageData* mImage;
+      MultiThreadImageReaderUser	*mUser;
+      std::string 					mFilename;
+      int 							mPriority;
+      int 							mIndex;
+      int 							mUnloadIndex;
+      vtkImageData					*mImage;
     };
     // 
 
     /// Type of pointer on an ImageToLoad struct
-    typedef ImageToLoad* ImageToLoadPtr;
+    typedef ImageToLoad	*ImageToLoadPtr;
 
     /// ImageToLoadPtr comparator on priority (for image queue)
     struct ImageToLoadPtrPriorityComparator
@@ -188,10 +230,13 @@ namespace creaImageIO
 
     /// The callback from threaded readers when an image is read
     void SignalImageRead(ImageToLoadPtr p, bool purge);
-  
+
+	void CleanMImagesMap();
+
+
+	
     /// The type of map of images 
-    typedef std::map<ImageToLoadPtr,vtkImageData*,
-		     ImageToLoadPtrFilenameComparator> ImageMapType;
+    typedef std::map<ImageToLoadPtr,vtkImageData*,   ImageToLoadPtrFilenameComparator> ImageMapType;
     /// The map of images
     ImageMapType mImages;
     /// Comparator for the image to load queue
@@ -204,7 +249,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;