acces to DICOM infos from GIMMICK

[creaImageIO.git] / src / creaImageIOWxSimpleDlg.cpp

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index 4ddff91c40a516c7ee0f934078eb494794c918fe..072e9e796a7a844a10e0a3bf9fbded8bdd559edb 100644 (file)
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -1,15 +1,16 @@
 #include "creaImageIOWxSimpleDlg.h"
-#include "creaImageIOWxGimmickReaderDialog.h"
+
 
 namespace creaImageIO
 {
 
+
        ///Ctor
    WxSimpleDlg::WxSimpleDlg(wxWindow *parent, 
-                                                       wxString i_title,  
-                                                       const std::string i_namedescp , 
-                                                       const std::string i_namedb)
-    : wxDialog(parent, -1,_T("DISPLAY IMAGES"), wxDefaultPosition, wxSize(230,150))
+                            wxString i_title,  
+                            const std::string i_namedescp , 
+                            const std::string i_namedb)
+    : wxDialog(parent, -1,_T("SELECT IMAGE(S)"), wxDefaultPosition, wxSize(230,150))
    {
                namedescp       = i_namedescp; 
                namedb          = i_namedb;
@@ -19,19 +20,19 @@ namespace creaImageIO
                        this->SetTitle(i_title);  
           }
           // Button to select file(s)
-          wxButton *fileBut = new wxButton(this, -1,_T("Select a file to display"), wxPoint(10,7) );
+          wxButton *fileBut = new wxButton(this, -1,_T("Select a single file"), wxPoint(10,7) );
           Connect( fileBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadFile ); 
 
           // Button to select directory
-          wxButton *directoryBut = new wxButton(this, -1,_T("Select a directory to display"), wxPoint(10,40) );
+          wxButton *directoryBut = new wxButton(this, -1,_T("Select all the files in a directory"), wxPoint(10,40) );
           Connect( directoryBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadDirectory ); 
 
           // button to select creaImageIO
-          wxButton *gimmickBut = new wxButton(this, -1,_T("Select Gimmick"), wxPoint(10,70) );
+          wxButton *gimmickBut = new wxButton(this, -1,_T("Select thru Dicom browser"), wxPoint(10,70) );
           Connect( gimmickBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadGimmick ); 
 
           /// \TODO  Button to select Bruker directory
-       
+          bInfo = false;
        Layout(); 
        
        }
@@ -50,6 +51,8 @@ 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 +62,7 @@ namespace creaImageIO
                                        {
                                                //TO DO WARNING MESSAGE;
                                        }
-                               }
-                               else
-                               {
+                               } else {
                                        // TO DO WARNING MESSAGES
                                }
                        }
@@ -83,6 +84,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,29 +115,38 @@ namespace creaImageIO
                 dlg.ShowModal();
                 if (dlg.GetReturnCode() == wxID_OK)
             {
-//EED 07JUIN2010                       dlg.GetSelectedImages(m_results,3);
                        std::vector<creaImageIO::OutStrGimmick> out;
                        std::vector<std::string> attr;
-//                             attr.push_back("D0028_0010");
-//                             attr.push_back("D0008_0023");
-//                             attr.push_back("D0008_1070");
-                               w.getSelected(out, attr,true,"");
-//                             crea::VtkBasicSlicer(out.front().img);
-                       m_results->clean();
+                               dlg.stopReading();
+                               dlg.getSelected(out, attr,true,"");
+                       m_results.clear();
                        int size=out.size();
                        int ii;
-                       for (ii=0;ii<size;ii++)
+                       if(!bInfo)
+                       {
+                               for (ii=0;ii<size;ii++)
+                               {
+                                       m_results.push_back(out[ii].img);
+                               }
+                       }
+                       else
                        {
-                               m_results.push_back(out[ii].img);
+                               for (ii=0;ii<size;ii++)
+                               {
+                                       m_resultsInfo.push_back(out[ii]);
+                               }
                        }
-
                        dlg.OnExit();
                 }
                 SetReturnCode( dlg.GetReturnCode() );
-//              Close();
                 EndModal( dlg.GetReturnCode() );
           }
 
+       wxString WxSimpleDlg::getInfoImage()
+       {
+               return infoimage;
+       }
+
  //////////////////////////////////////////////////////////////////////
 // Return the results vector                                                                           //
 //////////////////////////////////////////////////////////////////////