From f4171ab3f5bff76f21258d8b2cb7a7da5c94a591 Mon Sep 17 00:00:00 2001
From: guigues <guigues>
Date: Mon, 30 Mar 2009 14:35:03 +0000
Subject: [PATCH] Linux

---
 appli/TestGimmickReaderDialog/main.cxx     |  7 +++++
 src2/creaImageIOMultiThreadImageReader.cpp | 33 ++++++++++++----------
 src2/creaImageIOWxTreeView.cpp             |  2 +-
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/appli/TestGimmickReaderDialog/main.cxx b/appli/TestGimmickReaderDialog/main.cxx
index fc35ca8..d5d3550 100644
--- a/appli/TestGimmickReaderDialog/main.cxx
+++ b/appli/TestGimmickReaderDialog/main.cxx
@@ -1,3 +1,4 @@
+#include <creaImageIOSystem.h>
 #include <creaImageIOGimmickReaderDialog.h>
 
 #include <creaVtkBasicSlicer.h>
@@ -6,6 +7,12 @@
 
 int main(int argc, char* argv[])
 {	
+  if (argc>1)
+    {
+      int l = atoi(argv[1]);
+      creaImageIO::SetGimmickMessageLevel(l);
+    }
+
   std::vector<vtkImageData*> images;
   bool r = creaImageIO::GimmickReaderDialog(images,
 					    "GimmickReaderDialog test",
diff --git a/src2/creaImageIOMultiThreadImageReader.cpp b/src2/creaImageIOMultiThreadImageReader.cpp
index 053f77e..8ec273f 100644
--- a/src2/creaImageIOMultiThreadImageReader.cpp
+++ b/src2/creaImageIOMultiThreadImageReader.cpp
@@ -437,19 +437,34 @@ namespace creaImageIO
 	ImageToLoadPtr unload = mUnloadQueue.remove_top();
 	MultiThreadImageReaderUser* user = unload->GetUser();
 
+	/*
 	if ((user!=0)&&(user!=this)) 
 	  {
 	    user->GetMultiThreadImageReaderUserMutex().Lock();
 	  }
+	*/
 
+	std::string filename = unload->GetFilename();
 
-	GimmickMessage(5,"'" << unload->GetFilename() << "'" << std::endl);
+	GimmickMessage(5,"'" << filename << "'" << std::endl);
 	mTotalMem -= unload->GetImage()->GetEstimatedMemorySize();
 
 	GimmickMessage(5," ==> Total mem = "<<mTotalMem<<" Ko "<<std::endl);
-	
 
-	std::string filename = unload->GetFilename();
+
+	if (user!=0) 
+	  {
+	    //	    std::cout << "unlock..."<<std::endl;
+	    //   user->GetMultiThreadImageReaderUserMutex().Unlock();
+	    //	    std::cout << "event"<<std::endl;
+	    user->MultiThreadImageReaderSendEvent
+	      (filename,
+	       MultiThreadImageReaderUser::ImageUnloaded,
+	       0);
+	    //	    std::cout << "event ok"<<std::endl;
+
+	  }	
+
 	if (unload->Index()>=0)
 	  {
 	    // GimmickMessage(5,"still in queue"<<std::endl);
@@ -466,18 +481,6 @@ namespace creaImageIO
 	delete unload;
 	//	    std::cout << "delete ok."<<std::endl;
 
-	if (user!=0) 
-	  {
-	    //	    std::cout << "unlock..."<<std::endl;
-	    user->GetMultiThreadImageReaderUserMutex().Unlock();
-	    //	    std::cout << "event"<<std::endl;
-	    user->MultiThreadImageReaderSendEvent
-	      (filename,
-	       MultiThreadImageReaderUser::ImageUnloaded,
-	       0);
-	    //	    std::cout << "event ok"<<std::endl;
-
-	  }
       }
     
   
diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 852107b..4b1e5cd 100644
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -551,7 +551,7 @@ namespace creaImageIO
 		{
 		if ( GetCtrl(level) == senderCtrl ) break;
 		}
-		std::string filter = wxGetTextFromUser(_T("Enter the filter to apply"), _T("Filter On Column"));
+		std::string filter = crea::wx2std(wxGetTextFromUser(_T("Enter the filter to apply"), _T("Filter On Column")));
 		
 		std::string att;
 		
-- 
2.45.1