annotate Plugin/DecodedImageAdapter.cpp @ 159:5dc54316d68b

shared copyright with osimis
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 04 Jan 2017 16:41:43 +0100
parents d850500b8ca6
children b0910ae2ace5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
122
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 103
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
159
5dc54316d68b shared copyright with osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
5 * Copyright (C) 2017 Osimis, Belgium
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * modify it under the terms of the GNU Affero General Public License
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * the License, or (at your option) any later version.
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * Affero General Public License for more details.
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 *
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * You should have received a copy of the GNU Affero General Public License
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 **/
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 #include "DecodedImageAdapter.h"
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
24 #include "../Orthanc/Core/Images/ImageBuffer.h"
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
25 #include "../Orthanc/Core/Images/ImageProcessing.h"
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
26 #include "../Orthanc/Core/OrthancException.h"
102
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
27 #include "../Orthanc/Core/Toolbox.h"
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
28 #include "../Orthanc/Plugins/Samples/GdcmDecoder/OrthancImageWrapper.h"
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
29 #include "../Orthanc/Resources/ThirdParty/base64/base64.h"
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 #include "ViewerToolbox.h"
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 #include <boost/lexical_cast.hpp>
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 #include <boost/algorithm/string/predicate.hpp>
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 #include <json/writer.h>
99
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
35 #include <boost/regex.hpp>
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36
103
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 102
diff changeset
37
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 namespace OrthancPlugins
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 {
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 bool DecodedImageAdapter::ParseUri(CompressionType& type,
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 uint8_t& compressionLevel,
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 std::string& instanceId,
99
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
43 unsigned int& frameIndex,
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 const std::string& uri)
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 {
99
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
46 boost::regex pattern("^([a-z0-9]+)-([a-z0-9-]+)_([0-9]+)$");
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
47
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
48 boost::cmatch what;
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
49 if (!regex_match(uri.c_str(), what, pattern))
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 {
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 return false;
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 }
99
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
53
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
54 std::string compression(what[1]);
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
55 instanceId = what[2];
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
56 frameIndex = boost::lexical_cast<unsigned int>(what[3]);
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 if (compression == "deflate")
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 {
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 type = CompressionType_Deflate;
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 }
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 else if (boost::starts_with(compression, "jpeg"))
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 {
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 type = CompressionType_Jpeg;
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 int level = boost::lexical_cast<int>(compression.substr(4));
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 if (level <= 0 || level > 100)
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 {
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 return false;
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 }
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 compressionLevel = static_cast<uint8_t>(level);
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 }
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 else
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 {
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 return false;
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 }
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 return true;
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 }
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 bool DecodedImageAdapter::Create(std::string& content,
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 const std::string& uri)
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 {
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 std::string message = "Decoding DICOM instance: " + uri;
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 OrthancPluginLogInfo(context_, message.c_str());
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 CompressionType type;
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 uint8_t level;
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 std::string instanceId;
99
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
92 unsigned int frameIndex;
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93
99
46ec13a1177c use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
94 if (!ParseUri(type, level, instanceId, frameIndex, uri))
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 {
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96 return false;
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 }
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
99
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
100 bool ok = false;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
101
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
102 Json::Value tags;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
103 std::string dicom;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
104 if (!GetStringFromOrthanc(dicom, context_, "/instances/" + instanceId + "/file") ||
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
105 !GetJsonFromOrthanc(tags, context_, "/instances/" + instanceId + "/tags"))
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
106 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
107 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
108 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
109
102
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
110 std::auto_ptr<OrthancImageWrapper> image(new OrthancImageWrapper(context_, OrthancPluginDecodeDicomImage(context_, dicom.c_str(), dicom.size(), frameIndex)));
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
111
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
112 Json::Value json;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
113 if (GetCornerstoneMetadata(json, tags, *image))
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
114 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
115 if (type == CompressionType_Deflate)
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
116 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
117 ok = EncodeUsingDeflate(json, *image, 9);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
118 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
119 else if (type == CompressionType_Jpeg)
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
120 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
121 ok = EncodeUsingJpeg(json, *image, level);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
122 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
123 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
124
31
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
125 if (ok)
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
126 {
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
127 Json::FastWriter writer;
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
128 content = writer.write(json);
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
129 return true;
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 }
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 else
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 {
31
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
133 char msg[1024];
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
134 sprintf(msg, "Unable to decode the following instance: %s", uri.c_str());
111689a2c177 fix issue 29
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
135 OrthancPluginLogWarning(context_, msg);
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 return false;
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 }
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 }
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
139
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
140
102
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
141 static bool GetStringTag(std::string& value,
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
142 const Json::Value& tags,
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
143 const std::string& tag)
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
144 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
145 if (tags.type() == Json::objectValue &&
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
146 tags.isMember(tag) &&
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
147 tags[tag].type() == Json::objectValue &&
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
148 tags[tag].isMember("Type") &&
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
149 tags[tag].isMember("Value") &&
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
150 tags[tag]["Type"].type() == Json::stringValue &&
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
151 tags[tag]["Value"].type() == Json::stringValue &&
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
152 tags[tag]["Type"].asString() == "String")
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
153 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
154 value = tags[tag]["Value"].asString();
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
155 return true;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
156 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
157 else
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
158 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
159 return false;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
160 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
161 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
162
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
163
102
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
164 static float GetFloatTag(const Json::Value& tags,
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
165 const std::string& tag,
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
166 float defaultValue)
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
167 {
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
168 std::string tmp;
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
169 if (GetStringTag(tmp, tags, tag))
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
170 {
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
171 try
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
172 {
103
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 102
diff changeset
173 return boost::lexical_cast<float>(Orthanc::Toolbox::StripSpaces(tmp));
102
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
174 }
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
175 catch (boost::bad_lexical_cast&)
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
176 {
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
177 }
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
178 }
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
179
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
180 return defaultValue;
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
181 }
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
182
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
183
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
184
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
185 bool DecodedImageAdapter::GetCornerstoneMetadata(Json::Value& result,
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
186 const Json::Value& tags,
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
187 OrthancImageWrapper& image)
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
188 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
189 using namespace Orthanc;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
190
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
191 float windowCenter, windowWidth;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
192
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
193 Orthanc::ImageAccessor accessor;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
194 accessor.AssignReadOnly(OrthancPlugins::Convert(image.GetFormat()), image.GetWidth(),
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
195 image.GetHeight(), image.GetPitch(), image.GetBuffer());
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
196
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
197 switch (accessor.GetFormat())
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
198 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
199 case PixelFormat_Grayscale8:
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
200 case PixelFormat_Grayscale16:
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
201 case PixelFormat_SignedGrayscale16:
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
202 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
203 int64_t a, b;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
204 Orthanc::ImageProcessing::GetMinMaxValue(a, b, accessor);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
205 result["minPixelValue"] = (a < 0 ? static_cast<int32_t>(a) : 0);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
206 result["maxPixelValue"] = (b > 0 ? static_cast<int32_t>(b) : 1);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
207 result["color"] = false;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
208
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
209 windowCenter = static_cast<float>(a + b) / 2.0f;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
210
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
211 if (a == b)
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
212 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
213 windowWidth = 256.0f; // Arbitrary value
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
214 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
215 else
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
216 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
217 windowWidth = static_cast<float>(b - a) / 2.0f;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
218 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
219
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
220 break;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
221 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
222
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
223 case PixelFormat_RGB24:
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
224 result["minPixelValue"] = 0;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
225 result["maxPixelValue"] = 255;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
226 result["color"] = true;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
227 windowCenter = 127.5f;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
228 windowWidth = 256.0f;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
229 break;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
230
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
231 default:
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
232 return false;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
233 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
234
102
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
235 float slope = GetFloatTag(tags, "0028,1053", 1.0f);
103
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 102
diff changeset
236 float intercept = GetFloatTag(tags, "0028,1052", 0.0f);
102
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
237
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
238 result["slope"] = slope;
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
239 result["intercept"] = intercept;
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
240 result["rows"] = image.GetHeight();
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
241 result["columns"] = image.GetWidth();
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
242 result["height"] = image.GetHeight();
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
243 result["width"] = image.GetWidth();
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
244
102
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
245 bool ok = false;
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
246 std::string pixelSpacing;
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
247 if (GetStringTag(pixelSpacing, tags, "0028,0030"))
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
248 {
102
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
249 std::vector<std::string> tokens;
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
250 Orthanc::Toolbox::TokenizeString(tokens, pixelSpacing, '\\');
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
251
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
252 if (tokens.size() >= 2)
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
253 {
102
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
254 try
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
255 {
103
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 102
diff changeset
256 result["columnPixelSpacing"] = boost::lexical_cast<float>(Orthanc::Toolbox::StripSpaces(tokens[1]));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 102
diff changeset
257 result["rowPixelSpacing"] = boost::lexical_cast<float>(Orthanc::Toolbox::StripSpaces(tokens[0]));
102
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
258 ok = true;
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
259 }
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
260 catch (boost::bad_lexical_cast&)
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
261 {
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
262 }
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
263 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
264 }
102
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
265
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
266 if (!ok)
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
267 {
102
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
268 result["columnPixelSpacing"] = 1.0f;
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
269 result["rowPixelSpacing"] = 1.0f;
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
270 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
271
102
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
272 result["windowCenter"] = GetFloatTag(tags, "0028,1050", windowCenter * slope + intercept);
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
273 result["windowWidth"] = GetFloatTag(tags, "0028,1051", windowWidth * slope);
21123729ac71 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 101
diff changeset
274
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
275 return true;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
276 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
277
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
278
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
279
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
280 bool DecodedImageAdapter::EncodeUsingDeflate(Json::Value& result,
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
281 OrthancImageWrapper& image,
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
282 uint8_t compressionLevel /* between 0 and 9 */)
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
283 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
284 Orthanc::ImageAccessor accessor;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
285 accessor.AssignReadOnly(OrthancPlugins::Convert(image.GetFormat()), image.GetWidth(),
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
286 image.GetHeight(), image.GetPitch(), image.GetBuffer());
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
287
145
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
288 std::auto_ptr<Orthanc::ImageBuffer> buffer;
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
289
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
290 Orthanc::ImageAccessor converted;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
291
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
292 switch (accessor.GetFormat())
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
293 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
294 case Orthanc::PixelFormat_RGB24:
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
295 converted = accessor;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
296 break;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
297
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
298 case Orthanc::PixelFormat_Grayscale8:
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
299 case Orthanc::PixelFormat_Grayscale16:
145
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
300 buffer.reset(new Orthanc::ImageBuffer(Orthanc::PixelFormat_Grayscale16,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
301 accessor.GetWidth(),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
302 accessor.GetHeight(),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
303 true /* force minimal pitch */));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
304 converted = buffer->GetAccessor();
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
305 Orthanc::ImageProcessing::Convert(converted, accessor);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
306 break;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
307
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
308 case Orthanc::PixelFormat_SignedGrayscale16:
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
309 converted = accessor;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
310 break;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
311
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
312 default:
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
313 // Unsupported pixel format
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
314 return false;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
315 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
316
126
f99adade8b77 Fixed rendering of 16bpp images if values are < 0 or >= 32768
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
317 result["Orthanc"]["IsSigned"] = (accessor.GetFormat() == Orthanc::PixelFormat_SignedGrayscale16);
f99adade8b77 Fixed rendering of 16bpp images if values are < 0 or >= 32768
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
318
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
319 // Sanity check: The pitch must be minimal
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
320 assert(converted.GetSize() == converted.GetWidth() * converted.GetHeight() *
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
321 GetBytesPerPixel(converted.GetFormat()));
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
322 result["Orthanc"]["Compression"] = "Deflate";
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
323 result["sizeInBytes"] = converted.GetSize();
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
324
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
325 std::string z;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
326 CompressUsingDeflate(z, image.GetContext(), converted.GetConstBuffer(), converted.GetSize());
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
327
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
328 result["Orthanc"]["PixelData"] = base64_encode(z);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
329
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
330 return true;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
331 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
332
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
333
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
334
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
335 template <typename TargetType, typename SourceType>
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
336 static void ChangeDynamics(Orthanc::ImageAccessor& target,
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
337 const Orthanc::ImageAccessor& source,
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
338 SourceType source1, TargetType target1,
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
339 SourceType source2, TargetType target2)
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
340 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
341 if (source.GetWidth() != target.GetWidth() ||
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
342 source.GetHeight() != target.GetHeight())
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
343 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
344 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
345 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
346
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
347 float scale = static_cast<float>(target2 - target1) / static_cast<float>(source2 - source1);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
348 float offset = static_cast<float>(target1) - scale * static_cast<float>(source1);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
349
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
350 const float minValue = static_cast<float>(std::numeric_limits<TargetType>::min());
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
351 const float maxValue = static_cast<float>(std::numeric_limits<TargetType>::max());
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
352
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
353 for (unsigned int y = 0; y < source.GetHeight(); y++)
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
354 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
355 const SourceType* p = reinterpret_cast<const SourceType*>(source.GetConstRow(y));
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
356 TargetType* q = reinterpret_cast<TargetType*>(target.GetRow(y));
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
357
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
358 for (unsigned int x = 0; x < source.GetWidth(); x++, p++, q++)
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
359 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
360 float v = (scale * static_cast<float>(*p)) + offset;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
361
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
362 if (v > maxValue)
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
363 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
364 *q = std::numeric_limits<TargetType>::max();
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
365 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
366 else if (v < minValue)
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
367 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
368 *q = std::numeric_limits<TargetType>::min();
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
369 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
370 else
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
371 {
101
2932473a9b19 fix prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
372 //*q = static_cast<TargetType>(boost::math::iround(v));
2932473a9b19 fix prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
373
2932473a9b19 fix prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
374 // http://stackoverflow.com/a/485546/881731
2932473a9b19 fix prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 99
diff changeset
375 *q = static_cast<TargetType>(floor(v + 0.5f));
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
376 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
377 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
378 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
379 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
380
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
381
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
382 bool DecodedImageAdapter::EncodeUsingJpeg(Json::Value& result,
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
383 OrthancImageWrapper& image,
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
384 uint8_t quality /* between 0 and 100 */)
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
385 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
386 Orthanc::ImageAccessor accessor;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
387 accessor.AssignReadOnly(OrthancPlugins::Convert(image.GetFormat()), image.GetWidth(),
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
388 image.GetHeight(), image.GetPitch(), image.GetBuffer());
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
389
145
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
390 std::auto_ptr<Orthanc::ImageBuffer> buffer;
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
391
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
392 Orthanc::ImageAccessor converted;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
393
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
394 if (accessor.GetFormat() == Orthanc::PixelFormat_Grayscale8 ||
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
395 accessor.GetFormat() == Orthanc::PixelFormat_RGB24)
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
396 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
397 result["Orthanc"]["Stretched"] = false;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
398 converted = accessor;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
399 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
400 else if (accessor.GetFormat() == Orthanc::PixelFormat_Grayscale16 ||
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
401 accessor.GetFormat() == Orthanc::PixelFormat_SignedGrayscale16)
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
402 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
403 result["Orthanc"]["Stretched"] = true;
145
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
404
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
405 buffer.reset(new Orthanc::ImageBuffer(Orthanc::PixelFormat_Grayscale8,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
406 accessor.GetWidth(),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
407 accessor.GetHeight(),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
408 true /* force minimal pitch */));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
409 converted = buffer->GetAccessor();
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
410
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
411 int64_t a, b;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
412 Orthanc::ImageProcessing::GetMinMaxValue(a, b, accessor);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
413 result["Orthanc"]["StretchLow"] = static_cast<int32_t>(a);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
414 result["Orthanc"]["StretchHigh"] = static_cast<int32_t>(b);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
415
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
416 if (accessor.GetFormat() == Orthanc::PixelFormat_Grayscale16)
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
417 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
418 ChangeDynamics<uint8_t, uint16_t>(converted, accessor, a, 0, b, 255);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
419 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
420 else
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
421 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
422 ChangeDynamics<uint8_t, int16_t>(converted, accessor, a, 0, b, 255);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
423 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
424 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
425 else
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
426 {
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
427 return false;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
428 }
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
429
126
f99adade8b77 Fixed rendering of 16bpp images if values are < 0 or >= 32768
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
430 result["Orthanc"]["IsSigned"] = (accessor.GetFormat() == Orthanc::PixelFormat_SignedGrayscale16);
96
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
431 result["Orthanc"]["Compression"] = "Jpeg";
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
432 result["sizeInBytes"] = converted.GetSize();
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
433
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
434 std::string jpeg;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
435 WriteJpegToMemory(jpeg, image.GetContext(), converted, quality);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
436
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
437 result["Orthanc"]["PixelData"] = base64_encode(jpeg);
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
438 return true;
a6ba21a083e5 major refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
439 }
0
02f7a0400a91 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
440 }