]> Creatis software - creaImageIO.git/commitdiff
#2854 creaImageIO Feature New Normal - creaImageIOWxSimpleDlg add infoImageSource...
authorEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Wed, 24 Feb 2016 20:36:38 +0000 (21:36 +0100)
committerEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Wed, 24 Feb 2016 20:36:38 +0000 (21:36 +0100)
src/creaImageIOWxSimpleDlg.cpp
src/creaImageIOWxSimpleDlg.h

index e750b912c185811e58608c261985f64daf97fee4..ca984309b7eaf5d5e5cb27d8f3110c929317dd28 100644 (file)
@@ -79,7 +79,8 @@ 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++)
                                        {
@@ -112,7 +113,8 @@ namespace creaImageIO
                 if ( resultShowModal==wxID_OK )
                 {  
                         m_results.clear();
-                       infoimage=_T("DIRECTORY:")+dirDlg->GetPath();
+                       infoimage               =       dirDlg->GetPath();
+                       infoimageSource =       _T("DIRECTORY");
                        if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()) , m_attrDicomTags , m_resultsDicomAtr , m_results))
                        {
                                //TO DO WARNING MESSAGE;
@@ -165,6 +167,9 @@ namespace creaImageIO
 //                             }
 //                     }
 
+                       infoimage               =       _T("EED Missing info <void> ???");
+                       infoimageSource =       _T("GIMMICK");
+
                        dlg.OnExit();
                 }
                 SetReturnCode( dlg.GetReturnCode() );
@@ -177,6 +182,12 @@ namespace creaImageIO
                return infoimage;
        }
 
+//-----------------------------------------------------------------------------   
+       wxString WxSimpleDlg::getInfoImageSource()
+       {
+               return infoimageSource;
+       }
+
  //////////////////////////////////////////////////////////////////////
 // Return the results vector                                                                           //
 //////////////////////////////////////////////////////////////////////
index f5723731a23b89bccb14f92e30a4aeefc8e4e389..777836eb8714339c33f0c2a18ca8a4236d598a6c 100644 (file)
@@ -61,6 +61,7 @@ namespace creaImageIO
                   vtkImageData* getVolumeSelected();
 
                   wxString getInfoImage();
+                  wxString getInfoImageSource();
 
                   std::vector< std::map<std::string,std::string> >  getDicomInfoImagesSelected();
                   void SetAttrDicomTags( std::vector<std::string> attr );
@@ -78,6 +79,7 @@ namespace creaImageIO
                std::string                                             namedescp; 
                std::string                                             namedb;
                wxString                                                infoimage;
+               wxString                                                infoimageSource;
 
                /// interface to read data
                SimpleView                                              m_view;