acces to DICOM infos from GIMMICK

[creaImageIO.git] / src / creaImageIOWxSimpleDlg.cpp

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index afe11168d2d7b915a1d0375df93983512a83a75b..072e9e796a7a844a10e0a3bf9fbded8bdd559edb 100644 (file)
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -1,8 +1,5 @@
 #include "creaImageIOWxSimpleDlg.h"
-#include "creaImageIOWxGimmickReaderDialog.h"
-//#include <itkAnalyzeImageIO.h>
-//#include <itkImageFileReader.h>
-//#include <itkImage.h>
+
 
 namespace creaImageIO
 {
@@ -10,10 +7,10 @@ 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;
@@ -23,11 +20,11 @@ namespace creaImageIO
                        this->SetTitle(i_title);  
           }
           // Button to select file(s)
-          wxButton *fileBut = new wxButton(this, -1,_T("Select a single 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
@@ -35,7 +32,7 @@ namespace creaImageIO
           Connect( gimmickBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadGimmick ); 
 
           /// \TODO  Button to select Bruker directory
-       
+          bInfo = false;
        Layout(); 
        
        }
@@ -54,8 +51,6 @@ namespace creaImageIO
                                fileDlg->GetPaths(wxArray);
                                if(wxArray.size() >0)
                                {
-                               /*      typedef itk::Image< float, 4 >         ImageType;
-                                       ReadImage<ImageType>(crea::wx2std(wxArray[0]).c_str());*/
 
                                        infoimage=_T("FILE(s):")+wxArray[0];
                                        std::vector<std::string> files;
@@ -120,28 +115,30 @@ 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");
                                dlg.stopReading();
                                dlg.getSelected(out, attr,true,"");
-//                             crea::VtkBasicSlicer(out.front().img);
                        m_results.clear();
                        int size=out.size();
                        int ii;
-                       for (ii=0;ii<size;ii++)
+                       if(!bInfo)
                        {
-                               m_results.push_back(out[ii].img);
+                               for (ii=0;ii<size;ii++)
+                               {
+                                       m_results.push_back(out[ii].img);
+                               }
+                       }
+                       else
+                       {
+                               for (ii=0;ii<size;ii++)
+                               {
+                                       m_resultsInfo.push_back(out[ii]);
+                               }
                        }
-
                        dlg.OnExit();
                 }
                 SetReturnCode( dlg.GetReturnCode() );
-//              Close();
                 EndModal( dlg.GetReturnCode() );
           }