Mercurial > hg > orthanc

annotate OrthancFramework/Sources/DicomParsing/ParsedDicomDir.cpp @ 4136:2724977419fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix DICOM SCP filters if some query tag has more than 256 characters
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 06 Aug 2020 15:55:03 +0200
parents bf7b9edf6b81
children 6774605d4341
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3554
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
3640
94f4a18a79cc upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3555
diff changeset
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
3554
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
4119
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
8 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
10 * the License, or (at your option) any later version.
3554
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
15 * Lesser General Public License for more details.
3554
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 *
4119
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
18 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
19 * <http://www.gnu.org/licenses/>.
3554
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 **/
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 #include "../PrecompiledHeaders.h"
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 #include "ParsedDicomDir.h"
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25
3712
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
26 #include "../Compatibility.h"
3554
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 #include "../OrthancException.h"
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 #include "ParsedDicomFile.h"
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 #include "FromDcmtkBridge.h"
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 #include <dcmtk/dcmdata/dcdeftag.h>
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 namespace Orthanc
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 void ParsedDicomDir::Clear()
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 for (size_t i = 0; i < content_.size(); i++)
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 assert(content_[i] != NULL);
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 delete content_[i];
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 bool ParsedDicomDir::LookupIndexOfOffset(size_t& target,
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 unsigned int offset) const
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 if (offset == 0)
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 return false;
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 OffsetToIndex::const_iterator found = offsetToIndex_.find(offset);
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 if (found == offsetToIndex_.end())
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 // Error in the algorithm that computes the offsets
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 throw OrthancException(ErrorCode_InternalError);
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 else
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 target = found->second;
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 return true;
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 ParsedDicomDir::ParsedDicomDir(const std::string content)
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 ParsedDicomFile dicom(content);
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 DcmSequenceOfItems* sequence = NULL;
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 if (dicom.GetDcmtkObject().getDataset() == NULL ||
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 !dicom.GetDcmtkObject().getDataset()->findAndGetSequence(DCM_DirectoryRecordSequence, sequence).good() ||
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 sequence == NULL)
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 throw OrthancException(ErrorCode_BadFileFormat, "Not a DICOMDIR");
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 content_.resize(sequence->card());
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 nextOffsets_.resize(content_.size());
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 lowerOffsets_.resize(content_.size());
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 // Manually reconstruct the list of all the available offsets of
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 // "DcmItem", as "fStartPosition" is a protected member in DCMTK
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 // API
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 std::set<uint32_t> availableOffsets;
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 availableOffsets.insert(0);
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 for (unsigned long i = 0; i < sequence->card(); i++)
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 DcmItem* item = sequence->getItem(i);
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 if (item == NULL)
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96 Clear();
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 throw OrthancException(ErrorCode_InternalError);
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99
3555
99cd59fe8c5c fix for msvc
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3554
diff changeset
100 Uint32 next, lower;
3554
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 if (!item->findAndGetUint32(DCM_OffsetOfTheNextDirectoryRecord, next).good() ||
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 !item->findAndGetUint32(DCM_OffsetOfReferencedLowerLevelDirectoryEntity, lower).good())
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 item->writeXML(std::cout);
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 throw OrthancException(ErrorCode_BadFileFormat,
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 "Missing offsets in DICOMDIR");
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 nextOffsets_[i] = next;
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 lowerOffsets_[i] = lower;
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111
3712
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
112 std::unique_ptr<DicomMap> entry(new DicomMap);
4136
2724977419fb Fix DICOM SCP filters if some query tag has more than 256 characters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4119
diff changeset
113 FromDcmtkBridge::ExtractDicomSummary(*entry, *item, 0 /* don't truncate tags */);
3554
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 if (next != 0)
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 availableOffsets.insert(next);
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 if (lower != 0)
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 availableOffsets.insert(lower);
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 content_[i] = entry.release();
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 if (content_.size() != availableOffsets.size())
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 throw OrthancException(ErrorCode_BadFileFormat,
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 "Inconsistent offsets in DICOMDIR");
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 unsigned int index = 0;
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 for (std::set<uint32_t>::const_iterator it = availableOffsets.begin();
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 it != availableOffsets.end(); ++it)
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 offsetToIndex_[*it] = index;
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 index ++;
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 const DicomMap& ParsedDicomDir::GetItem(size_t i) const
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 if (i >= content_.size())
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 throw OrthancException(ErrorCode_ParameterOutOfRange);
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150 else
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 assert(content_[i] != NULL);
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 return *content_[i];
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 bool ParsedDicomDir::LookupNext(size_t& target,
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159 size_t index) const
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 if (index >= nextOffsets_.size())
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 throw OrthancException(ErrorCode_ParameterOutOfRange);
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165 else
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167 return LookupIndexOfOffset(target, nextOffsets_[index]);
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172 bool ParsedDicomDir::LookupLower(size_t& target,
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 size_t index) const
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175 if (index >= lowerOffsets_.size())
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177 throw OrthancException(ErrorCode_ParameterOutOfRange);
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179 else
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 {
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181 return LookupIndexOfOffset(target, lowerOffsets_[index]);
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 }
8fe89c2ea593 new class: ParsedDicomDir
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 }