From: Frederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Date: Wed, 9 Dec 2009 14:35:39 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~76
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=14cf4a18b7517a3f7e86ee3e756043a3431b87db;p=creaImageIO.git

*** empty log message ***
---

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index 04e8c68..615f1f0 100644
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -8,7 +8,10 @@
 #ifndef PATH_MAX // If not defined yet : do it 
 #  define PATH_MAX 2048
 #endif
-
+#include <creaImageIOGimmick.h>
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 
 
 namespace creaImageIO
@@ -29,6 +32,7 @@ namespace creaImageIO
   //==============================================================
   Gimmick::~Gimmick()
   {
+
 	 if(mSettings!=0)
 	  {
 	  	mSettings->writeSettingsFile();
diff --git a/src2/creaImageIOMultiThreadImageReader.cpp b/src2/creaImageIOMultiThreadImageReader.cpp
index 5871d80..1b96fc9 100644
--- a/src2/creaImageIOMultiThreadImageReader.cpp
+++ b/src2/creaImageIOMultiThreadImageReader.cpp
@@ -3,7 +3,10 @@
 #include <wx/utils.h>
 #include <creaImageIOSystem.h>
 
-
+#include <creaImageIOGimmick.h>
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 namespace creaImageIO
 {
 
@@ -61,6 +64,7 @@ namespace creaImageIO
     //    std::cout << "#### MultiThreadImageReader::MultiThreadImageReader("
     //	      << " #threads= " << number_of_threads <<" )"<<std::endl;
 
+	  mDone = false;
     // Create the threads
     for (int i=0; i<number_of_threads; i++) 
       {
@@ -124,6 +128,7 @@ namespace creaImageIO
 //		    std::cout << "#### MultiThreadImageReader::Stop()"
 //    	      <<std::endl;
   //  std::cout << "Sending stop order to the threads..."<<std::endl;
+	  if (mDone) return;
 
     ThreadedImageReaderListType::iterator i;
     for (i =mThreadedImageReaderList.begin();
@@ -172,6 +177,7 @@ namespace creaImageIO
 	delete j->first;
       }
     mImages.clear();
+	mDone = true;
   }
   //=====================================================================
 
diff --git a/src2/creaImageIOMultiThreadImageReader.h b/src2/creaImageIOMultiThreadImageReader.h
index ac18177..c5a9ef9 100644
--- a/src2/creaImageIOMultiThreadImageReader.h
+++ b/src2/creaImageIOMultiThreadImageReader.h
@@ -9,6 +9,8 @@
 #include <wx/thread.h>
 #include <queue>
 
+
+
 namespace creaImageIO
 {
 	/**
@@ -105,6 +107,7 @@ namespace creaImageIO
 					vtkImageData* image);
     
   protected:
+	  bool mDone;
     int GetMaximalPriorityWithoutLocking();
     ///Class that represents an image to be loaded
     class ImageToLoad
diff --git a/src2/creaImageIOWxViewer.cpp b/src2/creaImageIOWxViewer.cpp
index 2ee0ad5..aaa6cf2 100644
--- a/src2/creaImageIOWxViewer.cpp
+++ b/src2/creaImageIOWxViewer.cpp
@@ -12,7 +12,7 @@
 
 
 using namespace crea;
-// Memory tracking allocation
+
 namespace creaImageIO
 {
   
@@ -109,7 +109,6 @@ namespace creaImageIO
 	delete mInteractor;
 	//delete mslide;
 	//delete mflexSizer;
-	//delete mtopSizer;
   }
   //=====================================================================