SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/Shared/gimmick)
ELSE (WIN32)
SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src2/data)
- SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/Shared/gimmick)
+ SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/share/gimmick)
ENDIF (WIN32)
CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})
if ( ( gr!=0 ) && ( el!=0 ) )
{
gdcm::DataElement de( gdcm::Tag(gr,el) );
- std::string val = GetStringValueFromTag(reader.GetFile().GetHeader().GetDataElement(gdcm::Tag(gr,el)));
+ std::string val = GetStringValueFromTag(reader.GetFile().GetDataSet().GetDataElement(gdcm::Tag(gr,el)));
i->second = irclean(val);
}
}
// The following stuff works on Linux, NOT CHECKED on Windows // JPR
#if defined(_WIN32)
- path+="/bin/share/gimmick/";
+ path+="/bin/Shared/gimmick/";
#endif
#if defined (LINUX)
#if defined(USE_GDCM2)
// Retrieve the name from gdcm dict
- gdcm::Dicts dicts;
- gdcm::DictEntry dictentry = dicts.GetDictEntry(gdcm::Tag(mGroup, mElement));
+ const gdcm::Global& g = gdcm::Global::GetInstance();
+ const gdcm::Dicts &dicts = g.GetDicts();
+ const gdcm::Dict &dict = dicts.GetPublicDict();
+ gdcm::DictEntry dictentry = dict.GetDictEntry(gdcm::Tag(mGroup, mElement));
mName = dictentry.GetName();
if(!mName.empty())
}
#endif
#if defined(USE_GDCM2)
- const gdcm::Global& g = gdcm::Global::GetInstance(); // sum of all knowledge !
+ const gdcm::Global& g = gdcm::Global::GetInstance();
const gdcm::Dicts &dicts = g.GetDicts();
- const gdcm::Dict &dict = dicts.GetPublicDict(); // Part 6
-
+ const gdcm::Dict &dict = dicts.GetPublicDict();
if(mGroup != 0 && mElement != 0)
{
gdcm::DictEntry dictentry = dict.GetDictEntry(gdcm::Tag(GetGroup(), GetElement()));
#include <gdcmGlobal.h>
#include <gdcmDictSet.h>
#endif
-#include <boost/algorithm/string.hpp>
+#if defined(USE_GDCM2)
+#include <gdcmGlobal.h>
+#include <gdcmDicts.h>
+#include <gdcmDict.h>
+#endif
#include <boost/algorithm/string.hpp>
namespace creaImageIO
{
std::ifstream i_file(i_name.c_str());
std::stringstream buffer;
- buffer << i_file.rdbuf();
- std::string line;
- std::string level;
+ buffer << i_file.rdbuf();
+ std::string line;
+ std::string level;
+
+#if defined(USE_GDCM2)
+ const gdcm::Global& g = gdcm::Global::GetInstance(); // sum of all knowledge !
+ const gdcm::Dicts &dicts = g.GetDicts();
+ const gdcm::Dict &dict = dicts.GetPublicDict(); // Part 6
+#endif
+
bool bname;
int ilevel = -1;
{
onAddAttribute( entry->GetName(),compose, level);
}
+#endif
+
+#if defined(USE_GDCM2)
+ gdcm::DictEntry dictentry = dict.GetDictEntry(gdcm::Tag(group, element));
+ if(ilevel>0)
+ {
+ onAddAttribute( dictentry.GetName(),compose, level);
+ }
+
+
#endif
}
else if(descriptors[0].find("#") != -1)
{
mGimmick->Finalize();
}
-
+ deleteMessage();
}
+void WxGimmickReaderDialog::deleteMessage()
+ {
+ deleteGimmickDebugMessage();
+ };
///Callback method on a selection
void WxGimmickReaderDialog::OnValid(bool t)
{
#ifdef USE_WXWIDGETS
#include <creaImageIOWxGimmickView.h>
+#include "creaImageIOSystem.h"
#include <creaWx.h>
#include "wx/wx.h"
namespace creaImageIO
void OnMenuTest(wxCommandEvent& event);
void OnValid(bool valid);
void OnExit(){ mView->StopPlayer(); }
+ void deleteMessage();
// void OnButtonOk(wxCommandEvent& event);
// void OnButtonCancel(wxCommandEvent& event);