Mercurial > hg > orthanc
annotate OrthancServer/DicomProtocol/DicomFindAnswers.cpp @ 1806:cd213ebcaefd
UnknownSopClassAccepted option
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 23 Nov 2015 15:24:39 +0100 |
| parents | 23722a191e4e |
| children | 559956d5ceb2 |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 62 | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics |
|
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
| 0 | 5 * |
| 6 * This program is free software: you can redistribute it and/or | |
| 7 * modify it under the terms of the GNU General Public License as | |
| 8 * published by the Free Software Foundation, either version 3 of the | |
| 9 * License, or (at your option) any later version. | |
| 136 | 10 * |
| 11 * In addition, as a special exception, the copyright holders of this | |
| 12 * program give permission to link the code of its release with the | |
| 13 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 14 * that use the same license as the "OpenSSL" library), and distribute | |
| 15 * the linked executables. You must obey the GNU General Public License | |
| 16 * in all respects for all of the code used other than "OpenSSL". If you | |
| 17 * modify file(s) with this exception, you may extend this exception to | |
| 18 * your version of the file(s), but you are not obligated to do so. If | |
| 19 * you do not wish to do so, delete this exception statement from your | |
| 20 * version. If you delete this exception statement from all source files | |
| 21 * in the program, then also delete it here. | |
| 0 | 22 * |
| 23 * This program is distributed in the hope that it will be useful, but | |
| 24 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 26 * General Public License for more details. | |
| 27 * | |
| 28 * You should have received a copy of the GNU General Public License | |
| 29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 30 **/ | |
| 31 | |
| 32 | |
|
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
33 #include "../PrecompiledHeadersServer.h" |
| 0 | 34 #include "DicomFindAnswers.h" |
| 35 | |
| 36 #include "../FromDcmtkBridge.h" | |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
37 #include "../ToDcmtkBridge.h" |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
38 #include "../../Core/OrthancException.h" |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
39 |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
40 #include <memory> |
| 1789 | 41 #include <dcmtk/dcmdata/dcfilefo.h> |
| 42 | |
| 0 | 43 |
| 62 | 44 namespace Orthanc |
| 0 | 45 { |
| 1789 | 46 class DicomFindAnswers::Answer |
| 47 { | |
| 48 private: | |
| 49 ParsedDicomFile* dicom_; | |
| 50 DicomMap* map_; | |
|
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
51 |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
52 void CleanupDicom() |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
53 { |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
54 if (dicom_ != NULL) |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
55 { |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
56 dicom_->Remove(DICOM_TAG_MEDIA_STORAGE_SOP_INSTANCE_UID); |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
57 dicom_->Remove(DICOM_TAG_SOP_INSTANCE_UID); |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
58 } |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
59 } |
|
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
60 |
| 1789 | 61 public: |
| 62 Answer(ParsedDicomFile& dicom) : | |
| 63 dicom_(dicom.Clone()), | |
| 64 map_(NULL) | |
| 65 { | |
|
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
66 CleanupDicom(); |
| 1789 | 67 } |
| 68 | |
| 69 Answer(const char* dicom, | |
| 70 size_t size) : | |
| 71 dicom_(new ParsedDicomFile(dicom, size)), | |
| 72 map_(NULL) | |
| 73 { | |
|
1797
23722a191e4e
worklists are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
74 CleanupDicom(); |
| 1789 | 75 } |
| 76 | |
| 77 Answer(const DicomMap& map) : | |
| 78 dicom_(NULL), | |
| 79 map_(map.Clone()) | |
| 80 { | |
| 81 } | |
| 82 | |
| 83 ~Answer() | |
| 84 { | |
| 85 if (dicom_ != NULL) | |
| 86 { | |
| 87 delete dicom_; | |
| 88 } | |
| 89 | |
| 90 if (map_ != NULL) | |
| 91 { | |
| 92 delete map_; | |
| 93 } | |
| 94 } | |
| 95 | |
| 96 ParsedDicomFile& GetDicomFile() | |
| 97 { | |
| 98 if (dicom_ == NULL) | |
| 99 { | |
| 100 assert(map_ != NULL); | |
| 101 dicom_ = new ParsedDicomFile(*map_); | |
| 102 } | |
| 103 | |
| 104 return *dicom_; | |
| 105 } | |
| 106 | |
| 107 DcmDataset* ExtractDcmDataset() const | |
| 108 { | |
| 109 if (dicom_ != NULL) | |
| 110 { | |
| 111 return new DcmDataset(*dicom_->GetDcmtkObject().getDataset()); | |
| 112 } | |
| 113 else | |
| 114 { | |
| 115 assert(map_ != NULL); | |
| 116 return ToDcmtkBridge::Convert(*map_); | |
| 117 } | |
| 118 } | |
| 119 }; | |
| 120 | |
| 121 | |
| 0 | 122 void DicomFindAnswers::Clear() |
| 123 { | |
| 1789 | 124 for (size_t i = 0; i < answers_.size(); i++) |
| 0 | 125 { |
| 1789 | 126 assert(answers_[i] != NULL); |
| 127 delete answers_[i]; | |
| 0 | 128 } |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
129 |
| 1789 | 130 answers_.clear(); |
| 0 | 131 } |
| 132 | |
| 1789 | 133 |
| 0 | 134 void DicomFindAnswers::Reserve(size_t size) |
| 135 { | |
| 1789 | 136 if (size > answers_.size()) |
| 0 | 137 { |
| 1789 | 138 answers_.reserve(size); |
| 0 | 139 } |
| 140 } | |
| 141 | |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
142 |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
143 void DicomFindAnswers::Add(const DicomMap& map) |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
144 { |
| 1789 | 145 answers_.push_back(new Answer(map)); |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
146 } |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
147 |
| 1789 | 148 |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
149 void DicomFindAnswers::Add(ParsedDicomFile& dicom) |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
150 { |
| 1789 | 151 answers_.push_back(new Answer(dicom)); |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
152 } |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
153 |
| 1789 | 154 |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
155 void DicomFindAnswers::Add(const char* dicom, |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
156 size_t size) |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
157 { |
| 1789 | 158 answers_.push_back(new Answer(dicom, size)); |
| 159 } | |
| 160 | |
| 161 | |
| 162 DicomFindAnswers::Answer& DicomFindAnswers::GetAnswerInternal(size_t index) const | |
| 163 { | |
| 164 if (index < answers_.size()) | |
| 165 { | |
| 166 return *answers_.at(index); | |
| 167 } | |
| 168 else | |
| 169 { | |
| 170 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 171 } | |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
172 } |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
173 |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
174 |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
175 ParsedDicomFile& DicomFindAnswers::GetAnswer(size_t index) const |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
176 { |
| 1789 | 177 return GetAnswerInternal(index).GetDicomFile(); |
| 178 } | |
| 179 | |
| 180 | |
| 181 DcmDataset* DicomFindAnswers::ExtractDcmDataset(size_t index) const | |
| 182 { | |
| 183 return GetAnswerInternal(index).ExtractDcmDataset(); | |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
184 } |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
185 |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
186 |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
187 void DicomFindAnswers::ToJson(Json::Value& target, |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
188 size_t index, |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
189 bool simplify) const |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
190 { |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
191 DicomToJsonFormat format = (simplify ? DicomToJsonFormat_Simple : DicomToJsonFormat_Full); |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
192 GetAnswer(index).ToJson(target, format, DicomToJsonFlags_None, 0); |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
193 } |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
194 |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
195 |
| 1368 | 196 void DicomFindAnswers::ToJson(Json::Value& target, |
| 197 bool simplify) const | |
| 0 | 198 { |
| 199 target = Json::arrayValue; | |
| 200 | |
| 201 for (size_t i = 0; i < GetSize(); i++) | |
| 202 { | |
|
1787
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
203 Json::Value answer; |
|
1b1d5470233f
refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1368
diff
changeset
|
204 ToJson(answer, i, simplify); |
| 0 | 205 target.append(answer); |
| 206 } | |
| 207 } | |
| 208 } |