From: jean-pierre roux Date: Tue, 26 Jan 2010 14:17:55 +0000 (+0000) Subject: \ No newline at end of file X-Git-Tag: CREATOOLS.2-0-3~59 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaImageIO.git;a=commitdiff_plain;h=6e3e61bdc9f4f55589659db36c34dd71083aec3a \ No newline at end of file --- diff --git a/src2/creaImageIOWxDumpPanel.cpp b/src2/creaImageIOWxDumpPanel.cpp index 6e0ae15..1d1a376 100644 --- a/src2/creaImageIOWxDumpPanel.cpp +++ b/src2/creaImageIOWxDumpPanel.cpp @@ -11,20 +11,20 @@ namespace creaImageIO { // CTor - WxDumpPanel::WxDumpPanel(wxWindow *parent, std::string i_filename) + WxDumpPanel::WxDumpPanel(wxWindow *parent, std::string i_filename) : wxDialog(parent, -1,_T("DICOM TAGS"), wxDefaultPosition, wxSize(550,580)), filename(i_filename) { - int size = 16; - mIcon = new wxImageList(size,size,true); - mIcon->Add(wxBitmap(wxBitmap(wxIcon(save_xpm)).ConvertToImage().Rescale(size, size))); - wxToolBar *mToolBar = new wxToolBar(this,-1,wxDefaultPosition,wxDefaultSize); - mToolBar->AddTool( DUMP_SAVE_ID,_T("Save"), mIcon->GetBitmap(0), _T("Save Dicom Tags in text file")); - mToolBar->Realize(); - DumpText = new wxTextCtrl( this, wxID_ANY,_T(""), wxPoint(5,30), wxSize(520,510), wxTE_READONLY| wxMac | wxTE_MULTILINE | wxTE_RICH ); - Layout(); - Print(); + int size = 16; + mIcon = new wxImageList(size,size,true); + mIcon->Add(wxBitmap(wxBitmap(wxIcon(save_xpm)).ConvertToImage().Rescale(size, size))); + wxToolBar *mToolBar = new wxToolBar(this,-1,wxDefaultPosition,wxDefaultSize); + mToolBar->AddTool( DUMP_SAVE_ID,_T("Save"), mIcon->GetBitmap(0), _T("Save Dicom Tags in text file")); + mToolBar->Realize(); + DumpText = new wxTextCtrl( this, wxID_ANY,_T(""), wxPoint(5,30), wxSize(520,510), wxTE_READONLY| wxMac | wxTE_MULTILINE | wxTE_RICH ); + Layout(); + Print(); } - + // DTor WxDumpPanel::~WxDumpPanel(){} @@ -33,8 +33,8 @@ namespace creaImageIO /////////////////////////////////////////////////// void WxDumpPanel::Print() { - std::stringstream os; - if ( !filename.empty()) // ====== Deal with a single file ====== + std::stringstream os; + if ( !filename.empty()) // ====== Deal with a single file ====== { GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New(); f->SetLoadMode(GDCM_NAME_SPACE::LD_ALL); @@ -52,7 +52,6 @@ namespace creaImageIO result += "\n"; } DumpText->SetValue(crea::std2wx(result)); - } } @@ -61,7 +60,7 @@ namespace creaImageIO /////////////////////////////////////////////////// void WxDumpPanel::SaveInfos(wxCommandEvent& event) { - wxFileDialog* FD = new wxFileDialog( 0,_T("Select file"), _T(""), _T(""), + wxFileDialog* FD = new wxFileDialog( 0,_T("Select file"), _T(""), _T(""), crea::std2wx("*.txt"), wxOPEN, wxDefaultPosition); if (FD->ShowModal()==wxID_OK) { @@ -74,10 +73,10 @@ namespace creaImageIO Close(); } - //////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////// BEGIN_EVENT_TABLE(WxDumpPanel, wxDialog) EVT_TOOL(DUMP_SAVE_ID, WxDumpPanel::SaveInfos) END_EVENT_TABLE() -} \ No newline at end of file +} + diff --git a/src2/creaImageIOWxExportDlg.cpp b/src2/creaImageIOWxExportDlg.cpp index c2e06e8..682cc89 100644 --- a/src2/creaImageIOWxExportDlg.cpp +++ b/src2/creaImageIOWxExportDlg.cpp @@ -3,7 +3,7 @@ namespace creaImageIO { // CTor - WxExportDlg::WxExportDlg(wxWindow *parent, const std::vector storages) + WxExportDlg::WxExportDlg(wxWindow *parent, const std::vector storages) : wxDialog(parent, -1,_T("EXPORT FILES TO STORAGE"), wxDefaultPosition, wxSize(260,150)) { int size = 16; @@ -30,13 +30,10 @@ namespace creaImageIO WxExportDlg::~WxExportDlg(){} - void WxExportDlg::OnOk(wxCommandEvent &event) { m_name = crea::wx2std(ExportCombo->GetValue()); Close(); SetReturnCode(ID_EXPORT_OK); - } - - -} \ No newline at end of file + } +}