]> Creatis software - creaImageIO.git/commitdiff
#3218 creaImageIO Feature New Normal - vtk8itk4wx3-mingw64
authorEduardo DAVILA <davila@creatis.insa-lyon.fr>
Tue, 7 Aug 2018 14:11:56 +0000 (16:11 +0200)
committerEduardo DAVILA <davila@creatis.insa-lyon.fr>
Tue, 7 Aug 2018 14:11:56 +0000 (16:11 +0200)
1  2 
src/creaImageIOGimmick.cpp
src/creaImageIOWxGimmickReaderDialog.cpp
src/creaImageIOWxGimmickView.cpp
src/creaImageIOWxSimpleDlg.cpp

Simple merge
index 1dff6b3fd0246dd09fa8e90d14a8012aec7dca2a,771bb052998e90da9d38add2825764590a4badfd..8c11f0319a84b8ee12eb9e3f694ab343d8e39521
@@@ -78,9 -78,10 +78,9 @@@ namespace creaImageI
                                min_dim,
                                max_dim,
                                threads);
-       mView->Initialize();
+               mView->Initialize();
           // Connect the AddProgress callback
 -              mView->ConnectValidationObserver
 -                      ( boost::bind( &WxGimmickReaderDialog::OnValid , this, _1 ) );
 +      mView->ConnectValidationObserver( boost::bind( &WxGimmickReaderDialog::OnValid , this, _1 ) );
      }
      catch (crea::Exception e)
      {
Simple merge
index eb9882edfa8ca568fbd62d33c3c4222391e88150,1c076b0d4a0d0bc4fd733543fd22f1e8f6ea3a3a..88cf78408d8102f8320c4e59b703f5866bf73c34
@@@ -150,11 -145,9 +150,7 @@@ namespace creaImageI
                 dlg.ShowModal();
                 if (dlg.GetReturnCode() == wxID_OK)
             {
 -                      dlg.stopReading();
 -                      std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
 -                      dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
 +//EED1                                dlg.stopReading();
-                               std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
-                               dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
                        m_results.clear();
                        int size=(int)outStrGimmick.size();
                        int ii;
  //                    {
                                for (ii=0;ii<size;ii++)
                                {
- printf("EED1 WxSimpleDlg::OnReadGimmick %d \n", ii);
 -                                      outStrGimmick[ii].img->Modified();
 -                                      outStrGimmick[ii].img->Update();
                                        m_results.push_back(outStrGimmick[ii].img);
                                        m_resultsDicomAtr.push_back( outStrGimmick[ii].infos );
                                }