Mercurial > hg > orthanc-webviewer

comparison Plugin/DecodedImageAdapter.cpp @ 97:ef1b27ba7dfc refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove class "ParsedDicomFile"
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 27 Nov 2015 18:30:16 +0100
parents a6ba21a083e5
children 46ec13a1177c
comparison
equal deleted inserted replaced
96:a6ba21a083e5 97:ef1b27ba7dfc
23 #include "../Orthanc/Core/Images/ImageBuffer.h" 23 #include "../Orthanc/Core/Images/ImageBuffer.h"
24 #include "../Orthanc/Core/Images/ImageProcessing.h" 24 #include "../Orthanc/Core/Images/ImageProcessing.h"
25 #include "../Orthanc/Core/OrthancException.h" 25 #include "../Orthanc/Core/OrthancException.h"
26 #include "../Orthanc/Plugins/Samples/GdcmDecoder/OrthancImageWrapper.h" 26 #include "../Orthanc/Plugins/Samples/GdcmDecoder/OrthancImageWrapper.h"
27 #include "../Orthanc/Resources/ThirdParty/base64/base64.h" 27 #include "../Orthanc/Resources/ThirdParty/base64/base64.h"
28 #include "ParsedDicomImage.h"
29 #include "ViewerToolbox.h" 28 #include "ViewerToolbox.h"
30 29
31 #include <boost/lexical_cast.hpp> 30 #include <boost/lexical_cast.hpp>
32 #include <boost/algorithm/string/predicate.hpp> 31 #include <boost/algorithm/string/predicate.hpp>
33 #include <json/writer.h> 32 #include <json/writer.h>
90 } 89 }
91 90
92 91
93 bool ok = false; 92 bool ok = false;
94 93
95 #if 1
96 Json::Value tags; 94 Json::Value tags;
97 std::string dicom; 95 std::string dicom;
98 if (!GetStringFromOrthanc(dicom, context_, "/instances/" + instanceId + "/file") || 96 if (!GetStringFromOrthanc(dicom, context_, "/instances/" + instanceId + "/file") ||
99 !GetJsonFromOrthanc(tags, context_, "/instances/" + instanceId + "/tags")) 97 !GetJsonFromOrthanc(tags, context_, "/instances/" + instanceId + "/tags"))
100 { 98 {
113 else if (type == CompressionType_Jpeg) 111 else if (type == CompressionType_Jpeg)
114 { 112 {
115 ok = EncodeUsingJpeg(json, *image, level); 113 ok = EncodeUsingJpeg(json, *image, level);
116 } 114 }
117 } 115 }
118
119 #else
120
121 ParsedDicomImage image(context_, instanceId);
122
123 Json::Value json;
124
125 if (type == CompressionType_Deflate)
126 {
127 ok = image.EncodeUsingDeflate(json, 9);
128 }
129 else if (type == CompressionType_Jpeg)
130 {
131 ok = image.EncodeUsingJpeg(json, level);
132 }
133 #endif
134 116
135 if (ok) 117 if (ok)
136 { 118 {
137 Json::FastWriter writer; 119 Json::FastWriter writer;
138 content = writer.write(json); 120 content = writer.write(json);