Mercurial > hg > orthanc
annotate OrthancServer/Search/HierarchicalMatcher.cpp @ 2314:c54c9523adf8 issue-46-anonymization
add basic profile
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 12 Jul 2017 22:09:27 +0200 |
| parents | 2a15186ca28a |
| children | 7284093111b0 |
| 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 |
|
2244
a3a65de1840f
shared copyright with osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2200
diff
changeset
|
5 * Copyright (C) 2017 Osimis, 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 | |
|
1890
74dc6b764ff0
Fix modality worklists lookups if tags with UN (unknown) VR are present
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1867
diff
changeset
|
37 #include "../../Core/Logging.h" |
| 1795 | 38 #include "../../Core/OrthancException.h" |
| 39 #include "../FromDcmtkBridge.h" | |
|
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
40 #include "../ToDcmtkBridge.h" |
|
2256
de1ba22fd28a
simplification wrt. modality manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
41 #include "../OrthancInitialization.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 { |
| 49 Setup(*query.GetDcmtkObject().getDataset(), | |
|
2256
de1ba22fd28a
simplification wrt. modality manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
50 Configuration::GetGlobalBoolParameter("CaseSensitivePN", false), |
| 1795 | 51 query.GetEncoding()); |
| 52 } | |
| 53 | |
| 54 | |
| 55 HierarchicalMatcher::~HierarchicalMatcher() | |
| 56 { | |
| 57 for (Constraints::iterator it = constraints_.begin(); | |
| 58 it != constraints_.end(); ++it) | |
| 59 { | |
| 60 if (it->second != NULL) | |
| 61 { | |
| 62 delete it->second; | |
| 63 } | |
| 64 } | |
| 65 | |
| 66 for (Sequences::iterator it = sequences_.begin(); | |
| 67 it != sequences_.end(); ++it) | |
| 68 { | |
| 69 if (it->second != NULL) | |
| 70 { | |
| 71 delete it->second; | |
| 72 } | |
| 73 } | |
| 74 } | |
| 75 | |
| 76 | |
| 77 void HierarchicalMatcher::Setup(DcmItem& dataset, | |
| 78 bool caseSensitivePN, | |
| 79 Encoding encoding) | |
| 80 { | |
| 81 for (unsigned long i = 0; i < dataset.card(); i++) | |
| 82 { | |
| 83 DcmElement* element = dataset.getElement(i); | |
| 84 if (element == NULL) | |
| 85 { | |
| 86 throw OrthancException(ErrorCode_InternalError); | |
| 87 } | |
| 88 | |
| 89 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
|
90 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
|
91 tag.GetElement() == 0x0000) // Ignore all "Group Length" tags |
|
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
92 { |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
93 continue; |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
94 } |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
95 |
|
2006
6301bbcbcaed
more generic support of value representations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1929
diff
changeset
|
96 ValueRepresentation vr = FromDcmtkBridge::LookupValueRepresentation(tag); |
| 1795 | 97 |
| 98 if (constraints_.find(tag) != constraints_.end() || | |
| 99 sequences_.find(tag) != sequences_.end()) | |
| 100 { | |
| 101 throw OrthancException(ErrorCode_BadRequest); | |
| 102 } | |
| 103 | |
| 104 if (vr == ValueRepresentation_Sequence) | |
| 105 { | |
| 106 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(*element); | |
| 107 | |
| 108 if (sequence.card() == 0 || | |
| 109 (sequence.card() == 1 && sequence.getItem(0)->card() == 0)) | |
| 110 { | |
| 111 // Universal matching of a sequence | |
| 112 sequences_[tag] = NULL; | |
| 113 } | |
| 114 else if (sequence.card() == 1) | |
| 115 { | |
| 116 sequences_[tag] = new HierarchicalMatcher(*sequence.getItem(0), caseSensitivePN, encoding); | |
| 117 } | |
| 118 else | |
| 119 { | |
| 120 throw OrthancException(ErrorCode_BadRequest); | |
| 121 } | |
| 122 } | |
| 123 else | |
| 124 { | |
| 125 std::auto_ptr<DicomValue> value(FromDcmtkBridge::ConvertLeafElement | |
|
1929
cda5b0ab4ce5
ORTHANC_MAXIMUM_TAG_LENGTH made explicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
126 (*element, DicomToJsonFlags_None, |
|
cda5b0ab4ce5
ORTHANC_MAXIMUM_TAG_LENGTH made explicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
127 ORTHANC_MAXIMUM_TAG_LENGTH, encoding)); |
| 1795 | 128 |
|
1867
769178f0ab2c
Fix modality worklists server if some fields are null
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1797
diff
changeset
|
129 if (value->IsBinary()) |
| 1795 | 130 { |
|
1890
74dc6b764ff0
Fix modality worklists lookups if tags with UN (unknown) VR are present
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1867
diff
changeset
|
131 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
|
132 { |
|
74dc6b764ff0
Fix modality worklists lookups if tags with UN (unknown) VR are present
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1867
diff
changeset
|
133 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
|
134 << 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
|
135 << "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
|
136 } |
|
74dc6b764ff0
Fix modality worklists lookups if tags with UN (unknown) VR are present
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1867
diff
changeset
|
137 |
|
74dc6b764ff0
Fix modality worklists lookups if tags with UN (unknown) VR are present
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1867
diff
changeset
|
138 constraints_[tag] = NULL; |
| 1795 | 139 } |
|
1867
769178f0ab2c
Fix modality worklists server if some fields are null
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1797
diff
changeset
|
140 else if (value->IsNull() || |
|
769178f0ab2c
Fix modality worklists server if some fields are null
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1797
diff
changeset
|
141 value->GetContent().empty()) |
| 1795 | 142 { |
| 143 // This is an universal matcher | |
| 144 constraints_[tag] = NULL; | |
| 145 } | |
| 146 else | |
| 147 { | |
| 148 // DICOM specifies that searches must be case sensitive, except | |
| 149 // for tags with a PN value representation | |
| 150 bool sensitive = true; | |
|
2007
655489d9165d
DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2006
diff
changeset
|
151 if (vr == ValueRepresentation_PersonName) |
| 1795 | 152 { |
| 153 sensitive = caseSensitivePN; | |
| 154 } | |
| 155 | |
| 156 constraints_[tag] = IFindConstraint::ParseDicomConstraint(tag, value->GetContent(), sensitive); | |
| 157 } | |
| 158 } | |
| 159 } | |
| 160 } | |
| 161 | |
| 162 | |
| 163 std::string HierarchicalMatcher::Format(const std::string& prefix) const | |
| 164 { | |
| 165 std::string s; | |
| 166 | |
| 167 for (Constraints::const_iterator it = constraints_.begin(); | |
| 168 it != constraints_.end(); ++it) | |
| 169 { | |
| 170 s += prefix + it->first.Format() + " "; | |
| 171 | |
| 172 if (it->second == NULL) | |
| 173 { | |
| 174 s += "*\n"; | |
| 175 } | |
| 176 else | |
| 177 { | |
| 178 s += it->second->Format() + "\n"; | |
| 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 { |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
203 return MatchInternal(*dicom.GetDcmtkObject().getDataset(), |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
204 dicom.GetEncoding()); |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
205 } |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
206 |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
207 |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
208 bool HierarchicalMatcher::MatchInternal(DcmItem& item, |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
209 Encoding encoding) const |
|
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 for (Constraints::const_iterator it = constraints_.begin(); |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
212 it != constraints_.end(); ++it) |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
213 { |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
214 if (it->second != NULL) |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
215 { |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
216 DcmTagKey tag = ToDcmtkBridge::Convert(it->first); |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
217 |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
218 DcmElement* element = NULL; |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
219 if (!item.findAndGetElement(tag, element).good() || |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
220 element == NULL) |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
221 { |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
222 return false; |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
223 } |
|
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 std::auto_ptr<DicomValue> value(FromDcmtkBridge::ConvertLeafElement |
|
1929
cda5b0ab4ce5
ORTHANC_MAXIMUM_TAG_LENGTH made explicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
226 (*element, DicomToJsonFlags_None, |
|
cda5b0ab4ce5
ORTHANC_MAXIMUM_TAG_LENGTH made explicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
227 ORTHANC_MAXIMUM_TAG_LENGTH, encoding)); |
|
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
228 |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
229 if (value->IsNull() || |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
230 value->IsBinary() || |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
231 !it->second->Match(value->GetContent())) |
|
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 return false; |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
234 } |
|
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 } |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
237 |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
238 for (Sequences::const_iterator it = sequences_.begin(); |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
239 it != sequences_.end(); ++it) |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
240 { |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
241 if (it->second != NULL) |
|
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 DcmTagKey tag = ToDcmtkBridge::Convert(it->first); |
|
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 DcmSequenceOfItems* sequence = NULL; |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
246 if (!item.findAndGetSequence(tag, sequence).good() || |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
247 sequence == NULL) |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
248 { |
| 1891 | 249 continue; |
|
1796
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 bool match = false; |
|
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 for (unsigned long i = 0; i < sequence->card(); i++) |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
255 { |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
256 if (it->second->MatchInternal(*sequence->getItem(i), encoding)) |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
257 { |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
258 match = true; |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
259 break; |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
260 } |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
261 } |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
262 |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
263 if (!match) |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
264 { |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
265 return false; |
|
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 } |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
268 } |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
269 |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
270 return true; |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
271 } |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
272 |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
273 |
|
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
274 DcmDataset* HierarchicalMatcher::ExtractInternal(DcmItem& source, |
|
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
275 Encoding encoding) const |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
276 { |
|
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
277 std::auto_ptr<DcmDataset> target(new DcmDataset); |
|
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
278 |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
279 for (Constraints::const_iterator it = constraints_.begin(); |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
280 it != constraints_.end(); ++it) |
|
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 DcmTagKey tag = ToDcmtkBridge::Convert(it->first); |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
283 |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
284 DcmElement* element = NULL; |
|
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
285 if (source.findAndGetElement(tag, element).good() && |
|
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
286 element != NULL) |
|
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 std::auto_ptr<DcmElement> cloned(FromDcmtkBridge::CreateElementForTag(it->first)); |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
289 cloned->copyFrom(*element); |
|
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
290 target->insert(cloned.release()); |
|
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
291 } |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
292 } |
|
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 (Sequences::const_iterator it = sequences_.begin(); |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
295 it != sequences_.end(); ++it) |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
296 { |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
297 DcmTagKey tag = ToDcmtkBridge::Convert(it->first); |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
298 |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
299 DcmSequenceOfItems* sequence = NULL; |
|
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
300 if (source.findAndGetSequence(tag, sequence).good() && |
|
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
301 sequence != NULL) |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
302 { |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
303 std::auto_ptr<DcmSequenceOfItems> cloned(new DcmSequenceOfItems(tag)); |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
304 |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
305 for (unsigned long i = 0; i < sequence->card(); i++) |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
306 { |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
307 if (it->second == NULL) |
|
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 cloned->append(new DcmItem(*sequence->getItem(i))); |
|
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 else if (it->second->MatchInternal(*sequence->getItem(i), encoding)) // TODO Might be optimized |
|
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
312 { |
|
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
313 // It is necessary to encapsulate the child dataset into a |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
314 // "DcmItem" object before it can be included in a |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
315 // sequence. Otherwise, "dciodvfy" reports an error "Bad |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
316 // tag in sequence - Expecting Item or Sequence Delimiter." |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
317 std::auto_ptr<DcmDataset> child(it->second->ExtractInternal(*sequence->getItem(i), encoding)); |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
318 cloned->append(new DcmItem(*child)); |
|
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
319 } |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
320 } |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
321 |
|
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
322 target->insert(cloned.release()); |
|
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
323 } |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
324 } |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
325 |
|
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1796
diff
changeset
|
326 return target.release(); |
|
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
327 } |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
328 |
|
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 ParsedDicomFile* HierarchicalMatcher::Extract(ParsedDicomFile& dicom) const |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
331 { |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
332 std::auto_ptr<DcmDataset> dataset(ExtractInternal(*dicom.GetDcmtkObject().getDataset(), |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
333 dicom.GetEncoding())); |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
334 |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
335 std::auto_ptr<ParsedDicomFile> result(new ParsedDicomFile(*dataset)); |
|
2283
2a15186ca28a
more generic fix for issue 49
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2282
diff
changeset
|
336 result->SetEncoding(dicom.GetEncoding()); |
|
1796
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
337 |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
338 return result.release(); |
|
5e08a5fe6b27
HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
339 } |
| 1795 | 340 } |