Linux

diff --git a/appli/TestGimmickReaderDialog/main.cxx b/appli/TestGimmickReaderDialog/main.cxx
index fc35ca8a16c521bdf71577437854fffd32cb82ed..d5d355015c6e2e5d2ce374dc32c8635a3970e13e 100644 (file)
--- 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 053f77e32e0d1a6f30815f0f47eee7d8c0951590..8ec273fec3d4350d427d7e07c129964b8a53a052 100644 (file)
--- 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 852107bfcf48ec2c36e518cd58a560794819ac92..4b1e5cd0b097cf4e87b5bff40606c27949c54cbe 100644 (file)
--- 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;