+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+# pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+# This software is governed by the CeCILL-B license under French law and
+# abiding by the rules of distribution of free software. You can use,
+# modify and/ or redistribute the software under the terms of the CeCILL-B
+# license as circulated by CEA, CNRS and INRIA at the following URL
+# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+# or in the file LICENSE.txt.
+#
+# As a counterpart to the access to the source code and rights to copy,
+# modify and redistribute granted by the license, users are provided only
+# with a limited warranty and the software's author, the holder of the
+# economic rights, and the successive licensors have only limited
+# liability.
+#
+# The fact that you are presently reading this means that you have had
+# knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------
+*/
+
+
#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 tag;
std::string line;
- std:string signification;
+ std::string signification;
std::string value;
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;