#3320 ReadImages box

[creaImageIO.git] / src / creaImageIOWxSimpleDlg.cpp

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index a537b32aed81577d8345f07fd585b668115e1f27..5ee7649e489a5758ada7efb056ca598e55318b11 100644 (file)
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -37,7 +37,7 @@ namespace creaImageIO
                             wxString i_title,  
                             const std::string i_namedescp , 
                             const std::string i_namedb)
-    : wxDialog(parent, -1,_T("SELECT IMAGE(S)"), wxDefaultPosition, wxSize(230,150))
+    : wxDialog(parent, -1,_T("SELECT IMAGE(S)"), wxDefaultPosition, wxSize(500,300))
    {
                namedescp       = i_namedescp; 
                namedb          = i_namedb;
@@ -47,15 +47,15 @@ namespace creaImageIO
                        this->SetTitle(i_title);  
           }
           // Button to select file(s)
-          wxButton *fileBut = new wxButton(this, -1,_T("Select a single file"), wxPoint(10,7) );
+          wxButton *fileBut = new wxButton(this, -1,_T("Select a single file"), wxPoint(10,10) );
           Connect( fileBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadFile ); 
 
           // Button to select directory
-          wxButton *directoryBut = new wxButton(this, -1,_T("Select all the files in a directory"), wxPoint(10,40) );
+          wxButton *directoryBut = new wxButton(this, -1,_T("Select all the files in a directory"), wxPoint(10,50) );
           Connect( directoryBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadDirectory ); 
 
           // button to select creaImageIO
-          wxButton *gimmickBut = new wxButton(this, -1,_T("Select thru Dicom browser"), wxPoint(10,70) );
+          wxButton *gimmickBut = new wxButton(this, -1,_T("Select thru Dicom browser"), wxPoint(10,90) );
           Connect( gimmickBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadGimmick ); 
 
           /// \TODO  Button to select Bruker directory
@@ -69,7 +69,12 @@ namespace creaImageIO
          void WxSimpleDlg::OnReadFile(wxCommandEvent& event)
          {
                  int resultShowModal;
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
                  wxFileDialog* fileDlg = new wxFileDialog( 0,  _T("Select file"), _T(""), _T(""), crea::std2wx("*"), wxOPEN |wxFD_MULTIPLE, wxDefaultPosition);
+#else
+                 wxFileDialog* fileDlg = new wxFileDialog( 0,  _T("Select file"), _T(""), _T(""), crea::std2wx("*"), wxFD_OPEN |wxFD_MULTIPLE, wxDefaultPosition);
+#endif
     
                    resultShowModal = fileDlg->ShowModal();
                        if ( resultShowModal==wxID_OK )
@@ -79,13 +84,14 @@ namespace creaImageIO
                                if(wxArray.size() >0)
                                {
                                        m_results.clear();
-                                       infoimage=_T("FILE(s):")+wxArray[0];
+                                       infoimage               =       wxArray[0];
+                                       infoimageSource =       _T("FILE(s)");
                                        std::vector<std::string> files;
                                        for( int i = 0; i < wxArray.GetCount(); i++)
                                        {
                                                files.push_back( crea::wx2std(wxArray[i]));
                                        }
-                                       if(!m_view.readFile(files,m_results))
+                                       if( !m_view.readFile(files , m_attrDicomTags , m_resultsDicomAtr , m_results) )
                                        {
                                                //TO DO WARNING MESSAGE;
                                        }
@@ -112,8 +118,9 @@ namespace creaImageIO
                 if ( resultShowModal==wxID_OK )
                 {  
                         m_results.clear();
-                       infoimage=_T("DIRECTORY:")+dirDlg->GetPath();
-                       if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()),m_results))
+                       infoimage               =       dirDlg->GetPath();
+                       infoimageSource =       _T("DIRECTORY");
+                       if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()) , m_attrDicomTags , m_resultsDicomAtr , m_results))
                        {
                                //TO DO WARNING MESSAGE;
                        }
@@ -133,21 +140,19 @@ namespace creaImageIO
                   WxGimmickReaderDialog dlg(0,-1, 
                                   namedescp,
                                   namedb, 
-                                  _T("Select image(s)        - Gimmick! (c) CREATIS-LRMN 2008"),
+                                  _T("Select image(s)        - Gimmick! (c)"),
                    wxDefaultPosition,
                    wxSize(810,750),
                    GIMMICK_2D_IMAGE_SELECTION,
                    GIMMICK_3D_IMAGE_SELECTION,
                    _3D,
-                                  1);
+                                  0);
                 dlg.ShowModal();
                 if (dlg.GetReturnCode() == wxID_OK)
             {
-                               dlg.stopReading();
-
-                               std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
-                               dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
-
+                       dlg.stopReading();
+                       std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
+                       dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
                        m_results.clear();
                        int size=(int)outStrGimmick.size();
                        int ii;
@@ -165,17 +170,26 @@ namespace creaImageIO
 //                             }
 //                     }
 
+                       infoimage               =       _T("EED Missing info <void> ???");
+                       infoimageSource =       _T("GIMMICK");
                        dlg.OnExit();
                 }
                 SetReturnCode( dlg.GetReturnCode() );
                 EndModal( dlg.GetReturnCode() );
           }
 
+//-----------------------------------------------------------------------------   
        wxString WxSimpleDlg::getInfoImage()
        {
                return infoimage;
        }
 
+//-----------------------------------------------------------------------------   
+       wxString WxSimpleDlg::getInfoImageSource()
+       {
+               return infoimageSource;
+       }
+
  //////////////////////////////////////////////////////////////////////
 // Return the results vector                                                                           //
 //////////////////////////////////////////////////////////////////////
@@ -184,17 +198,24 @@ namespace creaImageIO
                  return m_results;
          }
 
+//-----------------------------------------------------------------------------   
        std::vector< std::map<std::string, std::string> >  WxSimpleDlg::getDicomInfoImagesSelected()
        {
                return m_resultsDicomAtr;
        }
 
+//-----------------------------------------------------------------------------   
        void WxSimpleDlg::SetAttrDicomTags( std::vector<std::string> attr )
        {
                m_attrDicomTags=attr;
        }
          
 
+//-----------------------------------------------------------------------------   
+       vtkImageData*  WxSimpleDlg::getVolumeSelected()
+       {
+               return m_view.getVolumeSelected( getImagesSelected() );
+       }
 
-}
+} // namespace creaImageIO