Mercurial > hg > orthanc
diff OrthancFramework/Sources/DicomNetworking/DicomFindAnswers.cpp @ 4729:4e2247df6327
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 |
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomNetworking/DicomFindAnswers.cpp Fri Jun 25 09:12:49 2021 +0200 +++ b/OrthancFramework/Sources/DicomNetworking/DicomFindAnswers.cpp Fri Jun 25 10:41:35 2021 +0200 @@ -197,24 +197,22 @@ void DicomFindAnswers::ToJson(Json::Value& target, size_t index, - bool simplify) const + DicomToJsonFormat format) const { - DicomToJsonFormat format = (simplify ? DicomToJsonFormat_Human : DicomToJsonFormat_Full); - const ParsedDicomFile& answer = GetAnswer(index); answer.DatasetToJson(target, format, DicomToJsonFlags_None, 0); } void DicomFindAnswers::ToJson(Json::Value& target, - bool simplify) const + DicomToJsonFormat format) const { target = Json::arrayValue; for (size_t i = 0; i < GetSize(); i++) { Json::Value answer; - ToJson(answer, i, simplify); + ToJson(answer, i, format); target.append(answer); } } @@ -236,5 +234,21 @@ { return Add(const_cast<const ParsedDicomFile&>(dicom)); } + + void DicomFindAnswers::ToJson(Json::Value& target, + size_t index, + bool simplify) const + { + DicomToJsonFormat format = (simplify ? DicomToJsonFormat_Human : DicomToJsonFormat_Full); + ToJson(target, index, format); + } + + + void DicomFindAnswers::ToJson(Json::Value& target, + bool simplify) const + { + DicomToJsonFormat format = (simplify ? DicomToJsonFormat_Human : DicomToJsonFormat_Full); + ToJson(target, format); + } #endif }