Mercurial > hg > orthanc
annotate OrthancServer/Sources/Search/HierarchicalMatcher.cpp @ 4806:753f87dac208
changed log levels
author | Alain Mazy <am@osimis.io> |
---|---|
date | Wed, 10 Nov 2021 15:29:35 +0100 |
parents | d9473bd5ed43 |
children | f0038043fb97 7053502fbf97 |
rev | line source |
---|---|
1795 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
1795 | 4 * Department, University Hospital of Liege, Belgium |
4437
d9473bd5ed43
upgrade to year 2021
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4045
diff
changeset
|
5 * Copyright (C) 2017-2021 Osimis S.A., Belgium |
1795 | 6 * |
7 * This program is free software: you can redistribute it and/or | |
8 * modify it under the terms of the GNU General Public License as | |
9 * published by the Free Software Foundation, either version 3 of the | |
10 * License, or (at your option) any later version. | |
11 * | |
12 * In addition, as a special exception, the copyright holders of this | |
13 * program give permission to link the code of its release with the | |
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
15 * that use the same license as the "OpenSSL" library), and distribute | |
16 * the linked executables. You must obey the GNU General Public License | |
17 * in all respects for all of the code used other than "OpenSSL". If you | |
18 * modify file(s) with this exception, you may extend this exception to | |
19 * your version of the file(s), but you are not obligated to do so. If | |
20 * you do not wish to do so, delete this exception statement from your | |
21 * version. If you delete this exception statement from all source files | |
22 * in the program, then also delete it here. | |
23 * | |
24 * This program is distributed in the hope that it will be useful, but | |
25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
27 * General Public License for more details. | |
28 * | |
29 * You should have received a copy of the GNU General Public License | |
30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
31 **/ | |
32 | |
33 | |
34 #include "../PrecompiledHeadersServer.h" | |
35 #include "HierarchicalMatcher.h" | |
36 | |
4045 | 37 #include "../../../OrthancFramework/Sources/Logging.h" |
38 #include "../../../OrthancFramework/Sources/OrthancException.h" | |
39 #include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" | |
40 #include "../../../OrthancFramework/Sources/DicomParsing/ToDcmtkBridge.h" | |
2940
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
41 #include "../OrthancConfiguration.h" |
1795 | 42 |
43 #include <dcmtk/dcmdata/dcfilefo.h> | |
44 | |
45 namespace Orthanc | |
46 { | |
2256
de1ba22fd28a
simplification wrt. modality manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
47 HierarchicalMatcher::HierarchicalMatcher(ParsedDicomFile& query) |
1795 | 48 { |
2940
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
49 bool caseSensitivePN; |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
50 |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
51 { |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
52 OrthancConfiguration::ReaderLock lock; |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
53 caseSensitivePN = lock.GetConfiguration().GetBooleanParameter("CaseSensitivePN", false); |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
54 } |
4767d36679ed
refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
55 |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
56 bool hasCodeExtensions; |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
57 Encoding encoding = query.DetectEncoding(hasCodeExtensions); |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
58 Setup(*query.GetDcmtkObject().getDataset(), caseSensitivePN, encoding, hasCodeExtensions); |
1795 | 59 } |
60 | |
61 | |
62 HierarchicalMatcher::~HierarchicalMatcher() | |
63 { | |
64 for (Sequences::iterator it = sequences_.begin(); | |
65 it != sequences_.end(); ++it) | |
66 { | |
67 if (it->second != NULL) | |
68 { | |
69 delete it->second; | |
70 } | |
71 } | |
72 } | |
73 | |
74 | |
75 void HierarchicalMatcher::Setup(DcmItem& dataset, | |
76 bool caseSensitivePN, | |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
77 Encoding encoding, |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
78 bool hasCodeExtensions) |
1795 | 79 { |
80 for (unsigned long i = 0; i < dataset.card(); i++) | |
81 { | |
82 DcmElement* element = dataset.getElement(i); | |
83 if (element == NULL) | |
84 { | |
85 throw OrthancException(ErrorCode_InternalError); | |
86 } | |
87 | |
88 DicomTag tag(FromDcmtkBridge::Convert(element->getTag())); | |
2200
af60b784d2b8
Ignore "Group Length" tags in C-FIND queries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2007
diff
changeset
|
89 if (tag == DICOM_TAG_SPECIFIC_CHARACTER_SET || // Ignore encoding |
af60b784d2b8
Ignore "Group Length" tags in C-FIND queries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2007
diff
changeset
|
90 tag.GetElement() == 0x0000) // Ignore all "Group Length" tags |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
91 { |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
92 continue; |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
93 } |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
94 |
3071
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
95 if (flatTags_.find(tag) != flatTags_.end() || |
1795 | 96 sequences_.find(tag) != sequences_.end()) |
97 { | |
3071
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
98 // A constraint already exists on this tag |
1795 | 99 throw OrthancException(ErrorCode_BadRequest); |
100 } | |
101 | |
3071
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
102 if (FromDcmtkBridge::LookupValueRepresentation(tag) == ValueRepresentation_Sequence) |
1795 | 103 { |
104 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(*element); | |
105 | |
106 if (sequence.card() == 0 || | |
107 (sequence.card() == 1 && sequence.getItem(0)->card() == 0)) | |
108 { | |
109 // Universal matching of a sequence | |
110 sequences_[tag] = NULL; | |
111 } | |
112 else if (sequence.card() == 1) | |
113 { | |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
114 sequences_[tag] = new HierarchicalMatcher(*sequence.getItem(0), caseSensitivePN, encoding, hasCodeExtensions); |
1795 | 115 } |
116 else | |
117 { | |
118 throw OrthancException(ErrorCode_BadRequest); | |
119 } | |
120 } | |
121 else | |
122 { | |
3072 | 123 flatTags_.insert(tag); |
124 | |
2409
e4045b3c9772
ignore-length argument if retrieving DICOM tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2382
diff
changeset
|
125 std::set<DicomTag> ignoreTagLength; |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3691
diff
changeset
|
126 std::unique_ptr<DicomValue> value(FromDcmtkBridge::ConvertLeafElement |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3691
diff
changeset
|
127 (*element, DicomToJsonFlags_None, |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3691
diff
changeset
|
128 0, encoding, hasCodeExtensions, ignoreTagLength)); |
1795 | 129 |
3072 | 130 // WARNING: Also modify "DatabaseLookup::IsMatch()" if modifying this code |
131 if (value.get() == NULL || | |
132 value->IsNull()) | |
133 { | |
134 // This is an universal constraint | |
135 } | |
136 else if (value->IsBinary()) | |
1795 | 137 { |
1890
74dc6b764ff0
Fix modality worklists lookups if tags with UN (unknown) VR are present
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1867
diff
changeset
|
138 if (!value->GetContent().empty()) |
74dc6b764ff0
Fix modality worklists lookups if tags with UN (unknown) VR are present
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1867
diff
changeset
|
139 { |
74dc6b764ff0
Fix modality worklists lookups if tags with UN (unknown) VR are present
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1867
diff
changeset
|
140 LOG(WARNING) << "This C-Find modality worklist query contains a non-empty tag (" |
74dc6b764ff0
Fix modality worklists lookups if tags with UN (unknown) VR are present
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1867
diff
changeset
|
141 << tag.Format() << ") with UN (unknown) value representation. " |
74dc6b764ff0
Fix modality worklists lookups if tags with UN (unknown) VR are present
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1867
diff
changeset
|
142 << "It will be ignored."; |
74dc6b764ff0
Fix modality worklists lookups if tags with UN (unknown) VR are present
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1867
diff
changeset
|
143 } |
1795 | 144 } |
3072 | 145 else if (value->GetContent().empty()) |
1795 | 146 { |
147 // This is an universal matcher | |
148 } | |
149 else | |
150 { | |
3071
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
151 flatConstraints_.AddDicomConstraint |
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
152 (tag, value->GetContent(), caseSensitivePN, true /* mandatory */); |
1795 | 153 } |
154 } | |
155 } | |
156 } | |
157 | |
158 | |
159 std::string HierarchicalMatcher::Format(const std::string& prefix) const | |
160 { | |
161 std::string s; | |
3071
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
162 |
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
163 std::set<DicomTag> tags; |
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
164 for (size_t i = 0; i < flatConstraints_.GetConstraintsCount(); i++) |
1795 | 165 { |
3071
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
166 const DicomTagConstraint& c = flatConstraints_.GetConstraint(i); |
1795 | 167 |
3071
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
168 s += c.Format() + "\n"; |
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
169 tags.insert(c.GetTag()); |
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
170 } |
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
171 |
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
172 // Loop over the universal constraints |
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
173 for (std::set<DicomTag>::const_iterator it = flatTags_.begin(); |
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
174 it != flatTags_.end(); ++it) |
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
175 { |
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
176 if (tags.find(*it) == tags.end()) |
1795 | 177 { |
3071
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
178 s += prefix + it->Format() + " == *\n"; |
1795 | 179 } |
180 } | |
181 | |
182 for (Sequences::const_iterator it = sequences_.begin(); | |
183 it != sequences_.end(); ++it) | |
184 { | |
185 s += prefix + it->first.Format() + " "; | |
186 | |
187 if (it->second == NULL) | |
188 { | |
189 s += "*\n"; | |
190 } | |
191 else | |
192 { | |
193 s += "Sequence:\n" + it->second->Format(prefix + " "); | |
194 } | |
195 } | |
196 | |
197 return s; | |
198 } | |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
199 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
200 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
201 bool HierarchicalMatcher::Match(ParsedDicomFile& dicom) const |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
202 { |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
203 bool hasCodeExtensions; |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
204 Encoding encoding = dicom.DetectEncoding(hasCodeExtensions); |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
205 |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
206 return MatchInternal(*dicom.GetDcmtkObject().getDataset(), |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
207 encoding, hasCodeExtensions); |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
208 } |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
209 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
210 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
211 bool HierarchicalMatcher::MatchInternal(DcmItem& item, |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
212 Encoding encoding, |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
213 bool hasCodeExtensions) const |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
214 { |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
215 if (!flatConstraints_.IsMatch(item, encoding, hasCodeExtensions)) |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
216 { |
3071
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
217 return false; |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
218 } |
3071
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
219 |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
220 for (Sequences::const_iterator it = sequences_.begin(); |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
221 it != sequences_.end(); ++it) |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
222 { |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
223 if (it->second != NULL) |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
224 { |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
225 DcmTagKey tag = ToDcmtkBridge::Convert(it->first); |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
226 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
227 DcmSequenceOfItems* sequence = NULL; |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
228 if (!item.findAndGetSequence(tag, sequence).good() || |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
229 sequence == NULL) |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
230 { |
1891 | 231 continue; |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
232 } |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
233 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
234 bool match = false; |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
235 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
236 for (unsigned long i = 0; i < sequence->card(); i++) |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
237 { |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
238 if (it->second->MatchInternal(*sequence->getItem(i), encoding, hasCodeExtensions)) |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
239 { |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
240 match = true; |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
241 break; |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
242 } |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
243 } |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
244 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
245 if (!match) |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
246 { |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
247 return false; |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
248 } |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
249 } |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
250 } |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
251 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
252 return true; |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
253 } |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
254 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
255 |
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
256 DcmDataset* HierarchicalMatcher::ExtractInternal(DcmItem& source, |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
257 Encoding encoding, |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
258 bool hasCodeExtensions) const |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
259 { |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3691
diff
changeset
|
260 std::unique_ptr<DcmDataset> target(new DcmDataset); |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
261 |
3071
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
262 for (std::set<DicomTag>::const_iterator it = flatTags_.begin(); |
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
263 it != flatTags_.end(); ++it) |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
264 { |
3071
2df061cf2fec
getting rid of IFindConstraint hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
265 DcmTagKey tag = ToDcmtkBridge::Convert(*it); |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
266 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
267 DcmElement* element = NULL; |
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
268 if (source.findAndGetElement(tag, element).good() && |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
269 element != NULL) |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
270 { |
3691
4922bdd046dd
Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
271 if (it->IsPrivate()) |
4922bdd046dd
Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
272 { |
4922bdd046dd
Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
273 throw OrthancException(ErrorCode_NotImplemented, |
4922bdd046dd
Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
274 "Not applicable to private tags: " + it->Format()); |
4922bdd046dd
Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
275 } |
4922bdd046dd
Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
276 |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3691
diff
changeset
|
277 std::unique_ptr<DcmElement> cloned(FromDcmtkBridge::CreateElementForTag(*it, "" /* no private creator */)); |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
278 cloned->copyFrom(*element); |
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
279 target->insert(cloned.release()); |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
280 } |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
281 } |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
282 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
283 for (Sequences::const_iterator it = sequences_.begin(); |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
284 it != sequences_.end(); ++it) |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
285 { |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
286 DcmTagKey tag = ToDcmtkBridge::Convert(it->first); |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
287 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
288 DcmSequenceOfItems* sequence = NULL; |
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
289 if (source.findAndGetSequence(tag, sequence).good() && |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
290 sequence != NULL) |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
291 { |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3691
diff
changeset
|
292 std::unique_ptr<DcmSequenceOfItems> cloned(new DcmSequenceOfItems(tag)); |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
293 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
294 for (unsigned long i = 0; i < sequence->card(); i++) |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
295 { |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
296 if (it->second == NULL) |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
297 { |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
298 cloned->append(new DcmItem(*sequence->getItem(i))); |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
299 } |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
300 else if (it->second->MatchInternal(*sequence->getItem(i), encoding, hasCodeExtensions)) // TODO Might be optimized |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
301 { |
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
302 // It is necessary to encapsulate the child dataset into a |
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
303 // "DcmItem" object before it can be included in a |
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
304 // sequence. Otherwise, "dciodvfy" reports an error "Bad |
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
305 // tag in sequence - Expecting Item or Sequence Delimiter." |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3691
diff
changeset
|
306 std::unique_ptr<DcmDataset> child(it->second->ExtractInternal(*sequence->getItem(i), encoding, hasCodeExtensions)); |
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
307 cloned->append(new DcmItem(*child)); |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
308 } |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
309 } |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
310 |
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
311 target->insert(cloned.release()); |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
312 } |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
313 } |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
314 |
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
315 return target.release(); |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
316 } |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
317 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
318 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
319 ParsedDicomFile* HierarchicalMatcher::Extract(ParsedDicomFile& dicom) const |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
320 { |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
321 bool hasCodeExtensions; |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
322 Encoding encoding = dicom.DetectEncoding(hasCodeExtensions); |
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
323 |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3691
diff
changeset
|
324 std::unique_ptr<DcmDataset> dataset(ExtractInternal(*dicom.GetDcmtkObject().getDataset(), |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3691
diff
changeset
|
325 encoding, hasCodeExtensions)); |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
326 |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3691
diff
changeset
|
327 std::unique_ptr<ParsedDicomFile> result(new ParsedDicomFile(*dataset)); |
3217
cf8cbeb35f33
preliminary support of Korean character set
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3072
diff
changeset
|
328 result->SetEncoding(encoding); |
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
329 |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
330 return result.release(); |
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
331 } |
1795 | 332 } |