#include <creaImageIOWxDumpPanel.h>
-#include <creaImageIOSystem.h>
+
#include <creaImageIOGimmick.h>
#include <boost/algorithm/string.hpp>
#if defined(USE_GDCM)
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();
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
DumpText = new wxTextCtrl( this, wxID_ANY,_T(""), wxPoint(5,30), wxSize(520,510), wxTE_READONLY| wxMac | wxTE_MULTILINE | wxTE_RICH );
+#else
+ DumpText = new wxTextCtrl( this, wxID_ANY,_T(""), wxPoint(5,30), wxSize(520,510), wxTE_READONLY | wxTE_MULTILINE | wxTE_RICH );
+#endif
+
Layout();
Print();
}
std::string resultat;
tag = "(" + i_line.substr(0,9) + ")";
- line = i_line.substr(14,i_line.size()-10);
- int pos1 = line.find_first_of("[");
- int pos2 = line.find_first_of("]");
+ line = i_line.substr(14,i_line.size()-10);
+ int pos1 = (int)line.find_first_of("[");
+ int pos2 = (int)line.find_first_of("]");
signification = line.substr(pos1+1, pos2-pos1-1);
line = line.substr(pos2+1);
- pos1 = line.find_first_of("[");
- pos2 = line.find_first_of("]");
+ pos1 = (int)line.find_first_of("[");
+ pos2 = (int)line.find_first_of("]");
value = line.substr(pos1+1, pos2-pos1-1);
resultat = tag + " " + signification + ": " +value;
return resultat;
///////////////////////////////////////////////////
void WxDumpPanel::SaveInfos(wxCommandEvent& event)
{
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
wxFileDialog* FD = new wxFileDialog( 0,_T("Select file"), _T(""), _T(""),
crea::std2wx("*.txt"), wxOPEN, wxDefaultPosition);
+#else
+ wxFileDialog* FD = new wxFileDialog( 0,_T("Select file"), _T(""), _T(""),
+ crea::std2wx("*.txt"), wxFD_OPEN, wxDefaultPosition);
+#endif
if (FD->ShowModal()==wxID_OK)
{
wxBusyCursor busy;