Mercurial > hg > orthanc

comparison OrthancFramework/Sources/DicomNetworking/DicomFindAnswers.cpp @ 4729:4e2247df6327

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added "Short" and "Full" options in /modalities/id/find-worklist
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 25 Jun 2021 10:41:35 +0200
parents d9473bd5ed43
children 7053502fbf97
comparison
equal deleted inserted replaced
4728:b5ca12bfce8c 4729:4e2247df6327
195 } 195 }
196 196
197 197
198 void DicomFindAnswers::ToJson(Json::Value& target, 198 void DicomFindAnswers::ToJson(Json::Value& target,
199 size_t index, 199 size_t index,
200 bool simplify) const 200 DicomToJsonFormat format) const
201 { 201 {
202 DicomToJsonFormat format = (simplify ? DicomToJsonFormat_Human : DicomToJsonFormat_Full);
203
204 const ParsedDicomFile& answer = GetAnswer(index); 202 const ParsedDicomFile& answer = GetAnswer(index);
205 answer.DatasetToJson(target, format, DicomToJsonFlags_None, 0); 203 answer.DatasetToJson(target, format, DicomToJsonFlags_None, 0);
206 } 204 }
207 205
208 206
209 void DicomFindAnswers::ToJson(Json::Value& target, 207 void DicomFindAnswers::ToJson(Json::Value& target,
210 bool simplify) const 208 DicomToJsonFormat format) const
211 { 209 {
212 target = Json::arrayValue; 210 target = Json::arrayValue;
213 211
214 for (size_t i = 0; i < GetSize(); i++) 212 for (size_t i = 0; i < GetSize(); i++)
215 { 213 {
216 Json::Value answer; 214 Json::Value answer;
217 ToJson(answer, i, simplify); 215 ToJson(answer, i, format);
218 target.append(answer); 216 target.append(answer);
219 } 217 }
220 } 218 }
221 219
222 220
234 #if ORTHANC_BUILDING_FRAMEWORK_LIBRARY == 1 232 #if ORTHANC_BUILDING_FRAMEWORK_LIBRARY == 1
235 void DicomFindAnswers::Add(ParsedDicomFile& dicom) 233 void DicomFindAnswers::Add(ParsedDicomFile& dicom)
236 { 234 {
237 return Add(const_cast<const ParsedDicomFile&>(dicom)); 235 return Add(const_cast<const ParsedDicomFile&>(dicom));
238 } 236 }
237
238 void DicomFindAnswers::ToJson(Json::Value& target,
239 size_t index,
240 bool simplify) const
241 {
242 DicomToJsonFormat format = (simplify ? DicomToJsonFormat_Human : DicomToJsonFormat_Full);
243 ToJson(target, index, format);
244 }
245
246
247 void DicomFindAnswers::ToJson(Json::Value& target,
248 bool simplify) const
249 {
250 DicomToJsonFormat format = (simplify ? DicomToJsonFormat_Human : DicomToJsonFormat_Full);
251 ToJson(target, format);
252 }
239 #endif 253 #endif
240 } 254 }