annotate OrthancFramework/Sources/DicomFormat/DicomTag.cpp @ 5676:b744a2cf408a find-refactoring tip

shorten ParentRetrieveSpecification/ChildrenRetrieveSpecification as ParentSpecification/ChildrenSpecification
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 06 Jul 2024 15:04:28 +0200
parents f7adfb22e20e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
59
c996319e90bc renaming in Core
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
1900
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1732
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288
6e7e5ed91c2d upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1276
diff changeset
4 * Department, University Hospital of Liege, Belgium
5640
f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5485
diff changeset
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5485
diff changeset
6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium
5485
48b8dae6dc77 upgrade to year 2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5185
diff changeset
7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 *
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * This program is free software: you can redistribute it and/or
4119
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
10 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
11 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
12 * the License, or (at your option) any later version.
136
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
13 *
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
17 * Lesser General Public License for more details.
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 *
4119
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
19 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
20 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
21 * <http://www.gnu.org/licenses/>.
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 **/
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24
824
a811bdf8b8eb precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
25 #include "../PrecompiledHeaders.h"
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 #include "DicomTag.h"
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27
59
c996319e90bc renaming in Core
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
28 #include "../OrthancException.h"
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 #include <iostream>
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 #include <iomanip>
35
f6d12037f886 full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
32 #include <stdio.h>
2662
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
33 #include <string.h>
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34
59
c996319e90bc renaming in Core
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
35 namespace Orthanc
2662
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
36 {
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
37 static inline uint16_t GetCharValue(char c)
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
38 {
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
39 if (c >= '0' && c <= '9')
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
40 return c - '0';
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
41 else if (c >= 'a' && c <= 'f')
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
42 return c - 'a' + 10;
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
43 else if (c >= 'A' && c <= 'F')
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
44 return c - 'A' + 10;
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
45 else
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
46 return 0;
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
47 }
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
48
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
49
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
50 static inline uint16_t GetTagValue(const char* c)
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
51 {
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
52 return ((GetCharValue(c[0]) << 12) +
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
53 (GetCharValue(c[1]) << 8) +
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
54 (GetCharValue(c[2]) << 4) +
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
55 GetCharValue(c[3]));
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
56 }
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
57
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
58
4297
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
59 DicomTag::DicomTag(uint16_t group, uint16_t element) :
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
60 group_(group),
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
61 element_(element)
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
62 {
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
63 }
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
64
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
65 uint16_t DicomTag::GetGroup() const
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
66 {
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
67 return group_;
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
68 }
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
69
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
70 uint16_t DicomTag::GetElement() const
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
71 {
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
72 return element_;
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
73 }
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
74
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
75 bool DicomTag::IsPrivate() const
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
76 {
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
77 return group_ % 2 == 1;
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
78 }
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
79
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
80
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 bool DicomTag::operator< (const DicomTag& other) const
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 if (group_ < other.group_)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 return true;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 if (group_ > other.group_)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 return false;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 return element_ < other.element_;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92
4218
8e069a7e1c11 validation against orthanc-tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
93 bool DicomTag::operator<= (const DicomTag& other) const
8e069a7e1c11 validation against orthanc-tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
94 {
8e069a7e1c11 validation against orthanc-tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
95 if (group_ < other.group_)
8e069a7e1c11 validation against orthanc-tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
96 return true;
8e069a7e1c11 validation against orthanc-tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
97
8e069a7e1c11 validation against orthanc-tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
98 if (group_ > other.group_)
8e069a7e1c11 validation against orthanc-tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
99 return false;
8e069a7e1c11 validation against orthanc-tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
100
8e069a7e1c11 validation against orthanc-tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
101 return element_ <= other.element_;
8e069a7e1c11 validation against orthanc-tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
102 }
8e069a7e1c11 validation against orthanc-tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
103
4297
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
104 bool DicomTag::operator>(const DicomTag &other) const
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
105 {
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
106 return !(*this <= other);
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
107 }
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
108
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
109 bool DicomTag::operator>=(const DicomTag &other) const
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
110 {
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
111 return !(*this < other);
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
112 }
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
113
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
114 bool DicomTag::operator==(const DicomTag &other) const
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
115 {
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
116 return group_ == other.group_ && element_ == other.element_;
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
117 }
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
118
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
119 bool DicomTag::operator!=(const DicomTag &other) const
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
120 {
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
121 return !(*this == other);
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
122 }
785a2713323e abi continued
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4218
diff changeset
123
4218
8e069a7e1c11 validation against orthanc-tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
124
4313
91554aecff9a removed a friend method for better abi
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4297
diff changeset
125 std::ostream& DicomTag::FormatStream(std::ostream& o) const
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127 using namespace std;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 ios_base::fmtflags state = o.flags();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 o.flags(ios::right | ios::hex);
4313
91554aecff9a removed a friend method for better abi
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4297
diff changeset
130 o << "(" << setfill('0') << setw(4) << GetGroup()
91554aecff9a removed a friend method for better abi
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4297
diff changeset
131 << "," << setw(4) << GetElement() << ")";
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 o.flags(state);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 return o;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136
35
f6d12037f886 full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
137 std::string DicomTag::Format() const
f6d12037f886 full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
138 {
f6d12037f886 full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
139 char b[16];
f6d12037f886 full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
140 sprintf(b, "%04x,%04x", group_, element_);
f6d12037f886 full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
141 return std::string(b);
f6d12037f886 full json vs. simplified json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
142 }
291
4d7469f72a0b embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
143
4d7469f72a0b embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
144
2662
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
145 bool DicomTag::ParseHexadecimal(DicomTag& tag,
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
146 const char* value)
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
147 {
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
148 size_t length = strlen(value);
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
149
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
150 if (length == 9 &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
151 isxdigit(value[0]) &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
152 isxdigit(value[1]) &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
153 isxdigit(value[2]) &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
154 isxdigit(value[3]) &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
155 (value[4] == '-' || value[4] == ',') &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
156 isxdigit(value[5]) &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
157 isxdigit(value[6]) &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
158 isxdigit(value[7]) &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
159 isxdigit(value[8]))
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
160 {
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
161 uint16_t group = GetTagValue(value);
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
162 uint16_t element = GetTagValue(value + 5);
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
163 tag = DicomTag(group, element);
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
164 return true;
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
165 }
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
166 else if (length == 8 &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
167 isxdigit(value[0]) &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
168 isxdigit(value[1]) &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
169 isxdigit(value[2]) &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
170 isxdigit(value[3]) &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
171 isxdigit(value[4]) &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
172 isxdigit(value[5]) &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
173 isxdigit(value[6]) &&
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
174 isxdigit(value[7]))
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
175 {
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
176 uint16_t group = GetTagValue(value);
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
177 uint16_t element = GetTagValue(value + 4);
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
178 tag = DicomTag(group, element);
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
179 return true;
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
180 }
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
181 else
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
182 {
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
183 return false;
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
184 }
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
185 }
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
186
47d812308d63 serialization of DicomModification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
187
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
188 void DicomTag::AddTagsForModule(std::set<DicomTag>& target,
1276
6164f7200c43 refactoring modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
189 DicomModule module)
961
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
190 {
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
191 // REFERENCE: 11_03pu.pdf, DICOM PS 3.3 2011 - Information Object Definitions
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
192
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
193 switch (module)
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
194 {
1276
6164f7200c43 refactoring modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
195 case DicomModule_Patient:
961
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
196 // This is Table C.7-1 "Patient Module Attributes" (p. 373)
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
197 target.insert(DicomTag(0x0010, 0x0010)); // Patient's name
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
198 target.insert(DicomTag(0x0010, 0x0020)); // Patient ID
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
199 target.insert(DicomTag(0x0010, 0x0030)); // Patient's birth date
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
200 target.insert(DicomTag(0x0010, 0x0040)); // Patient's sex
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
201 target.insert(DicomTag(0x0008, 0x1120)); // Referenced patient sequence
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
202 target.insert(DicomTag(0x0010, 0x0032)); // Patient's birth time
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
203 target.insert(DicomTag(0x0010, 0x1000)); // Other patient IDs
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
204 target.insert(DicomTag(0x0010, 0x1002)); // Other patient IDs sequence
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
205 target.insert(DicomTag(0x0010, 0x1001)); // Other patient names
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
206 target.insert(DicomTag(0x0010, 0x2160)); // Ethnic group
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
207 target.insert(DicomTag(0x0010, 0x4000)); // Patient comments
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
208 target.insert(DicomTag(0x0010, 0x2201)); // Patient species description
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
209 target.insert(DicomTag(0x0010, 0x2202)); // Patient species code sequence
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
210 target.insert(DicomTag(0x0010, 0x2292)); // Patient breed description
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
211 target.insert(DicomTag(0x0010, 0x2293)); // Patient breed code sequence
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
212 target.insert(DicomTag(0x0010, 0x2294)); // Breed registration sequence
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
213 target.insert(DicomTag(0x0010, 0x2297)); // Responsible person
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
214 target.insert(DicomTag(0x0010, 0x2298)); // Responsible person role
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
215 target.insert(DicomTag(0x0010, 0x2299)); // Responsible organization
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
216 target.insert(DicomTag(0x0012, 0x0062)); // Patient identity removed
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
217 target.insert(DicomTag(0x0012, 0x0063)); // De-identification method
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
218 target.insert(DicomTag(0x0012, 0x0064)); // De-identification method code sequence
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
219
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
220 // Table 10-18 ISSUER OF PATIENT ID MACRO (p. 112)
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
221 target.insert(DicomTag(0x0010, 0x0021)); // Issuer of Patient ID
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
222 target.insert(DicomTag(0x0010, 0x0024)); // Issuer of Patient ID qualifiers sequence
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
223 break;
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
224
1276
6164f7200c43 refactoring modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
225 case DicomModule_Study:
961
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
226 // This is Table C.7-3 "General Study Module Attributes" (p. 378)
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
227 target.insert(DicomTag(0x0020, 0x000d)); // Study instance UID
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
228 target.insert(DicomTag(0x0008, 0x0020)); // Study date
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
229 target.insert(DicomTag(0x0008, 0x0030)); // Study time
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
230 target.insert(DicomTag(0x0008, 0x0090)); // Referring physician's name
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
231 target.insert(DicomTag(0x0008, 0x0096)); // Referring physician identification sequence
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
232 target.insert(DicomTag(0x0020, 0x0010)); // Study ID
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
233 target.insert(DicomTag(0x0008, 0x0050)); // Accession number
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
234 target.insert(DicomTag(0x0008, 0x0051)); // Issuer of accession number sequence
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
235 target.insert(DicomTag(0x0008, 0x1030)); // Study description
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
236 target.insert(DicomTag(0x0008, 0x1048)); // Physician(s) of record
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
237 target.insert(DicomTag(0x0008, 0x1049)); // Physician(s) of record identification sequence
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
238 target.insert(DicomTag(0x0008, 0x1060)); // Name of physician(s) reading study
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
239 target.insert(DicomTag(0x0008, 0x1062)); // Physician(s) reading study identification sequence
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
240 target.insert(DicomTag(0x0032, 0x1034)); // Requesting service code sequence
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
241 target.insert(DicomTag(0x0008, 0x1110)); // Referenced study sequence
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
242 target.insert(DicomTag(0x0008, 0x1032)); // Procedure code sequence
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
243 target.insert(DicomTag(0x0040, 0x1012)); // Reason for performed procedure code sequence
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
244 break;
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
245
1276
6164f7200c43 refactoring modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
246 case DicomModule_Series:
961
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
247 // This is Table C.7-5 "General Series Module Attributes" (p. 385)
962
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
248 target.insert(DicomTag(0x0008, 0x0060)); // Modality
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
249 target.insert(DicomTag(0x0020, 0x000e)); // Series Instance UID
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
250 target.insert(DicomTag(0x0020, 0x0011)); // Series Number
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
251 target.insert(DicomTag(0x0020, 0x0060)); // Laterality
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
252 target.insert(DicomTag(0x0008, 0x0021)); // Series Date
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
253 target.insert(DicomTag(0x0008, 0x0031)); // Series Time
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
254 target.insert(DicomTag(0x0008, 0x1050)); // Performing Physicians’ Name
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
255 target.insert(DicomTag(0x0008, 0x1052)); // Performing Physician Identification Sequence
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
256 target.insert(DicomTag(0x0018, 0x1030)); // Protocol Name
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
257 target.insert(DicomTag(0x0008, 0x103e)); // Series Description
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
258 target.insert(DicomTag(0x0008, 0x103f)); // Series Description Code Sequence
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
259 target.insert(DicomTag(0x0008, 0x1070)); // Operators' Name
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
260 target.insert(DicomTag(0x0008, 0x1072)); // Operator Identification Sequence
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
261 target.insert(DicomTag(0x0008, 0x1111)); // Referenced Performed Procedure Step Sequence
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
262 target.insert(DicomTag(0x0008, 0x1250)); // Related Series Sequence
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
263 target.insert(DicomTag(0x0018, 0x0015)); // Body Part Examined
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
264 target.insert(DicomTag(0x0018, 0x5100)); // Patient Position
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
265 target.insert(DicomTag(0x0028, 0x0108)); // Smallest Pixel Value in Series
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
266 target.insert(DicomTag(0x0029, 0x0109)); // Largest Pixel Value in Series
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
267 target.insert(DicomTag(0x0040, 0x0275)); // Request Attributes Sequence
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
268 target.insert(DicomTag(0x0010, 0x2210)); // Anatomical Orientation Type
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
269
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
270 // Table 10-16 PERFORMED PROCEDURE STEP SUMMARY MACRO ATTRIBUTES
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
271 target.insert(DicomTag(0x0040, 0x0253)); // Performed Procedure Step ID
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
272 target.insert(DicomTag(0x0040, 0x0244)); // Performed Procedure Step Start Date
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
273 target.insert(DicomTag(0x0040, 0x0245)); // Performed Procedure Step Start Time
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
274 target.insert(DicomTag(0x0040, 0x0254)); // Performed Procedure Step Description
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
275 target.insert(DicomTag(0x0040, 0x0260)); // Performed Protocol Code Sequence
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
276 target.insert(DicomTag(0x0040, 0x0280)); // Comments on the Performed Procedure Step
961
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
277 break;
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
278
1276
6164f7200c43 refactoring modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
279 case DicomModule_Instance:
961
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
280 // This is Table C.12-1 "SOP Common Module Attributes" (p. 1207)
962
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
281 target.insert(DicomTag(0x0008, 0x0016)); // SOP Class UID
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
282 target.insert(DicomTag(0x0008, 0x0018)); // SOP Instance UID
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
283 target.insert(DicomTag(0x0008, 0x0005)); // Specific Character Set
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
284 target.insert(DicomTag(0x0008, 0x0012)); // Instance Creation Date
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
285 target.insert(DicomTag(0x0008, 0x0013)); // Instance Creation Time
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
286 target.insert(DicomTag(0x0008, 0x0014)); // Instance Creator UID
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
287 target.insert(DicomTag(0x0008, 0x001a)); // Related General SOP Class UID
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
288 target.insert(DicomTag(0x0008, 0x001b)); // Original Specialized SOP Class UID
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
289 target.insert(DicomTag(0x0008, 0x0110)); // Coding Scheme Identification Sequence
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
290 target.insert(DicomTag(0x0008, 0x0201)); // Timezone Offset From UTC
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
291 target.insert(DicomTag(0x0018, 0xa001)); // Contributing Equipment Sequence
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
292 target.insert(DicomTag(0x0020, 0x0013)); // Instance Number
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
293 target.insert(DicomTag(0x0100, 0x0410)); // SOP Instance Status
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
294 target.insert(DicomTag(0x0100, 0x0420)); // SOP Authorization DateTime
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
295 target.insert(DicomTag(0x0100, 0x0424)); // SOP Authorization Comment
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
296 target.insert(DicomTag(0x0100, 0x0426)); // Authorization Equipment Certification Number
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
297 target.insert(DicomTag(0x0400, 0x0500)); // Encrypted Attributes Sequence
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
298 target.insert(DicomTag(0x0400, 0x0561)); // Original Attributes Sequence
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
299 target.insert(DicomTag(0x0040, 0xa390)); // HL7 Structured Document Reference Sequence
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
300 target.insert(DicomTag(0x0028, 0x0303)); // Longitudinal Temporal Information Modified
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
301
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
302 // Table C.12-6 "DIGITAL SIGNATURES MACRO ATTRIBUTES" (p. 1216)
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
303 target.insert(DicomTag(0x4ffe, 0x0001)); // MAC Parameters sequence
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
304 target.insert(DicomTag(0xfffa, 0xfffa)); // Digital signatures sequence
961
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
305 break;
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
306
962
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
307 // TODO IMAGE MODULE?
b39c4837966e modules 2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 961
diff changeset
308
961
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
309 default:
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
310 throw OrthancException(ErrorCode_ParameterOutOfRange);
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
311 }
e53a7e30a137 modules
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
312 }
4348
93c281752e7a reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4313
diff changeset
313
93c281752e7a reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4313
diff changeset
314
93c281752e7a reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4313
diff changeset
315 #if ORTHANC_BUILDING_FRAMEWORK_LIBRARY == 1
93c281752e7a reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4313
diff changeset
316 std::ostream& operator<< (std::ostream& o, const DicomTag& tag)
93c281752e7a reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4313
diff changeset
317 {
93c281752e7a reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4313
diff changeset
318 tag.FormatStream(o);
93c281752e7a reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4313
diff changeset
319 return o;
93c281752e7a reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4313
diff changeset
320 }
93c281752e7a reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4313
diff changeset
321 #endif
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
322 }