#3208 creaImageIO Feature New Normal - branch mingw64

diff --git a/src/creaImageIOGimmick.cpp b/src/creaImageIOGimmick.cpp
index b04f3ac103765bbeb0f25b6be17c91f9b68cf21a..1ec42e1fce32341d40eafd9a5e1dc4d21b1f8fb0 100644 (file)
--- a/src/creaImageIOGimmick.cpp
+++ b/src/creaImageIOGimmick.cpp
@@ -213,18 +213,14 @@ namespace creaImageIO
   //================================================================
   const std::string& Gimmick::GetUserSettingsDirectory()
   {
-         printf("EED Gimmick::GetUserSettingsDirectory() Start\n");
     if (mUserSettingsDirectory.size()==0) 
       {
-         printf("EED Gimmick::GetUserSettingsDirectory() 1\n");
        mUserSettingsDirectory = GetHomeDirectory();
-         printf("EED Gimmick::GetUserSettingsDirectory() 2 %s\n",mUserSettingsDirectory.c_str());
        mUserSettingsDirectory += "/.creaImageIO/";
        boost::algorithm::replace_all( mUserSettingsDirectory, 
                                       INVALID_FILE_SEPARATOR , 
                                       VALID_FILE_SEPARATOR);
       }
-         printf("EED Gimmick::GetUserSettingsDirectory() End\n");
     return mUserSettingsDirectory;
   }
   //================================================================

diff --git a/src/creaImageIOGimmickView.cpp b/src/creaImageIOGimmickView.cpp
index c9965637106f259cf1e00d943f5508248b711077..0a0dd0c13c18a557ff2cacf2c336472476f3e19b 100644 (file)
--- a/src/creaImageIOGimmickView.cpp
+++ b/src/creaImageIOGimmickView.cpp
@@ -36,8 +36,11 @@
 #include <gdcmFileHelper.h>
 #include <gdcmUtil.h>
 #include <vtkGdcmReader.h>
+
 #endif
 
+#include <vtkMetaImageWriter.h>
+
 /*#if defined(USE_GDCM2)
 #include <vtkGDCMImageReader.h>
 #include "gdcmSystem.h"
@@ -496,29 +499,16 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
        void GimmickView::readImages1(std::vector<OutStrGimmick>& o_output, std::vector<std::string> im,
                         OutputAttr i_attr)
        {
-
                i_attr.outside.push_back("D0019_100a");  // simens Number Of Images In Mosaic
-
-//EED Borrame
-               int i,isize=i_attr.outside.size();
-               for (i=0;i<isize;i++)
-               {
-               printf("EED GimmickView::readImages1 A  i_attr out %s \n", i_attr.outside[i].c_str());
-               }
-
-
-
                std::vector<std::string>::iterator it;
                for (it=im.begin(); it!=im.end(); ++it)
                {
                        OutStrGimmick out;
                        out.img = vtkImageData::New();
                        out.img->ShallowCopy(mReader.GetImage(*it));
-printf("EED GimmickView::readImages1 A\n ");
                        if(i_attr.mult) 
                        {
                                getAttributes((*it),out.infos,i_attr);
-printf("EED GimmickView::readImages1 B   %s \n ", out.infos.find("D0019_100a")->second.c_str() );                              
                        }
                        o_output.push_back(out);
                }
@@ -526,7 +516,6 @@ printf("EED GimmickView::readImages1 B   %s \n ", out.infos.find("D0019_100a")->
                if(!i_attr.mult)
                {
                        getAttributes(im.front(), o_output.front().infos, i_attr);
-printf("EED GimmickView::readImages1 C   %s \n ", o_output.front().infos.find("D0019_100a")->second.c_str() );
                }
                
        }
@@ -589,6 +578,7 @@ printf("EED GimmickView::readImages1 C   %s \n ", o_output.front().infos.find("D
                        memcpy(out.img->GetScalarPointer(0,0,slice), cur->GetScalarPointer(0,0,0), imsize);
                        slice++;
                }       
+               
                getAttributes(im.front(),out.infos, i_attr);
                o_output.push_back(out);
        }

diff --git a/src/creaImageIOMultiThreadImageReader.cpp b/src/creaImageIOMultiThreadImageReader.cpp
index 96ba90b4a03afcbc9c8822e01a39339c5caa92a3..1679136d3c239fdd7573e51f4d194b942aae21f6 100644 (file)
--- a/src/creaImageIOMultiThreadImageReader.cpp
+++ b/src/creaImageIOMultiThreadImageReader.cpp
@@ -119,7 +119,6 @@ namespace creaImageIO
   //=====================================================================
   bool MultiThreadImageReader::Start()
   {
-
     //    std::cout << "#### MultiThreadImageReader::Start()"
     //               <<std::endl;
          if (mNumberOfThreadedReadersRunning > 0) return true;

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index c538c6a844ba183dd1b9a2f233439ec0fd21f4ce..46e2507c5e5ce23992ebbd14f521ea7e9125119f 100644 (file)
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -708,7 +708,11 @@ namespace creaImageIO
       {
                  ClearSelection();
       }*/
-       ReadImageThreaded(sel);
+         
+  printf("EED Warnning WxGimmickView::OnSelectionChange ....... To avoid threads conflicts//ReadImageThreaded(sel)\n ");
+//EED1 ReadImageThreaded(sel);
+
+
    }
 
   //==================================================

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index 297ac110ea7a69d75c5cd0174c8e2dfbe0aeff31..eb9882edfa8ca568fbd62d33c3c4222391e88150 100644 (file)
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -150,7 +150,7 @@ namespace creaImageIO
                 dlg.ShowModal();
                 if (dlg.GetReturnCode() == wxID_OK)
             {
-                               dlg.stopReading();
+//EED1                         dlg.stopReading();
 
                                std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
                                dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
@@ -162,6 +162,7 @@ namespace creaImageIO
 //                     {
                                for (ii=0;ii<size;ii++)
                                {
+printf("EED1 WxSimpleDlg::OnReadGimmick %d \n", ii);
                                        m_results.push_back(outStrGimmick[ii].img);
                                        m_resultsDicomAtr.push_back( outStrGimmick[ii].infos );
                                }