Mercurial > hg > orthanc

annotate OrthancServer/Search/HierarchicalMatcher.cpp @ 1928:84c7eaeb5244

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configuration::GetDefaultEncoding
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 21 Mar 2016 14:12:31 +0100
parents b1291df2f780
children cda5b0ab4ce5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1795
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
1900
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1891
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1795
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 *
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 * This program is free software: you can redistribute it and/or
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * modify it under the terms of the GNU General Public License as
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * published by the Free Software Foundation, either version 3 of the
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * License, or (at your option) any later version.
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 *
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 * In addition, as a special exception, the copyright holders of this
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * program give permission to link the code of its release with the
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * that use the same license as the "OpenSSL" library), and distribute
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * the linked executables. You must obey the GNU General Public License
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * in all respects for all of the code used other than "OpenSSL". If you
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * modify file(s) with this exception, you may extend this exception to
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * your version of the file(s), but you are not obligated to do so. If
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 * you do not wish to do so, delete this exception statement from your
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 * version. If you delete this exception statement from all source files
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 * in the program, then also delete it here.
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 *
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 * This program is distributed in the hope that it will be useful, but
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 * WITHOUT ANY WARRANTY; without even the implied warranty of
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 * General Public License for more details.
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 *
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 * You should have received a copy of the GNU General Public License
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 **/
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 #include "../PrecompiledHeadersServer.h"
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 #include "HierarchicalMatcher.h"
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
1890
74dc6b764ff0 Fix modality worklists lookups if tags with UN (unknown) VR are present
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1867
diff changeset
36 #include "../../Core/Logging.h"
1795
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 #include "../../Core/OrthancException.h"
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 #include "../FromDcmtkBridge.h"
1796
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
39 #include "../ToDcmtkBridge.h"
1795
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 #include <dcmtk/dcmdata/dcfilefo.h>
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 namespace Orthanc
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 HierarchicalMatcher::HierarchicalMatcher(ParsedDicomFile& query,
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 bool caseSensitivePN)
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 Setup(*query.GetDcmtkObject().getDataset(),
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 caseSensitivePN,
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 query.GetEncoding());
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 HierarchicalMatcher::~HierarchicalMatcher()
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 for (Constraints::iterator it = constraints_.begin();
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 it != constraints_.end(); ++it)
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 if (it->second != NULL)
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 delete it->second;
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 for (Sequences::iterator it = sequences_.begin();
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 it != sequences_.end(); ++it)
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 if (it->second != NULL)
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 delete it->second;
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 void HierarchicalMatcher::Setup(DcmItem& dataset,
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 bool caseSensitivePN,
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 Encoding encoding)
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 for (unsigned long i = 0; i < dataset.card(); i++)
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 DcmElement* element = dataset.getElement(i);
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 if (element == NULL)
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 throw OrthancException(ErrorCode_InternalError);
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 DicomTag tag(FromDcmtkBridge::Convert(element->getTag()));
1796
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
89 if (tag == DICOM_TAG_SPECIFIC_CHARACTER_SET)
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
90 {
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
91 // Ignore this specific tag
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
1795
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 ValueRepresentation vr = FromDcmtkBridge::GetValueRepresentation(tag);
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 if (constraints_.find(tag) != constraints_.end() ||
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 sequences_.find(tag) != sequences_.end())
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 throw OrthancException(ErrorCode_BadRequest);
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 if (vr == ValueRepresentation_Sequence)
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(*element);
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 if (sequence.card() == 0 ||
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 (sequence.card() == 1 && sequence.getItem(0)->card() == 0))
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 // Universal matching of a sequence
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 sequences_[tag] = NULL;
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 else if (sequence.card() == 1)
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 sequences_[tag] = new HierarchicalMatcher(*sequence.getItem(0), caseSensitivePN, encoding);
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 else
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 throw OrthancException(ErrorCode_BadRequest);
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 else
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 std::auto_ptr<DicomValue> value(FromDcmtkBridge::ConvertLeafElement
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 (*element, DicomToJsonFlags_None, encoding));
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126
1867
769178f0ab2c Fix modality worklists server if some fields are null
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1797
diff changeset
127 if (value->IsBinary())
1795
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 {
1890
74dc6b764ff0 Fix modality worklists lookups if tags with UN (unknown) VR are present
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1867
diff changeset
129 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
130 {
74dc6b764ff0 Fix modality worklists lookups if tags with UN (unknown) VR are present
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1867
diff changeset
131 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
132 << 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
133 << "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
134 }
74dc6b764ff0 Fix modality worklists lookups if tags with UN (unknown) VR are present
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1867
diff changeset
135
74dc6b764ff0 Fix modality worklists lookups if tags with UN (unknown) VR are present
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1867
diff changeset
136 constraints_[tag] = NULL;
1795
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 }
1867
769178f0ab2c Fix modality worklists server if some fields are null
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1797
diff changeset
138 else if (value->IsNull() ||
769178f0ab2c Fix modality worklists server if some fields are null
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1797
diff changeset
139 value->GetContent().empty())
1795
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 // This is an universal matcher
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142 constraints_[tag] = NULL;
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 else
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 // DICOM specifies that searches must be case sensitive, except
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 // for tags with a PN value representation
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 bool sensitive = true;
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 if (vr == ValueRepresentation_PatientName)
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151 sensitive = caseSensitivePN;
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 constraints_[tag] = IFindConstraint::ParseDicomConstraint(tag, value->GetContent(), sensitive);
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 std::string HierarchicalMatcher::Format(const std::string& prefix) const
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 std::string s;
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165 for (Constraints::const_iterator it = constraints_.begin();
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166 it != constraints_.end(); ++it)
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 s += prefix + it->first.Format() + " ";
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170 if (it->second == NULL)
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172 s += "*\n";
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174 else
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176 s += it->second->Format() + "\n";
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 for (Sequences::const_iterator it = sequences_.begin();
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181 it != sequences_.end(); ++it)
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 s += prefix + it->first.Format() + " ";
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 if (it->second == NULL)
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187 s += "*\n";
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 else
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 {
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 s += "Sequence:\n" + it->second->Format(prefix + " ");
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 }
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195 return s;
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 }
1796
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
197
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
198
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
199 bool HierarchicalMatcher::Match(ParsedDicomFile& dicom) const
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 return MatchInternal(*dicom.GetDcmtkObject().getDataset(),
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
202 dicom.GetEncoding());
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
203 }
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
204
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 bool HierarchicalMatcher::MatchInternal(DcmItem& item,
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
207 Encoding encoding) const
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 for (Constraints::const_iterator it = constraints_.begin();
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
210 it != constraints_.end(); ++it)
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
211 {
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
212 if (it->second != NULL)
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 DcmTagKey tag = ToDcmtkBridge::Convert(it->first);
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 DcmElement* element = NULL;
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
217 if (!item.findAndGetElement(tag, element).good() ||
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
218 element == NULL)
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
219 {
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
220 return false;
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
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
223 std::auto_ptr<DicomValue> value(FromDcmtkBridge::ConvertLeafElement
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
224 (*element, DicomToJsonFlags_None, encoding));
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
225
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
226 if (value->IsNull() ||
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
227 value->IsBinary() ||
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
228 !it->second->Match(value->GetContent()))
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
229 {
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
230 return false;
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
231 }
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
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
235 for (Sequences::const_iterator it = sequences_.begin();
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
236 it != sequences_.end(); ++it)
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 if (it->second != NULL)
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 DcmTagKey tag = ToDcmtkBridge::Convert(it->first);
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
241
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
242 DcmSequenceOfItems* sequence = NULL;
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
243 if (!item.findAndGetSequence(tag, sequence).good() ||
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
244 sequence == NULL)
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
245 {
1891
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1890
diff changeset
246 continue;
1796
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
247 }
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 bool match = false;
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 for (unsigned long i = 0; i < sequence->card(); i++)
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
252 {
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
253 if (it->second->MatchInternal(*sequence->getItem(i), encoding))
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 match = true;
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
256 break;
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 }
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
259
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
260 if (!match)
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 return false;
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
263 }
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 }
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 return true;
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
1797
23722a191e4e worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1796
diff changeset
271 DcmDataset* HierarchicalMatcher::ExtractInternal(DcmItem& source,
1796
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
272 Encoding encoding) const
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 std::auto_ptr<DcmDataset> target(new DcmDataset);
1796
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
275
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
276 for (Constraints::const_iterator it = constraints_.begin();
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
277 it != constraints_.end(); ++it)
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 DcmTagKey tag = ToDcmtkBridge::Convert(it->first);
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 DcmElement* element = NULL;
1797
23722a191e4e worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1796
diff changeset
282 if (source.findAndGetElement(tag, element).good() &&
1796
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
283 element != NULL)
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
284 {
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
285 std::auto_ptr<DcmElement> cloned(FromDcmtkBridge::CreateElementForTag(it->first));
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
286 cloned->copyFrom(*element);
1797
23722a191e4e worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1796
diff changeset
287 target->insert(cloned.release());
1796
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
288 }
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
289 }
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
290
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
291 for (Sequences::const_iterator it = sequences_.begin();
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
292 it != sequences_.end(); ++it)
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 DcmTagKey tag = ToDcmtkBridge::Convert(it->first);
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 DcmSequenceOfItems* sequence = NULL;
1797
23722a191e4e worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1796
diff changeset
297 if (source.findAndGetSequence(tag, sequence).good() &&
1796
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
298 sequence != NULL)
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
299 {
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
300 std::auto_ptr<DcmSequenceOfItems> cloned(new DcmSequenceOfItems(tag));
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
301
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
302 for (unsigned long i = 0; i < sequence->card(); i++)
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
303 {
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
304 if (it->second == NULL)
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
305 {
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
306 cloned->append(new DcmItem(*sequence->getItem(i)));
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
307 }
1797
23722a191e4e worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1796
diff changeset
308 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
309 {
1797
23722a191e4e worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1796
diff changeset
310 // It is necessary to encapsulate the child dataset into a
23722a191e4e worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1796
diff changeset
311 // "DcmItem" object before it can be included in a
23722a191e4e worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1796
diff changeset
312 // sequence. Otherwise, "dciodvfy" reports an error "Bad
23722a191e4e worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1796
diff changeset
313 // tag in sequence - Expecting Item or Sequence Delimiter."
23722a191e4e worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1796
diff changeset
314 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
315 cloned->append(new DcmItem(*child));
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
1797
23722a191e4e worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1796
diff changeset
319 target->insert(cloned.release());
1796
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 }
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
322
1797
23722a191e4e worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1796
diff changeset
323 return target.release();
1796
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
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
326
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
327 ParsedDicomFile* HierarchicalMatcher::Extract(ParsedDicomFile& dicom) const
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 std::auto_ptr<DcmDataset> dataset(ExtractInternal(*dicom.GetDcmtkObject().getDataset(),
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
330 dicom.GetEncoding()));
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<ParsedDicomFile> result(new ParsedDicomFile(*dataset));
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
333 result->SetEncoding(Encoding_Utf8);
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 return result.release();
5e08a5fe6b27 HierarchicalMatcher - extracting tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
336 }
1795
af6840eb23ee HierarchicalMatcher
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
337 }