Mercurial > hg > orthanc-wsi
annotate ViewerPlugin/IIIF.cpp @ 330:c42083d50ddf
Added support for DICOM tag "Recommended Absent Pixel CIELab" (0048,0015)
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 18 Oct 2024 13:08:55 +0200 |
parents | 8ad12abde290 |
children |
rev | line source |
---|---|
261 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
312
0683312e21ba
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
309
diff
changeset
|
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium |
0683312e21ba
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
309
diff
changeset
|
6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium |
309
7020852a8fa9
updated year to 2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
261 | 8 * |
9 * This program is free software: you can redistribute it and/or | |
10 * modify it under the terms of the GNU Affero General Public License | |
11 * as published by the Free Software Foundation, either version 3 of | |
12 * the License, or (at your option) any later version. | |
13 * | |
14 * This program is distributed in the hope that it will be useful, but | |
15 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
17 * Affero General Public License for more details. | |
18 * | |
19 * You should have received a copy of the GNU Affero General Public License | |
20 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
21 **/ | |
22 | |
23 | |
24 #include "../Framework/PrecompiledHeadersWSI.h" | |
25 #include "IIIF.h" | |
26 | |
27 #include "DicomPyramidCache.h" | |
28 #include "RawTile.h" | |
29 #include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h" | |
30 | |
31 #include <Images/Image.h> | |
32 #include <Images/ImageProcessing.h> | |
33 #include <Logging.h> | |
265 | 34 #include <SerializationToolbox.h> |
261 | 35 |
36 #include <boost/math/special_functions/round.hpp> | |
37 | |
38 | |
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
39 static const char* const ROWS = "0028,0010"; |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
40 static const char* const COLUMNS = "0028,0011"; |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
41 |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
42 |
261 | 43 static std::string iiifPublicUrl_; |
274
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
44 static bool iiifForcePowersOfTwoScaleFactors_ = false; |
261 | 45 |
46 | |
288 | 47 void ServeIIIFTiledImageInfo(OrthancPluginRestOutput* output, |
48 const char* url, | |
49 const OrthancPluginHttpRequest* request) | |
261 | 50 { |
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
51 const std::string seriesId(request->groups[0]); |
261 | 52 |
53 LOG(INFO) << "IIIF: Image API call to whole-slide pyramid of series " << seriesId; | |
54 | |
55 OrthancWSI::DicomPyramidCache::Locker locker(seriesId); | |
271
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
56 const OrthancWSI::ITiledPyramid& pyramid = locker.GetPyramid(); |
261 | 57 |
271
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
58 if (pyramid.GetLevelCount() == 0) |
261 | 59 { |
60 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
61 } | |
62 | |
271
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
63 if (pyramid.GetTileWidth(0) != pyramid.GetTileHeight(0)) |
261 | 64 { |
65 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat, | |
66 "IIIF doesn't support non-isotropic tile sizes"); | |
67 } | |
68 | |
271
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
69 for (unsigned int i = 1; i < pyramid.GetLevelCount(); i++) |
261 | 70 { |
271
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
71 if (pyramid.GetTileWidth(i) != pyramid.GetTileWidth(0) || |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
72 pyramid.GetTileHeight(i) != pyramid.GetTileHeight(0)) |
261 | 73 { |
74 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat, | |
75 "IIIF doesn't support levels with varying tile sizes"); | |
76 } | |
77 } | |
78 | |
79 Json::Value sizes = Json::arrayValue; | |
80 Json::Value scaleFactors = Json::arrayValue; | |
81 | |
274
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
82 unsigned int power = 1; |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
83 |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
84 for (unsigned int i = 0; i < pyramid.GetLevelCount(); i++) |
261 | 85 { |
86 /** | |
271
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
87 * According to the IIIF Image API 3.0 specification, |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
88 * "scaleFactors" is: "The set of resolution scaling factors for |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
89 * the image's predefined tiles, expressed as POSITIVE INTEGERS by |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
90 * which to divide the full size of the image. For example, a |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
91 * scale factor of 4 indicates that the service can efficiently |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
92 * deliver images at 1/4 or 25% of the height and width of the |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
93 * full image." => We can only serve the levels for which the full |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
94 * width/height of the image is divisible by the width/height of |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
95 * the level. |
261 | 96 **/ |
274
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
97 if (pyramid.GetLevelWidth(0) % pyramid.GetLevelWidth(i) == 0 && |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
98 pyramid.GetLevelHeight(0) % pyramid.GetLevelHeight(i) == 0) |
261 | 99 { |
274
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
100 unsigned int scaleFactor = pyramid.GetLevelWidth(0) / pyramid.GetLevelWidth(i); |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
101 |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
102 if (!iiifForcePowersOfTwoScaleFactors_ || |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
103 scaleFactor == power) |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
104 { |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
105 Json::Value level; |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
106 level["width"] = pyramid.GetLevelWidth(i); |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
107 level["height"] = pyramid.GetLevelHeight(i); |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
108 sizes.append(level); |
261 | 109 |
274
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
110 scaleFactors.append(scaleFactor); |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
111 |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
112 power *= 2; |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
113 } |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
114 else |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
115 { |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
116 LOG(WARNING) << "IIIF - Dropping level " << i << " of series " << seriesId |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
117 << ", as it doesn't follow the powers-of-two pattern"; |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
118 } |
271
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
119 } |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
120 else |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
121 { |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
122 LOG(WARNING) << "IIIF - Dropping level " << i << " of series " << seriesId |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
123 << ", as the full width/height (" |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
124 << pyramid.GetLevelWidth(0) << "x" << pyramid.GetLevelHeight(0) |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
125 << ") of the image is not an integer multiple of the level width/height (" |
274
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
126 << pyramid.GetLevelWidth(i) << "x" << pyramid.GetLevelHeight(i) << ")"; |
261 | 127 } |
128 } | |
129 | |
314
9dc7f1e8716d
reverse the order of the "sizes" field in the IIIF manifest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
130 /** |
9dc7f1e8716d
reverse the order of the "sizes" field in the IIIF manifest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
131 * Reversing the order of the "sizes" field seems to be necessary |
9dc7f1e8716d
reverse the order of the "sizes" field in the IIIF manifest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
132 * for recent version of OpenSeadragon (>= 4.1.0) and Mirador (>= |
9dc7f1e8716d
reverse the order of the "sizes" field in the IIIF manifest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
133 * 4.0.0). This fix was included in release 2.1 of the WSI plugin. |
9dc7f1e8716d
reverse the order of the "sizes" field in the IIIF manifest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
134 * https://github.com/openseadragon/openseadragon/issues/2379 |
9dc7f1e8716d
reverse the order of the "sizes" field in the IIIF manifest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
135 **/ |
9dc7f1e8716d
reverse the order of the "sizes" field in the IIIF manifest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
136 Json::Value reversedSizes = Json::arrayValue; |
9dc7f1e8716d
reverse the order of the "sizes" field in the IIIF manifest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
137 for (Json::Value::ArrayIndex i = sizes.size(); i > 0; i--) |
9dc7f1e8716d
reverse the order of the "sizes" field in the IIIF manifest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
138 { |
9dc7f1e8716d
reverse the order of the "sizes" field in the IIIF manifest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
139 reversedSizes.append(sizes[i - 1]); |
9dc7f1e8716d
reverse the order of the "sizes" field in the IIIF manifest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
140 } |
9dc7f1e8716d
reverse the order of the "sizes" field in the IIIF manifest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
141 |
261 | 142 Json::Value tiles; |
271
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
143 tiles["width"] = pyramid.GetTileWidth(0); |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
144 tiles["height"] = pyramid.GetTileHeight(0); |
261 | 145 tiles["scaleFactors"] = scaleFactors; |
146 | |
147 Json::Value result; | |
272
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
148 result["@context"] = "http://iiif.io/api/image/3/context.json"; |
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
149 result["profile"] = "level0"; |
261 | 150 result["protocol"] = "http://iiif.io/api/image"; |
272
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
151 result["type"] = "ImageService3"; |
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
152 |
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
153 result["id"] = iiifPublicUrl_ + "tiles/" + seriesId; |
271
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
154 result["width"] = pyramid.GetLevelWidth(0); |
45e3b5adf4ae
opened issue 2379 in OpenSeadragon
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
155 result["height"] = pyramid.GetLevelHeight(0); |
314
9dc7f1e8716d
reverse the order of the "sizes" field in the IIIF manifest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
312
diff
changeset
|
156 result["sizes"] = reversedSizes; |
261 | 157 result["tiles"].append(tiles); |
158 | |
159 std::string s = result.toStyledString(); | |
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
160 OrthancPluginAnswerBuffer(OrthancPlugins::GetGlobalContext(), output, s.c_str(), s.size(), Orthanc::EnumerationToString(Orthanc::MimeType_Json)); |
261 | 161 } |
162 | |
163 | |
164 static unsigned int GetPhysicalTileWidth(const OrthancWSI::ITiledPyramid& pyramid, | |
165 unsigned int level) | |
166 { | |
167 return static_cast<unsigned int>(boost::math::iround( | |
168 static_cast<float>(pyramid.GetTileWidth(level)) * | |
169 static_cast<float>(pyramid.GetLevelWidth(0)) / | |
170 static_cast<float>(pyramid.GetLevelWidth(level)))); | |
171 } | |
172 | |
173 | |
174 static unsigned int GetPhysicalTileHeight(const OrthancWSI::ITiledPyramid& pyramid, | |
175 unsigned int level) | |
176 { | |
177 return static_cast<unsigned int>(boost::math::iround( | |
178 static_cast<float>(pyramid.GetTileHeight(level)) * | |
179 static_cast<float>(pyramid.GetLevelHeight(0)) / | |
180 static_cast<float>(pyramid.GetLevelHeight(level)))); | |
181 } | |
182 | |
183 | |
288 | 184 void ServeIIIFTiledImageTile(OrthancPluginRestOutput* output, |
185 const char* url, | |
186 const OrthancPluginHttpRequest* request) | |
261 | 187 { |
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
188 const std::string seriesId(request->groups[0]); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
189 const std::string region(request->groups[1]); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
190 const std::string size(request->groups[2]); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
191 const std::string rotation(request->groups[3]); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
192 const std::string quality(request->groups[4]); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
193 const std::string format(request->groups[5]); |
261 | 194 |
195 LOG(INFO) << "IIIF: Image API call to tile of series " << seriesId << ": " | |
196 << "region=" << region << "; size=" << size << "; rotation=" | |
197 << rotation << "; quality=" << quality << "; format=" << format; | |
198 | |
199 if (rotation != "0") | |
200 { | |
201 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, "IIIF - Unsupported rotation: " + rotation); | |
202 } | |
203 | |
204 if (quality != "default") | |
205 { | |
206 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, "IIIF - Unsupported quality: " + quality); | |
207 } | |
208 | |
209 if (format != "jpg") | |
210 { | |
211 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, "IIIF - Unsupported format: " + format); | |
212 } | |
213 | |
214 if (region == "full") | |
215 { | |
216 OrthancWSI::DicomPyramidCache::Locker locker(seriesId); | |
217 | |
218 OrthancWSI::ITiledPyramid& pyramid = locker.GetPyramid(); | |
219 const unsigned int level = pyramid.GetLevelCount() - 1; | |
220 | |
221 Orthanc::Image full(Orthanc::PixelFormat_RGB24, pyramid.GetLevelWidth(level), pyramid.GetLevelHeight(level), false); | |
222 Orthanc::ImageProcessing::Set(full, 255, 255, 255, 0); | |
223 | |
224 const unsigned int nx = OrthancWSI::CeilingDivision(pyramid.GetLevelWidth(level), pyramid.GetTileWidth(level)); | |
225 const unsigned int ny = OrthancWSI::CeilingDivision(pyramid.GetLevelHeight(level), pyramid.GetTileHeight(level)); | |
226 for (unsigned int ty = 0; ty < ny; ty++) | |
227 { | |
228 const unsigned int y = ty * pyramid.GetTileHeight(level); | |
229 const unsigned int height = std::min(pyramid.GetTileHeight(level), full.GetHeight() - y); | |
230 | |
231 for (unsigned int tx = 0; tx < nx; tx++) | |
232 { | |
233 const unsigned int x = tx * pyramid.GetTileWidth(level); | |
318
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
234 |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
235 bool isEmpty; // Unused |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
236 std::unique_ptr<Orthanc::ImageAccessor> tile(pyramid.DecodeTile(isEmpty, level, tx, ty)); |
261 | 237 |
238 const unsigned int width = std::min(pyramid.GetTileWidth(level), full.GetWidth() - x); | |
239 | |
240 Orthanc::ImageAccessor source, target; | |
241 tile->GetRegion(source, 0, 0, width, height); | |
242 full.GetRegion(target, x, y, width, height); | |
243 | |
244 Orthanc::ImageProcessing::Copy(target, source); | |
245 } | |
246 } | |
247 | |
248 std::string encoded; | |
249 OrthancWSI::RawTile::Encode(encoded, full, Orthanc::MimeType_Jpeg); | |
250 | |
251 OrthancPluginAnswerBuffer(OrthancPlugins::GetGlobalContext(), output, encoded.c_str(), | |
252 encoded.size(), Orthanc::EnumerationToString(Orthanc::MimeType_Jpeg)); | |
253 } | |
254 else | |
255 { | |
273
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
256 std::vector<std::string> tokens; |
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
257 Orthanc::Toolbox::TokenizeString(tokens, region, ','); |
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
258 |
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
259 uint32_t regionX, regionY, regionWidth, regionHeight; |
261 | 260 |
273
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
261 if (tokens.size() != 4 || |
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
262 !Orthanc::SerializationToolbox::ParseUnsignedInteger32(regionX, tokens[0]) || |
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
263 !Orthanc::SerializationToolbox::ParseUnsignedInteger32(regionY, tokens[1]) || |
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
264 !Orthanc::SerializationToolbox::ParseUnsignedInteger32(regionWidth, tokens[2]) || |
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
265 !Orthanc::SerializationToolbox::ParseUnsignedInteger32(regionHeight, tokens[3])) |
261 | 266 { |
274
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
267 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, "IIIF - Invalid (x,y,width,height) region, found: " + region); |
261 | 268 } |
269 | |
273
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
270 uint32_t cropWidth, cropHeight; |
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
271 |
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
272 Orthanc::Toolbox::TokenizeString(tokens, size, ','); |
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
273 |
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
274 bool ok = false; |
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
275 if (tokens.size() == 2 && |
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
276 Orthanc::SerializationToolbox::ParseUnsignedInteger32(cropWidth, tokens[0])) |
261 | 277 { |
273
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
278 if (tokens[1].empty()) |
261 | 279 { |
273
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
280 cropHeight = cropWidth; |
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
281 ok = true; |
261 | 282 } |
273
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
283 else if (Orthanc::SerializationToolbox::ParseUnsignedInteger32(cropHeight, tokens[1])) |
261 | 284 { |
273
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
285 ok = true; |
261 | 286 } |
287 } | |
288 | |
289 if (!ok) | |
290 { | |
274
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
291 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, "IIIF - Invalid (width,height) crop, found: " + size); |
261 | 292 } |
293 | |
294 std::unique_ptr<OrthancWSI::RawTile> rawTile; | |
295 std::unique_ptr<Orthanc::ImageAccessor> toCrop; | |
296 | |
297 { | |
298 OrthancWSI::DicomPyramidCache::Locker locker(seriesId); | |
299 | |
300 OrthancWSI::ITiledPyramid& pyramid = locker.GetPyramid(); | |
301 | |
302 unsigned int level; | |
303 for (level = 0; level < pyramid.GetLevelCount(); level++) | |
304 { | |
305 const unsigned int physicalTileWidth = GetPhysicalTileWidth(pyramid, level); | |
306 const unsigned int physicalTileHeight = GetPhysicalTileHeight(pyramid, level); | |
307 | |
308 if (regionX % physicalTileWidth == 0 && | |
309 regionY % physicalTileHeight == 0 && | |
264
75d933374805
preparing to serve non-tiled images with IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
310 static_cast<unsigned int>(regionWidth) <= physicalTileWidth && |
75d933374805
preparing to serve non-tiled images with IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
311 static_cast<unsigned int>(regionHeight) <= physicalTileHeight && |
75d933374805
preparing to serve non-tiled images with IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
312 static_cast<unsigned int>(regionX + regionWidth) <= pyramid.GetLevelWidth(0) && |
75d933374805
preparing to serve non-tiled images with IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
313 static_cast<unsigned int>(regionY + regionHeight) <= pyramid.GetLevelHeight(0)) |
261 | 314 { |
315 break; | |
316 } | |
317 } | |
318 | |
319 if (level == pyramid.GetLevelCount()) | |
320 { | |
321 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadRequest, "IIIF - Cannot locate the level of interest"); | |
322 } | |
264
75d933374805
preparing to serve non-tiled images with IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
323 else if (static_cast<unsigned int>(cropWidth) > pyramid.GetTileWidth(level)) |
261 | 324 { |
325 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadRequest, "IIIF - Request for a cropping that is too large for the tile size"); | |
326 } | |
327 else | |
328 { | |
329 rawTile.reset(new OrthancWSI::RawTile(locker.GetPyramid(), level, | |
330 regionX / GetPhysicalTileWidth(pyramid, level), | |
331 regionY / GetPhysicalTileHeight(pyramid, level))); | |
332 | |
318
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
333 assert(rawTile->GetTileWidth() == pyramid.GetTileWidth(level)); |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
334 assert(rawTile->GetTileHeight() == pyramid.GetTileHeight(level)); |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
335 |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
336 if (!rawTile->IsEmpty() && |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
337 (static_cast<unsigned int>(cropWidth) < pyramid.GetTileWidth(level) || |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
338 static_cast<unsigned int>(cropHeight) < pyramid.GetTileHeight(level))) |
261 | 339 { |
340 toCrop.reset(rawTile->Decode()); | |
341 rawTile.reset(NULL); | |
342 } | |
343 } | |
344 } | |
345 | |
346 if (rawTile.get() != NULL) | |
347 { | |
348 assert(toCrop.get() == NULL); | |
349 | |
318
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
350 if (rawTile->IsEmpty()) |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
351 { |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
352 if (static_cast<unsigned int>(cropWidth) < rawTile->GetTileWidth() || |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
353 static_cast<unsigned int>(cropHeight) < rawTile->GetTileHeight()) |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
354 { |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
355 OrthancWSI::RawTile::AnswerBackgroundTile(output, static_cast<unsigned int>(cropWidth), static_cast<unsigned int>(cropHeight)); |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
356 } |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
357 else |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
358 { |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
359 OrthancWSI::RawTile::AnswerBackgroundTile(output, rawTile->GetTileWidth(), rawTile->GetTileHeight()); |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
360 } |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
361 } |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
362 else |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
363 { |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
364 // Level 0 Compliance of IIIF expects JPEG files |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
365 rawTile->Answer(output, Orthanc::MimeType_Jpeg); |
8ad12abde290
sparse re-encoding with OpenSlide (notably for MIRAX format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
366 } |
261 | 367 } |
368 else if (toCrop.get() != NULL) | |
369 { | |
370 assert(rawTile.get() == NULL); | |
272
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
371 |
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
372 if (static_cast<unsigned int>(cropWidth) > toCrop->GetWidth() || |
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
373 static_cast<unsigned int>(cropHeight) > toCrop->GetHeight()) |
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
374 { |
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
375 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadRequest, "IIIF - Asking to crop outside of the tile size"); |
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
376 } |
261 | 377 |
378 Orthanc::ImageAccessor cropped; | |
272
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
379 toCrop->GetRegion(cropped, 0, 0, cropWidth, cropHeight); |
261 | 380 |
381 std::string encoded; | |
382 OrthancWSI::RawTile::Encode(encoded, cropped, Orthanc::MimeType_Jpeg); | |
383 | |
384 OrthancPluginAnswerBuffer(OrthancPlugins::GetGlobalContext(), output, encoded.c_str(), | |
385 encoded.size(), Orthanc::EnumerationToString(Orthanc::MimeType_Jpeg)); | |
386 } | |
387 else | |
388 { | |
389 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
390 } | |
391 } | |
392 } | |
393 | |
394 | |
265 | 395 static void AddCanvas(Json::Value& manifest, |
396 const std::string& seriesId, | |
397 const std::string& imageService, | |
398 unsigned int page, | |
399 unsigned int width, | |
400 unsigned int height, | |
401 const std::string& description) | |
402 { | |
403 const std::string base = iiifPublicUrl_ + seriesId; | |
404 | |
405 Json::Value service; | |
406 service["id"] = iiifPublicUrl_ + imageService; | |
407 service["profile"] = "level0"; | |
408 service["type"] = "ImageService3"; | |
409 | |
410 Json::Value body; | |
411 body["id"] = iiifPublicUrl_ + imageService + "/full/max/0/default.jpg"; | |
412 body["type"] = "Image"; | |
413 body["format"] = Orthanc::EnumerationToString(Orthanc::MimeType_Jpeg); | |
414 body["height"] = height; | |
415 body["width"] = width; | |
416 body["service"].append(service); | |
417 | |
418 Json::Value annotation; | |
419 annotation["id"] = base + "/annotation/p" + boost::lexical_cast<std::string>(page) + "-image"; | |
420 annotation["type"] = "Annotation"; | |
421 annotation["motivation"] = "painting"; | |
422 annotation["body"] = body; | |
423 annotation["target"] = base + "/canvas/p" + boost::lexical_cast<std::string>(page); | |
424 | |
425 Json::Value annotationPage; | |
426 annotationPage["id"] = base + "/page/p" + boost::lexical_cast<std::string>(page) + "/1"; | |
427 annotationPage["type"] = "AnnotationPage"; | |
428 annotationPage["items"].append(annotation); | |
429 | |
430 Json::Value canvas; | |
431 canvas["id"] = annotation["target"]; | |
432 canvas["type"] = "Canvas"; | |
433 canvas["width"] = width; | |
434 canvas["height"] = height; | |
435 canvas["label"]["en"].append(description); | |
436 canvas["items"].append(annotationPage); | |
437 | |
438 manifest["items"].append(canvas); | |
439 } | |
440 | |
441 | |
288 | 442 void ServeIIIFManifest(OrthancPluginRestOutput* output, |
443 const char* url, | |
444 const OrthancPluginHttpRequest* request) | |
261 | 445 { |
265 | 446 static const char* const KEY_INSTANCES = "Instances"; |
447 static const char* const SOP_CLASS_UID = "0008,0016"; | |
448 static const char* const SLICES_SHORT = "SlicesShort"; | |
261 | 449 |
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
450 const std::string seriesId(request->groups[0]); |
261 | 451 |
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
452 LOG(INFO) << "IIIF: Presentation API call to series " << seriesId; |
261 | 453 |
454 Json::Value study, series; | |
455 if (!OrthancPlugins::RestApiGet(series, "/series/" + seriesId, false) || | |
456 !OrthancPlugins::RestApiGet(study, "/series/" + seriesId + "/study", false)) | |
457 { | |
458 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); | |
459 } | |
460 | |
265 | 461 if (study.type() != Json::objectValue || |
462 series.type() != Json::objectValue || | |
463 !series.isMember(KEY_INSTANCES) || | |
464 series[KEY_INSTANCES].type() != Json::arrayValue || | |
465 series[KEY_INSTANCES].size() == 0u || | |
466 series[KEY_INSTANCES][0].type() != Json::stringValue) | |
261 | 467 { |
265 | 468 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
261 | 469 } |
470 | |
265 | 471 Json::Value oneInstance; |
472 if (!OrthancPlugins::RestApiGet(oneInstance, "/instances/" + series[KEY_INSTANCES][0].asString() + "/tags?short", false) || | |
473 oneInstance.type() != Json::objectValue || | |
474 !oneInstance.isMember(SOP_CLASS_UID) || | |
475 oneInstance[SOP_CLASS_UID].type() != Json::stringValue) | |
476 { | |
477 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); | |
478 } | |
479 | |
480 const std::string sopClassUid = Orthanc::Toolbox::StripSpaces(oneInstance[SOP_CLASS_UID].asString()); | |
481 | |
275
801790c81f20
configuration options of IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
274
diff
changeset
|
482 const std::string base = iiifPublicUrl_ + "series/" + seriesId; |
261 | 483 |
484 Json::Value manifest; | |
485 manifest["@context"] = "http://iiif.io/api/presentation/3/context.json"; | |
486 manifest["id"] = base + "/manifest.json"; | |
487 manifest["type"] = "Manifest"; | |
265 | 488 manifest["label"]["en"].append(study["MainDicomTags"]["StudyDate"].asString() + " - " + |
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
489 series["MainDicomTags"]["Modality"].asString() + " - " + |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
490 study["MainDicomTags"]["StudyDescription"].asString() + " - " + |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
491 series["MainDicomTags"]["SeriesDescription"].asString()); |
261 | 492 |
265 | 493 if (sopClassUid == OrthancWSI::VL_WHOLE_SLIDE_MICROSCOPY_IMAGE_STORAGE_IOD) |
494 { | |
495 /** | |
496 * This is based on IIIF cookbook: "Support Deep Viewing with Basic | |
497 * Use of a IIIF Image Service." | |
498 * https://iiif.io/api/cookbook/recipe/0005-image-service/ | |
499 **/ | |
500 unsigned int width, height; | |
501 | |
502 { | |
503 OrthancWSI::DicomPyramidCache::Locker locker(seriesId); | |
504 width = locker.GetPyramid().GetLevelWidth(0); | |
505 height = locker.GetPyramid().GetLevelHeight(0); | |
506 } | |
507 | |
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
508 AddCanvas(manifest, seriesId, "tiles/" + seriesId, 1, width, height, ""); |
265 | 509 } |
510 else | |
511 { | |
512 /** | |
513 * This is based on IIIF cookbook: "Simple Manifest - Book" | |
514 * https://iiif.io/api/cookbook/recipe/0009-book-1/ | |
515 **/ | |
516 | |
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
517 manifest["behavior"].append("individuals"); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
518 |
265 | 519 uint32_t width, height; |
520 if (!oneInstance.isMember(COLUMNS) || | |
521 !oneInstance.isMember(ROWS) || | |
522 oneInstance[COLUMNS].type() != Json::stringValue || | |
523 oneInstance[ROWS].type() != Json::stringValue || | |
524 !Orthanc::SerializationToolbox::ParseFirstUnsignedInteger32(width, oneInstance[COLUMNS].asString()) || | |
525 !Orthanc::SerializationToolbox::ParseFirstUnsignedInteger32(height, oneInstance[ROWS].asString())) | |
526 { | |
527 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); | |
528 } | |
261 | 529 |
265 | 530 Json::Value orderedSlices; |
531 if (!OrthancPlugins::RestApiGet(orderedSlices, "/series/" + seriesId + "/ordered-slices", false)) | |
532 { | |
533 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); | |
534 } | |
535 | |
536 if (orderedSlices.type() != Json::objectValue || | |
537 !orderedSlices.isMember(SLICES_SHORT) || | |
538 orderedSlices[SLICES_SHORT].type() != Json::arrayValue) | |
539 { | |
540 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
541 } | |
542 | |
543 const Json::Value& slicesShort = orderedSlices[SLICES_SHORT]; | |
544 | |
545 unsigned int page = 1; | |
546 for (Json::ArrayIndex instance = 0; instance < slicesShort.size(); instance++) | |
547 { | |
548 if (slicesShort[instance].type() != Json::arrayValue || | |
549 slicesShort[instance].size() != 3u || | |
550 slicesShort[instance][0].type() != Json::stringValue || | |
551 slicesShort[instance][1].type() != Json::intValue || | |
552 slicesShort[instance][2].type() != Json::intValue) | |
553 { | |
554 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
555 } | |
556 | |
557 const std::string instanceId = slicesShort[instance][0].asString(); | |
558 const unsigned int start = slicesShort[instance][1].asUInt(); | |
559 const unsigned int count = slicesShort[instance][2].asUInt(); | |
560 | |
561 for (unsigned int frame = start; frame < start + count; frame++, page++) | |
562 { | |
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
563 AddCanvas(manifest, instanceId, "frames/" + instanceId + "/" + boost::lexical_cast<std::string>(frame), |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
564 page, width, height, ""); |
265 | 565 } |
566 } | |
567 } | |
261 | 568 |
569 std::string s = manifest.toStyledString(); | |
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
570 OrthancPluginAnswerBuffer(OrthancPlugins::GetGlobalContext(), output, s.c_str(), s.size(), Orthanc::EnumerationToString(Orthanc::MimeType_Json)); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
571 } |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
572 |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
573 |
288 | 574 void ServeIIIFFrameInfo(OrthancPluginRestOutput* output, |
575 const char* url, | |
576 const OrthancPluginHttpRequest* request) | |
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
577 { |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
578 const std::string instanceId(request->groups[0]); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
579 const std::string frame(request->groups[1]); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
580 |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
581 LOG(INFO) << "IIIF: Image API call to manifest of instance " << instanceId << " at frame " << frame; |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
582 |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
583 Json::Value instance; |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
584 if (!OrthancPlugins::RestApiGet(instance, "/instances/" + instanceId + "/tags?short", false)) |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
585 { |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
586 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
587 } |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
588 |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
589 uint32_t width, height; |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
590 if (!instance.isMember(COLUMNS) || |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
591 !instance.isMember(ROWS) || |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
592 instance[COLUMNS].type() != Json::stringValue || |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
593 instance[ROWS].type() != Json::stringValue || |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
594 !Orthanc::SerializationToolbox::ParseFirstUnsignedInteger32(width, instance[COLUMNS].asString()) || |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
595 !Orthanc::SerializationToolbox::ParseFirstUnsignedInteger32(height, instance[ROWS].asString())) |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
596 { |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
597 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
598 } |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
599 |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
600 Json::Value tile; |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
601 tile["height"] = height; |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
602 tile["width"] = width; |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
603 tile["scaleFactors"].append(1); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
604 |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
605 Json::Value result; |
272
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
606 result["@context"] = "http://iiif.io/api/image/3/context.json"; |
290 | 607 result["profile"] = "level0"; |
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
608 result["protocol"] = "http://iiif.io/api/image"; |
272
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
609 result["type"] = "ImageService3"; |
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
610 |
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
611 result["id"] = iiifPublicUrl_ + "frames/" + instanceId + "/" + frame; |
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
612 result["width"] = width; |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
613 result["height"] = height; |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
614 result["tiles"].append(tile); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
615 |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
616 std::string s = result.toStyledString(); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
617 OrthancPluginAnswerBuffer(OrthancPlugins::GetGlobalContext(), output, s.c_str(), s.size(), Orthanc::EnumerationToString(Orthanc::MimeType_Json)); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
618 } |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
619 |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
620 |
288 | 621 void ServeIIIFFrameImage(OrthancPluginRestOutput* output, |
622 const char* url, | |
623 const OrthancPluginHttpRequest* request) | |
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
624 { |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
625 const std::string instanceId(request->groups[0]); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
626 const std::string frame(request->groups[1]); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
627 |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
628 LOG(INFO) << "IIIF: Image API call to JPEG of instance " << instanceId << " at frame " << frame; |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
629 |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
630 std::map<std::string, std::string> httpHeaders; |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
631 httpHeaders["Accept"] = Orthanc::EnumerationToString(Orthanc::MimeType_Jpeg); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
632 |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
633 std::string jpeg; |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
634 if (!OrthancPlugins::RestApiGetString(jpeg, "/instances/" + instanceId + "/frames/" + frame + "/preview", httpHeaders, false)) |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
635 { |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
636 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
637 } |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
638 |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
639 OrthancPluginAnswerBuffer(OrthancPlugins::GetGlobalContext(), output, jpeg.empty() ? NULL : jpeg.c_str(), |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
640 jpeg.size(), Orthanc::EnumerationToString(Orthanc::MimeType_Jpeg)); |
261 | 641 } |
642 | |
643 | |
644 void InitializeIIIF(const std::string& iiifPublicUrl) | |
645 { | |
646 iiifPublicUrl_ = iiifPublicUrl; | |
647 | |
264
75d933374805
preparing to serve non-tiled images with IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
648 OrthancPlugins::RegisterRestCallback<ServeIIIFTiledImageInfo>("/wsi/iiif/tiles/([0-9a-f-]+)/info.json", true); |
75d933374805
preparing to serve non-tiled images with IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
649 OrthancPlugins::RegisterRestCallback<ServeIIIFTiledImageTile>("/wsi/iiif/tiles/([0-9a-f-]+)/([0-9a-z,:]+)/([0-9a-z,!:]+)/([0-9,!]+)/([a-z]+)\\.([a-z]+)", true); |
275
801790c81f20
configuration options of IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
274
diff
changeset
|
650 OrthancPlugins::RegisterRestCallback<ServeIIIFManifest>("/wsi/iiif/series/([0-9a-f-]+)/manifest.json", true); |
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
651 OrthancPlugins::RegisterRestCallback<ServeIIIFFrameInfo>("/wsi/iiif/frames/([0-9a-f-]+)/([0-9]+)/info.json", true); |
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
652 OrthancPlugins::RegisterRestCallback<ServeIIIFFrameImage>("/wsi/iiif/frames/([0-9a-f-]+)/([0-9]+)/full/max/0/default.jpg", true); |
261 | 653 } |
274
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
654 |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
655 void SetIIIFForcePowersOfTwoScaleFactors(bool force) |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
656 { |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
657 iiifForcePowersOfTwoScaleFactors_ = force; |
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
658 } |