]> Creatis software - creaImageIO.git/commitdiff
*** empty log message ***
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Wed, 1 Sep 2010 23:11:41 +0000 (23:11 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Wed, 1 Sep 2010 23:11:41 +0000 (23:11 +0000)
src/creaImageIOWxSimpleDlg.cpp
src/creaImageIOWxSimpleDlg.h

index f1e75e878310db778177fc220e1992aaf556b4d8..4b5180ae81c8befe3a0a7403353dbd58d4c5a333 100644 (file)
@@ -50,6 +50,7 @@ namespace creaImageIO
                                fileDlg->GetPaths(wxArray);
                                if(wxArray.size() >0)
                                {
+                                       infoimage=_T("FILE(s):")+wxArray[0];
                                        std::vector<std::string> files;
                                        for( int i = 0; i < wxArray.GetCount(); i++)
                                        {
@@ -59,9 +60,7 @@ namespace creaImageIO
                                        {
                                                //TO DO WARNING MESSAGE;
                                        }
-                               }
-                               else
-                               {
+                               } else {
                                        // TO DO WARNING MESSAGES
                                }
                        }
@@ -83,6 +82,7 @@ namespace creaImageIO
                 resultShowModal = dirDlg->ShowModal();
                 if ( resultShowModal==wxID_OK )
                 {  
+                       infoimage=_T("DIRECTORY:")+dirDlg->GetPath();
                        if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()),m_results))
                        {
                                //TO DO WARNING MESSAGE;
@@ -113,6 +113,7 @@ namespace creaImageIO
                 dlg.ShowModal();
                 if (dlg.GetReturnCode() == wxID_OK)
             {
+                       infoimage=_T("DICOM: ???_EED_???");
 //EED 07JUIN2010                       dlg.GetSelectedImages(m_results,3);
                        std::vector<creaImageIO::OutStrGimmick> out;
                        std::vector<std::string> attr;
@@ -136,6 +137,11 @@ namespace creaImageIO
                 EndModal( dlg.GetReturnCode() );
           }
 
+       wxString WxSimpleDlg::getInfoImage()
+       {
+               return infoimage;
+       }
+
  //////////////////////////////////////////////////////////////////////
 // Return the results vector                                                                           //
 //////////////////////////////////////////////////////////////////////
index 617b87f9b7eda44c956de9345ea47d64632da7c1..5c16190d83689e1a4bd553ef498cbce2efe784d7 100644 (file)
@@ -31,11 +31,14 @@ namespace creaImageIO
 
                   /// return a vtkImageData vector of selected images, if available
                   std::vector<vtkImageData*> getImagesSelected();
+               
+                  wxString getInfoImage();
 
        private:
 
                std::string namedescp; 
                std::string namedb;
+               wxString infoimage;
 
                /// interface to read data
                SimpleView m_view;