X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FcreaImageIOGimmickView.h;h=c34f895d08d89e09ef8b3d7efea894272f7bd177;hb=3213e0d7adb70f52d723a5b7065f4780b6c9e451;hp=7a0e839340e3a9c0a5b97b30b5e1604982aa9214;hpb=bf3660569b1baa8be10fc708f595efc66afe3334;p=creaImageIO.git

diff --git a/src/creaImageIOGimmickView.h b/src/creaImageIOGimmickView.h
index 7a0e839..c34f895 100644
--- a/src/creaImageIOGimmickView.h
+++ b/src/creaImageIOGimmickView.h
@@ -8,7 +8,14 @@
 
 //#include <map>
 #include <vtkImageData.h>
+#if defined (USE_WXWIDGETS)
 #include <creaImageIOMultiThreadImageReader.h>
+#endif
+
+#if defined(USE_QT4)
+#include <creaImageIOQMultiThreadImageReader.h>
+#endif
+
 
 // Signal/slot mechanism for progress events
 #include <boost/signal.hpp>
@@ -25,12 +32,14 @@
 
 namespace creaImageIO
 {
+        typedef std::map<std::string, std::string> mapInfoDicom;
 
 	typedef struct 
 	{ 
 		vtkImageData *img;
-		std::map<std::string, std::string> infos;
-	}OutStrGimmick;
+		//std::map<std::string, std::string> infos;
+		mapInfoDicom infos; 
+	} OutStrGimmick;
 
 
 	/**
@@ -81,8 +90,8 @@ namespace creaImageIO
       virtual void GetSelectedFiles(std::vector<std::string>& s)
       { GimmickError("INTERNAL ERROR : GetSelectedFiles not implemented"); }
 
-	  virtual void GetImages(int dim, std::vector<std::string> files, std::vector<vtkImageData*>& s) 
-	  { GimmickError("INTERNAL ERROR : GetImages not implemented"); }
+      virtual void GetImages(int dim, std::vector<std::string> files, std::vector<vtkImageData*>& s) 
+      { GimmickError("INTERNAL ERROR : GetImages not implemented"); }
 
       virtual void OnSelectionChange(const std::vector<tree::Node*>& s, bool isSelection, int selection, bool mProcess)
       { GimmickError("INTERNAL ERROR : OnSelectionChange not implemented"); }
@@ -187,6 +196,8 @@ namespace creaImageIO
 	void readImages(std::vector<OutStrGimmick>& o_output, std::vector<std::string> im,
 			 OutputAttr i_attr, int i_dim, double i_zspc);
 			bool isSingle(const std::string i_file);
+
+	void stopReader();
     private: