Select Gimmick -> Select thru Dicom browser

[creaImageIO.git] / src / creaImageIOWxSimpleDlg.cpp

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index 4ddff91c40a516c7ee0f934078eb494794c918fe..43e2ac115639bd342fa4e15cadf30edea3fe5feb 100644 (file)
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -19,7 +19,7 @@ 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 to display"), wxPoint(10,7) );
           Connect( fileBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadFile ); 
 
           // Button to select directory
@@ -27,7 +27,7 @@ namespace creaImageIO
           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
@@ -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,15 +113,17 @@ 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;
 //                             attr.push_back("D0028_0010");
 //                             attr.push_back("D0008_0023");
 //                             attr.push_back("D0008_1070");
-                               w.getSelected(out, attr,true,"");
+                               dlg.stopReading();
+                               dlg.getSelected(out, attr,true,"");
 //                             crea::VtkBasicSlicer(out.front().img);
-                       m_results->clean();
+                       m_results.clear();
                        int size=out.size();
                        int ii;
                        for (ii=0;ii<size;ii++)
@@ -136,6 +138,11 @@ namespace creaImageIO
                 EndModal( dlg.GetReturnCode() );
           }
 
+       wxString WxSimpleDlg::getInfoImage()
+       {
+               return infoimage;
+       }
+
  //////////////////////////////////////////////////////////////////////
 // Return the results vector                                                                           //
 //////////////////////////////////////////////////////////////////////