Mercurial > hg > orthanc
comparison OrthancServer/Plugins/Engine/OrthancPlugins.cpp @ 4504:7d1eabfac6e0
removed cached dicom-as-json from DicomInstanceToStore
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 10 Feb 2021 11:29:53 +0100 |
parents | 7b99e8bb8246 |
children | b4c58795f3a8 |
comparison
equal
deleted
inserted
replaced
4503:b525e0c3cff0 | 4504:7d1eabfac6e0 |
---|---|
2930 return; | 2930 return; |
2931 | 2931 |
2932 case _OrthancPluginService_GetInstanceJson: | 2932 case _OrthancPluginService_GetInstanceJson: |
2933 case _OrthancPluginService_GetInstanceSimplifiedJson: | 2933 case _OrthancPluginService_GetInstanceSimplifiedJson: |
2934 { | 2934 { |
2935 Json::Value dicomAsJson; | |
2936 OrthancConfiguration::DefaultDicomDatasetToJson(dicomAsJson, instance.GetParsedDicomFile()); | |
2937 | |
2935 std::string s; | 2938 std::string s; |
2936 | 2939 |
2937 if (service == _OrthancPluginService_GetInstanceJson) | 2940 if (service == _OrthancPluginService_GetInstanceJson) |
2938 { | 2941 { |
2939 Toolbox::WriteStyledJson(s, instance.GetJson()); | 2942 Toolbox::WriteStyledJson(s, dicomAsJson); |
2940 } | 2943 } |
2941 else | 2944 else |
2942 { | 2945 { |
2943 Json::Value simplified; | 2946 Json::Value simplified; |
2944 Toolbox::SimplifyDicomAsJson(simplified, instance.GetJson(), DicomToJsonFormat_Human); | 2947 Toolbox::SimplifyDicomAsJson(simplified, dicomAsJson, DicomToJsonFormat_Human); |
2945 Toolbox::WriteStyledJson(s, simplified); | 2948 Toolbox::WriteStyledJson(s, simplified); |
2946 } | 2949 } |
2947 | 2950 |
2948 *p.resultStringToFree = CopyString(s); | 2951 *p.resultStringToFree = CopyString(s); |
2949 return; | 2952 return; |