1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
|
--- imagepool/poolinstance.cpp.orig 2010-07-26 21:55:22.000000000 +0000
+++ imagepool/poolinstance.cpp 2010-07-27 14:33:34.000000000 +0000
@@ -37,6 +37,8 @@
#include <iostream>
+#include <libintl.h>
+
namespace ImagePool {
Instance::Instance(const std::string& sopinstanceuid) :
@@ -279,35 +281,35 @@
// get SOPInstanceUID
- std::string sop;
+ OFString sop;
dset->findAndGetOFString(DCM_SOPInstanceUID, sop).bad();
// wrap in smartpointer
- Glib::RefPtr<ImagePool::Instance> r = Glib::RefPtr<ImagePool::Instance>(new ImagePool::Instance(sop));
+ Glib::RefPtr<ImagePool::Instance> r = Glib::RefPtr<ImagePool::Instance>(new ImagePool::Instance(sop.c_str()));
// set encoding
- std::string enc[2];
+ OFString enc[2];
dset->findAndGetOFString(DCM_SpecificCharacterSet, enc[0], 0);
dset->findAndGetOFString(DCM_SpecificCharacterSet, enc[1], 1);
- r->set_encoding(enc[0], enc[1]);
+ r->set_encoding(enc[0].c_str(), enc[1].c_str());
// set dicom uid's
- r->m_sopinstanceuid = sop;
+ r->m_sopinstanceuid = sop.c_str();
- std::string seriesuid;
+ OFString seriesuid;
if(dset->findAndGetOFString(DCM_SeriesInstanceUID, seriesuid).good()) {
- r->m_seriesinstanceuid = seriesuid;
+ r->m_seriesinstanceuid = seriesuid.c_str();
}
- std::string studyuid;
+ OFString studyuid;
if(dset->findAndGetOFString(DCM_StudyInstanceUID, studyuid).good()) {
- r->m_studyinstanceuid = studyuid;
+ r->m_studyinstanceuid = studyuid.c_str();
}
r->m_default_windowcenter = 0;
r->m_default_windowwidth = 0;
- std::string value;
+ OFString value;
// get instancenumber
if(dset->findAndGetOFString(DCM_InstanceNumber, value).good()) {
@@ -438,29 +440,29 @@
// set date
if(dset->findAndGetOFString(DCM_AcquisitionDate, value).good()) {
- r->m_date = value;
+ r->m_date = value.c_str();
}
else if(dset->findAndGetOFString(DCM_SeriesDate, value).good()) {
- r->m_date = value;
+ r->m_date = value.c_str();
}
else if(dset->findAndGetOFString(DCM_StudyDate, value).good()) {
- r->m_date = value;
+ r->m_date = value.c_str();
}
// set time
if(dset->findAndGetOFString(DCM_AcquisitionTime, value).good()) {
- r->m_time = value;
+ r->m_time = value.c_str();
}
else if(dset->findAndGetOFString(DCM_SeriesTime, value).good()) {
- r->m_time = value;
+ r->m_time = value.c_str();
}
else if(dset->findAndGetOFString(DCM_StudyTime, value).good()) {
- r->m_time = value;
+ r->m_time = value.c_str();
}
// set ManufacturersModelName
if(dset->findAndGetOFString(DCM_ManufacturersModelName, value).good()) {
- r->m_model = value;
+ r->m_model = value.c_str();
}
// set pixelspacing
@@ -512,8 +514,10 @@
if(dset->findAndGetOFString(DCM_PatientsName, value).good()) {
r->m_patientsname = r->convert_string(value.c_str());
}
- dset->findAndGetOFString(DCM_PatientsBirthDate, r->m_patientsbirthdate);
- dset->findAndGetOFString(DCM_PatientsSex, r->m_patientssex);
+ dset->findAndGetOFString(DCM_PatientsBirthDate, value);
+ r->m_patientsbirthdate = value.c_str();
+ dset->findAndGetOFString(DCM_PatientsSex, value);
+ r->m_patientssex = value.c_str();
if(dset->findAndGetOFString(DCM_StudyDescription, value).good()) {
r->m_studydescription = r->convert_string(value.c_str());
}
@@ -528,8 +532,10 @@
r->m_studydescription = gettext("no description");
}
- dset->findAndGetOFString(DCM_StudyDate, r->m_studydate);
- dset->findAndGetOFString(DCM_StudyTime, r->m_studytime);
+ dset->findAndGetOFString(DCM_StudyDate, value);
+ r->m_studydate = value.c_str();
+ dset->findAndGetOFString(DCM_StudyTime, value);
+ r->m_studytime = value.c_str();
// series params
if(dset->findAndGetOFString(DCM_InstitutionName, value).good()) {
@@ -549,7 +555,8 @@
r->m_seriesdescription = gettext("no description");
}
- dset->findAndGetOFString(DCM_Modality, r->m_modality);
+ dset->findAndGetOFString(DCM_Modality, value);
+ r->m_modality = value.c_str();
Glib::RefPtr<ImagePool::Study> new_study = get_study(r->m_studyinstanceuid);
if(new_study->size() == 0) {
|
