Mercurial > hg > orthanc
annotate Core/DicomFormat/DicomMap.cpp @ 1737:ec66a16aa398
removal of DicomStringValue and DicomNullValue
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 22 Oct 2015 07:52:24 +0200 |
parents | 2ca7888f8600 |
children | 99f4a05f39fa |
rev | line source |
---|---|
0 | 1 /** |
59 | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1206
diff
changeset
|
3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics |
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1206
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
0 | 5 * |
6 * This program is free software: you can redistribute it and/or | |
7 * modify it under the terms of the GNU General Public License as | |
8 * published by the Free Software Foundation, either version 3 of the | |
9 * License, or (at your option) any later version. | |
136 | 10 * |
11 * In addition, as a special exception, the copyright holders of this | |
12 * program give permission to link the code of its release with the | |
13 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
14 * that use the same license as the "OpenSSL" library), and distribute | |
15 * the linked executables. You must obey the GNU General Public License | |
16 * in all respects for all of the code used other than "OpenSSL". If you | |
17 * modify file(s) with this exception, you may extend this exception to | |
18 * your version of the file(s), but you are not obligated to do so. If | |
19 * you do not wish to do so, delete this exception statement from your | |
20 * version. If you delete this exception statement from all source files | |
21 * in the program, then also delete it here. | |
0 | 22 * |
23 * This program is distributed in the hope that it will be useful, but | |
24 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
26 * General Public License for more details. | |
27 * | |
28 * You should have received a copy of the GNU General Public License | |
29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
30 **/ | |
31 | |
32 | |
824
a811bdf8b8eb
precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
diff
changeset
|
33 #include "../PrecompiledHeaders.h" |
0 | 34 #include "DicomMap.h" |
35 | |
36 #include <stdio.h> | |
37 #include <memory> | |
1206
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
38 #include "DicomArray.h" |
59 | 39 #include "../OrthancException.h" |
0 | 40 |
41 | |
59 | 42 namespace Orthanc |
0 | 43 { |
44 static DicomTag patientTags[] = | |
45 { | |
38 | 46 //DicomTag(0x0010, 0x1010), // PatientAge |
47 //DicomTag(0x0010, 0x1040) // PatientAddress | |
77 | 48 DicomTag(0x0010, 0x0010), // PatientName |
49 DicomTag(0x0010, 0x0030), // PatientBirthDate | |
50 DicomTag(0x0010, 0x0040), // PatientSex | |
51 DicomTag(0x0010, 0x1000), // OtherPatientIDs | |
80 | 52 DICOM_TAG_PATIENT_ID |
0 | 53 }; |
54 | |
55 static DicomTag studyTags[] = | |
56 { | |
38 | 57 //DicomTag(0x0010, 0x1020), // PatientSize |
58 //DicomTag(0x0010, 0x1030) // PatientWeight | |
1716
2ca7888f8600
refactoring DicomIdentifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1706
diff
changeset
|
59 DICOM_TAG_STUDY_DATE, |
77 | 60 DicomTag(0x0008, 0x0030), // StudyTime |
61 DicomTag(0x0020, 0x0010), // StudyID | |
1716
2ca7888f8600
refactoring DicomIdentifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1706
diff
changeset
|
62 DICOM_TAG_STUDY_DESCRIPTION, |
80 | 63 DICOM_TAG_ACCESSION_NUMBER, |
64 DICOM_TAG_STUDY_INSTANCE_UID | |
0 | 65 }; |
66 | |
67 static DicomTag seriesTags[] = | |
68 { | |
38 | 69 //DicomTag(0x0010, 0x1080), // MilitaryRank |
77 | 70 DicomTag(0x0008, 0x0021), // SeriesDate |
71 DicomTag(0x0008, 0x0031), // SeriesTime | |
72 DicomTag(0x0008, 0x0060), // Modality | |
73 DicomTag(0x0008, 0x0070), // Manufacturer | |
74 DicomTag(0x0008, 0x1010), // StationName | |
1716
2ca7888f8600
refactoring DicomIdentifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1706
diff
changeset
|
75 DICOM_TAG_SERIES_DESCRIPTION, |
77 | 76 DicomTag(0x0018, 0x0015), // BodyPartExamined |
77 DicomTag(0x0018, 0x0024), // SequenceName | |
78 DicomTag(0x0018, 0x1030), // ProtocolName | |
79 DicomTag(0x0020, 0x0011), // SeriesNumber | |
433 | 80 DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES, |
80 | 81 DICOM_TAG_IMAGES_IN_ACQUISITION, |
433 | 82 DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS, |
80 | 83 DICOM_TAG_NUMBER_OF_SLICES, |
433 | 84 DICOM_TAG_NUMBER_OF_TIME_SLICES, |
1702
9980875edc7c
started work on SliceOrdering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1372
diff
changeset
|
85 DICOM_TAG_SERIES_INSTANCE_UID, |
9980875edc7c
started work on SliceOrdering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1372
diff
changeset
|
86 DICOM_TAG_IMAGE_ORIENTATION_PATIENT // New in db v6 |
0 | 87 }; |
88 | |
89 static DicomTag instanceTags[] = | |
90 { | |
77 | 91 DicomTag(0x0008, 0x0012), // InstanceCreationDate |
92 DicomTag(0x0008, 0x0013), // InstanceCreationTime | |
93 DicomTag(0x0020, 0x0012), // AcquisitionNumber | |
80 | 94 DICOM_TAG_IMAGE_INDEX, |
95 DICOM_TAG_INSTANCE_NUMBER, | |
84 | 96 DICOM_TAG_NUMBER_OF_FRAMES, |
433 | 97 DICOM_TAG_TEMPORAL_POSITION_IDENTIFIER, |
1702
9980875edc7c
started work on SliceOrdering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1372
diff
changeset
|
98 DICOM_TAG_SOP_INSTANCE_UID, |
9980875edc7c
started work on SliceOrdering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1372
diff
changeset
|
99 DICOM_TAG_IMAGE_POSITION_PATIENT // New in db v6 |
0 | 100 }; |
101 | |
102 | |
103 | |
104 | |
105 void DicomMap::SetValue(uint16_t group, | |
106 uint16_t element, | |
107 DicomValue* value) | |
108 { | |
109 DicomTag tag(group, element); | |
110 Map::iterator it = map_.find(tag); | |
111 | |
112 if (it != map_.end()) | |
113 { | |
114 delete it->second; | |
115 it->second = value; | |
116 } | |
117 else | |
118 { | |
119 map_.insert(std::make_pair(tag, value)); | |
120 } | |
121 } | |
122 | |
123 void DicomMap::SetValue(DicomTag tag, | |
124 DicomValue* value) | |
125 { | |
126 SetValue(tag.GetGroup(), tag.GetElement(), value); | |
127 } | |
128 | |
129 | |
130 | |
131 | |
132 void DicomMap::Clear() | |
133 { | |
656 | 134 for (Map::iterator it = map_.begin(); it != map_.end(); ++it) |
0 | 135 { |
136 delete it->second; | |
137 } | |
138 | |
139 map_.clear(); | |
140 } | |
141 | |
142 | |
143 void DicomMap::ExtractTags(DicomMap& result, | |
144 const DicomTag* tags, | |
145 size_t count) const | |
146 { | |
147 result.Clear(); | |
148 | |
149 for (unsigned int i = 0; i < count; i++) | |
150 { | |
151 Map::const_iterator it = map_.find(tags[i]); | |
152 if (it != map_.end()) | |
153 { | |
154 result.SetValue(it->first, it->second->Clone()); | |
155 } | |
156 } | |
157 } | |
158 | |
159 | |
160 void DicomMap::ExtractPatientInformation(DicomMap& result) const | |
161 { | |
162 ExtractTags(result, patientTags, sizeof(patientTags) / sizeof(DicomTag)); | |
163 } | |
164 | |
165 void DicomMap::ExtractStudyInformation(DicomMap& result) const | |
166 { | |
167 ExtractTags(result, studyTags, sizeof(studyTags) / sizeof(DicomTag)); | |
168 } | |
169 | |
170 void DicomMap::ExtractSeriesInformation(DicomMap& result) const | |
171 { | |
172 ExtractTags(result, seriesTags, sizeof(seriesTags) / sizeof(DicomTag)); | |
173 } | |
174 | |
175 void DicomMap::ExtractInstanceInformation(DicomMap& result) const | |
176 { | |
177 ExtractTags(result, instanceTags, sizeof(instanceTags) / sizeof(DicomTag)); | |
178 } | |
179 | |
180 | |
80 | 181 |
0 | 182 DicomMap* DicomMap::Clone() const |
183 { | |
184 std::auto_ptr<DicomMap> result(new DicomMap); | |
185 | |
656 | 186 for (Map::const_iterator it = map_.begin(); it != map_.end(); ++it) |
0 | 187 { |
188 result->map_.insert(std::make_pair(it->first, it->second->Clone())); | |
189 } | |
190 | |
191 return result.release(); | |
192 } | |
193 | |
194 | |
1310
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
195 void DicomMap::Assign(const DicomMap& other) |
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
196 { |
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
197 Clear(); |
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
198 |
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
199 for (Map::const_iterator it = other.map_.begin(); it != other.map_.end(); ++it) |
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
200 { |
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
201 map_.insert(std::make_pair(it->first, it->second->Clone())); |
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
202 } |
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
203 } |
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
204 |
61ce8147f30d
custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
205 |
0 | 206 const DicomValue& DicomMap::GetValue(const DicomTag& tag) const |
207 { | |
80 | 208 const DicomValue* value = TestAndGetValue(tag); |
209 | |
210 if (value) | |
211 { | |
212 return *value; | |
213 } | |
214 else | |
215 { | |
730
309e686b41e7
better logging about nonexistent tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
216 throw OrthancException(ErrorCode_InexistentTag); |
80 | 217 } |
218 } | |
219 | |
220 | |
221 const DicomValue* DicomMap::TestAndGetValue(const DicomTag& tag) const | |
222 { | |
0 | 223 Map::const_iterator it = map_.find(tag); |
224 | |
225 if (it == map_.end()) | |
226 { | |
80 | 227 return NULL; |
0 | 228 } |
229 else | |
230 { | |
80 | 231 return it->second; |
0 | 232 } |
233 } | |
234 | |
235 | |
236 void DicomMap::Remove(const DicomTag& tag) | |
237 { | |
238 Map::iterator it = map_.find(tag); | |
239 if (it != map_.end()) | |
240 { | |
241 delete it->second; | |
242 map_.erase(it); | |
243 } | |
244 } | |
245 | |
246 | |
247 static void SetupFindTemplate(DicomMap& result, | |
248 const DicomTag* tags, | |
249 size_t count) | |
250 { | |
251 result.Clear(); | |
252 | |
253 for (size_t i = 0; i < count; i++) | |
254 { | |
255 result.SetValue(tags[i], ""); | |
256 } | |
257 } | |
258 | |
259 void DicomMap::SetupFindPatientTemplate(DicomMap& result) | |
260 { | |
261 SetupFindTemplate(result, patientTags, sizeof(patientTags) / sizeof(DicomTag)); | |
262 } | |
263 | |
264 void DicomMap::SetupFindStudyTemplate(DicomMap& result) | |
265 { | |
266 SetupFindTemplate(result, studyTags, sizeof(studyTags) / sizeof(DicomTag)); | |
80 | 267 result.SetValue(DICOM_TAG_ACCESSION_NUMBER, ""); |
268 result.SetValue(DICOM_TAG_PATIENT_ID, ""); | |
0 | 269 } |
270 | |
271 void DicomMap::SetupFindSeriesTemplate(DicomMap& result) | |
272 { | |
273 SetupFindTemplate(result, seriesTags, sizeof(seriesTags) / sizeof(DicomTag)); | |
80 | 274 result.SetValue(DICOM_TAG_ACCESSION_NUMBER, ""); |
275 result.SetValue(DICOM_TAG_PATIENT_ID, ""); | |
276 result.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, ""); | |
1372 | 277 |
278 // These tags are considered as "main" by Orthanc, but are not in the Series module | |
279 result.Remove(DicomTag(0x0008, 0x0070)); // Manufacturer | |
280 result.Remove(DicomTag(0x0008, 0x1010)); // Station name | |
281 result.Remove(DicomTag(0x0018, 0x0024)); // Sequence name | |
282 result.Remove(DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES); | |
283 result.Remove(DICOM_TAG_IMAGES_IN_ACQUISITION); | |
284 result.Remove(DICOM_TAG_NUMBER_OF_SLICES); | |
285 result.Remove(DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS); | |
286 result.Remove(DICOM_TAG_NUMBER_OF_TIME_SLICES); | |
1706 | 287 result.Remove(DICOM_TAG_IMAGE_ORIENTATION_PATIENT); |
0 | 288 } |
289 | |
290 void DicomMap::SetupFindInstanceTemplate(DicomMap& result) | |
291 { | |
292 SetupFindTemplate(result, instanceTags, sizeof(instanceTags) / sizeof(DicomTag)); | |
80 | 293 result.SetValue(DICOM_TAG_ACCESSION_NUMBER, ""); |
294 result.SetValue(DICOM_TAG_PATIENT_ID, ""); | |
295 result.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, ""); | |
296 result.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, ""); | |
0 | 297 } |
298 | |
299 | |
300 void DicomMap::CopyTagIfExists(const DicomMap& source, | |
301 const DicomTag& tag) | |
302 { | |
303 if (source.HasTag(tag)) | |
304 { | |
305 SetValue(tag, source.GetValue(tag)); | |
306 } | |
307 } | |
562
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
308 |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
309 |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
310 bool DicomMap::IsMainDicomTag(const DicomTag& tag, ResourceType level) |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
311 { |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
312 DicomTag *tags = NULL; |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
313 size_t size; |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
314 |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
315 switch (level) |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
316 { |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
317 case ResourceType_Patient: |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
318 tags = patientTags; |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
319 size = sizeof(patientTags) / sizeof(DicomTag); |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
320 break; |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
321 |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
322 case ResourceType_Study: |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
323 tags = studyTags; |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
324 size = sizeof(studyTags) / sizeof(DicomTag); |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
325 break; |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
326 |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
327 case ResourceType_Series: |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
328 tags = seriesTags; |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
329 size = sizeof(seriesTags) / sizeof(DicomTag); |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
330 break; |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
331 |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
332 case ResourceType_Instance: |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
333 tags = instanceTags; |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
334 size = sizeof(instanceTags) / sizeof(DicomTag); |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
335 break; |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
336 |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
337 default: |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
338 throw OrthancException(ErrorCode_ParameterOutOfRange); |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
339 } |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
340 |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
341 for (size_t i = 0; i < size; i++) |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
342 { |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
343 if (tags[i] == tag) |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
344 { |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
345 return true; |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
346 } |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
347 } |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
348 |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
349 return false; |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
350 } |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
351 |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
352 bool DicomMap::IsMainDicomTag(const DicomTag& tag) |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
353 { |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
354 return (IsMainDicomTag(tag, ResourceType_Patient) || |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
355 IsMainDicomTag(tag, ResourceType_Study) || |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
356 IsMainDicomTag(tag, ResourceType_Series) || |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
357 IsMainDicomTag(tag, ResourceType_Instance)); |
f64e3838d6e1
refactoring enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
358 } |
567 | 359 |
360 | |
361 void DicomMap::GetMainDicomTagsInternal(std::set<DicomTag>& result, ResourceType level) | |
362 { | |
363 DicomTag *tags = NULL; | |
364 size_t size; | |
365 | |
366 switch (level) | |
367 { | |
368 case ResourceType_Patient: | |
369 tags = patientTags; | |
370 size = sizeof(patientTags) / sizeof(DicomTag); | |
371 break; | |
372 | |
373 case ResourceType_Study: | |
374 tags = studyTags; | |
375 size = sizeof(studyTags) / sizeof(DicomTag); | |
376 break; | |
377 | |
378 case ResourceType_Series: | |
379 tags = seriesTags; | |
380 size = sizeof(seriesTags) / sizeof(DicomTag); | |
381 break; | |
382 | |
383 case ResourceType_Instance: | |
384 tags = instanceTags; | |
385 size = sizeof(instanceTags) / sizeof(DicomTag); | |
386 break; | |
387 | |
388 default: | |
389 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
390 } | |
391 | |
392 for (size_t i = 0; i < size; i++) | |
393 { | |
394 result.insert(tags[i]); | |
395 } | |
396 } | |
397 | |
398 | |
399 void DicomMap::GetMainDicomTags(std::set<DicomTag>& result, ResourceType level) | |
400 { | |
401 result.clear(); | |
402 GetMainDicomTagsInternal(result, level); | |
403 } | |
404 | |
405 | |
406 void DicomMap::GetMainDicomTags(std::set<DicomTag>& result) | |
407 { | |
408 result.clear(); | |
409 GetMainDicomTagsInternal(result, ResourceType_Patient); | |
410 GetMainDicomTagsInternal(result, ResourceType_Study); | |
411 GetMainDicomTagsInternal(result, ResourceType_Series); | |
412 GetMainDicomTagsInternal(result, ResourceType_Instance); | |
413 } | |
1206
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
414 |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
415 |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
416 void DicomMap::Print(FILE* fp) const |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
417 { |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
418 DicomArray a(*this); |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
419 a.Print(fp); |
f5b0207967bc
Fix issue 19 (YBR_FULL are decoded incorrectly)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
420 } |
1360 | 421 |
422 | |
423 void DicomMap::GetTags(std::set<DicomTag>& tags) const | |
424 { | |
425 tags.clear(); | |
426 | |
427 for (Map::const_iterator it = map_.begin(); | |
428 it != map_.end(); ++it) | |
429 { | |
430 tags.insert(it->first); | |
431 } | |
432 } | |
0 | 433 } |