Mercurial > hg > orthanc

comparison OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp @ 4055:9214e3a7b0a2 framework

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 11 Jun 2020 12:52:09 +0200
parents 05b8fd21089c
children d6362b2c4b61
comparison
equal deleted inserted replaced
4054:9c37896a4457 4055:9214e3a7b0a2
72 DicomToJsonFormat mode) 72 DicomToJsonFormat mode)
73 { 73 {
74 if (mode != DicomToJsonFormat_Full) 74 if (mode != DicomToJsonFormat_Full)
75 { 75 {
76 Json::Value simplified; 76 Json::Value simplified;
77 ServerToolbox::SimplifyTags(simplified, dicom, mode); 77 Toolbox::SimplifyDicomAsJson(simplified, dicom, mode);
78 call.GetOutput().AnswerJson(simplified); 78 call.GetOutput().AnswerJson(simplified);
79 } 79 }
80 else 80 else
81 { 81 {
82 call.GetOutput().AnswerJson(dicom); 82 call.GetOutput().AnswerJson(dicom);
1903 context.ReadDicomAsJson(full, *it, ignoreTagLength); 1903 context.ReadDicomAsJson(full, *it, ignoreTagLength);
1904 1904
1905 if (format != DicomToJsonFormat_Full) 1905 if (format != DicomToJsonFormat_Full)
1906 { 1906 {
1907 Json::Value simplified; 1907 Json::Value simplified;
1908 ServerToolbox::SimplifyTags(simplified, full, format); 1908 Toolbox::SimplifyDicomAsJson(simplified, full, format);
1909 result[*it] = simplified; 1909 result[*it] = simplified;
1910 } 1910 }
1911 else 1911 else
1912 { 1912 {
1913 result[*it] = full; 1913 result[*it] = full;