Mercurial > hg > orthanc-wsi
annotate ViewerPlugin/IIIF.cpp @ 314:9dc7f1e8716d
reverse the order of the "sizes" field in the IIIF manifest
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 14 Aug 2024 15:52:13 +0200 |
| parents | 0683312e21ba |
| children | 8ad12abde290 |
| 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); | |
| 234 std::unique_ptr<Orthanc::ImageAccessor> tile(pyramid.DecodeTile(level, tx, ty)); | |
| 235 | |
| 236 const unsigned int width = std::min(pyramid.GetTileWidth(level), full.GetWidth() - x); | |
| 237 | |
| 238 Orthanc::ImageAccessor source, target; | |
| 239 tile->GetRegion(source, 0, 0, width, height); | |
| 240 full.GetRegion(target, x, y, width, height); | |
| 241 | |
| 242 Orthanc::ImageProcessing::Copy(target, source); | |
| 243 } | |
| 244 } | |
| 245 | |
| 246 std::string encoded; | |
| 247 OrthancWSI::RawTile::Encode(encoded, full, Orthanc::MimeType_Jpeg); | |
| 248 | |
| 249 OrthancPluginAnswerBuffer(OrthancPlugins::GetGlobalContext(), output, encoded.c_str(), | |
| 250 encoded.size(), Orthanc::EnumerationToString(Orthanc::MimeType_Jpeg)); | |
| 251 } | |
| 252 else | |
| 253 { | |
|
273
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
254 std::vector<std::string> tokens; |
|
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
255 Orthanc::Toolbox::TokenizeString(tokens, region, ','); |
|
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
256 |
|
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
257 uint32_t regionX, regionY, regionWidth, regionHeight; |
| 261 | 258 |
|
273
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
259 if (tokens.size() != 4 || |
|
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
260 !Orthanc::SerializationToolbox::ParseUnsignedInteger32(regionX, tokens[0]) || |
|
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
261 !Orthanc::SerializationToolbox::ParseUnsignedInteger32(regionY, tokens[1]) || |
|
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
262 !Orthanc::SerializationToolbox::ParseUnsignedInteger32(regionWidth, tokens[2]) || |
|
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
263 !Orthanc::SerializationToolbox::ParseUnsignedInteger32(regionHeight, tokens[3])) |
| 261 | 264 { |
|
274
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
265 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, "IIIF - Invalid (x,y,width,height) region, found: " + region); |
| 261 | 266 } |
| 267 | |
|
273
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
268 uint32_t cropWidth, cropHeight; |
|
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
269 |
|
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
270 Orthanc::Toolbox::TokenizeString(tokens, size, ','); |
|
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 bool ok = false; |
|
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
273 if (tokens.size() == 2 && |
|
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
274 Orthanc::SerializationToolbox::ParseUnsignedInteger32(cropWidth, tokens[0])) |
| 261 | 275 { |
|
273
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
276 if (tokens[1].empty()) |
| 261 | 277 { |
|
273
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
278 cropHeight = cropWidth; |
|
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
279 ok = true; |
| 261 | 280 } |
|
273
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
281 else if (Orthanc::SerializationToolbox::ParseUnsignedInteger32(cropHeight, tokens[1])) |
| 261 | 282 { |
|
273
1c95010d9d2e
clarification by removing regular expressions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
272
diff
changeset
|
283 ok = true; |
| 261 | 284 } |
| 285 } | |
| 286 | |
| 287 if (!ok) | |
| 288 { | |
|
274
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
289 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, "IIIF - Invalid (width,height) crop, found: " + size); |
| 261 | 290 } |
| 291 | |
| 292 std::unique_ptr<OrthancWSI::RawTile> rawTile; | |
| 293 std::unique_ptr<Orthanc::ImageAccessor> toCrop; | |
| 294 | |
| 295 { | |
| 296 OrthancWSI::DicomPyramidCache::Locker locker(seriesId); | |
| 297 | |
| 298 OrthancWSI::ITiledPyramid& pyramid = locker.GetPyramid(); | |
| 299 | |
| 300 unsigned int level; | |
| 301 for (level = 0; level < pyramid.GetLevelCount(); level++) | |
| 302 { | |
| 303 const unsigned int physicalTileWidth = GetPhysicalTileWidth(pyramid, level); | |
| 304 const unsigned int physicalTileHeight = GetPhysicalTileHeight(pyramid, level); | |
| 305 | |
| 306 if (regionX % physicalTileWidth == 0 && | |
| 307 regionY % physicalTileHeight == 0 && | |
|
264
75d933374805
preparing to serve non-tiled images with IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
308 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
|
309 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
|
310 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
|
311 static_cast<unsigned int>(regionY + regionHeight) <= pyramid.GetLevelHeight(0)) |
| 261 | 312 { |
| 313 break; | |
| 314 } | |
| 315 } | |
| 316 | |
| 317 if (level == pyramid.GetLevelCount()) | |
| 318 { | |
| 319 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadRequest, "IIIF - Cannot locate the level of interest"); | |
| 320 } | |
|
264
75d933374805
preparing to serve non-tiled images with IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
321 else if (static_cast<unsigned int>(cropWidth) > pyramid.GetTileWidth(level)) |
| 261 | 322 { |
| 323 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadRequest, "IIIF - Request for a cropping that is too large for the tile size"); | |
| 324 } | |
| 325 else | |
| 326 { | |
| 327 rawTile.reset(new OrthancWSI::RawTile(locker.GetPyramid(), level, | |
| 328 regionX / GetPhysicalTileWidth(pyramid, level), | |
| 329 regionY / GetPhysicalTileHeight(pyramid, level))); | |
| 330 | |
|
272
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
331 if (static_cast<unsigned int>(cropWidth) < pyramid.GetTileWidth(level) || |
|
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
332 static_cast<unsigned int>(cropHeight) < pyramid.GetTileHeight(level)) |
| 261 | 333 { |
| 334 toCrop.reset(rawTile->Decode()); | |
| 335 rawTile.reset(NULL); | |
| 336 } | |
| 337 } | |
| 338 } | |
| 339 | |
| 340 if (rawTile.get() != NULL) | |
| 341 { | |
| 342 assert(toCrop.get() == NULL); | |
| 343 | |
| 344 // Level 0 Compliance of IIIF expects JPEG files | |
| 345 rawTile->Answer(output, Orthanc::MimeType_Jpeg); | |
| 346 } | |
| 347 else if (toCrop.get() != NULL) | |
| 348 { | |
| 349 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
|
350 |
|
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
351 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
|
352 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
|
353 { |
|
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
354 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
|
355 } |
| 261 | 356 |
| 357 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
|
358 toCrop->GetRegion(cropped, 0, 0, cropWidth, cropHeight); |
| 261 | 359 |
| 360 std::string encoded; | |
| 361 OrthancWSI::RawTile::Encode(encoded, cropped, Orthanc::MimeType_Jpeg); | |
| 362 | |
| 363 OrthancPluginAnswerBuffer(OrthancPlugins::GetGlobalContext(), output, encoded.c_str(), | |
| 364 encoded.size(), Orthanc::EnumerationToString(Orthanc::MimeType_Jpeg)); | |
| 365 } | |
| 366 else | |
| 367 { | |
| 368 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 369 } | |
| 370 } | |
| 371 } | |
| 372 | |
| 373 | |
| 265 | 374 static void AddCanvas(Json::Value& manifest, |
| 375 const std::string& seriesId, | |
| 376 const std::string& imageService, | |
| 377 unsigned int page, | |
| 378 unsigned int width, | |
| 379 unsigned int height, | |
| 380 const std::string& description) | |
| 381 { | |
| 382 const std::string base = iiifPublicUrl_ + seriesId; | |
| 383 | |
| 384 Json::Value service; | |
| 385 service["id"] = iiifPublicUrl_ + imageService; | |
| 386 service["profile"] = "level0"; | |
| 387 service["type"] = "ImageService3"; | |
| 388 | |
| 389 Json::Value body; | |
| 390 body["id"] = iiifPublicUrl_ + imageService + "/full/max/0/default.jpg"; | |
| 391 body["type"] = "Image"; | |
| 392 body["format"] = Orthanc::EnumerationToString(Orthanc::MimeType_Jpeg); | |
| 393 body["height"] = height; | |
| 394 body["width"] = width; | |
| 395 body["service"].append(service); | |
| 396 | |
| 397 Json::Value annotation; | |
| 398 annotation["id"] = base + "/annotation/p" + boost::lexical_cast<std::string>(page) + "-image"; | |
| 399 annotation["type"] = "Annotation"; | |
| 400 annotation["motivation"] = "painting"; | |
| 401 annotation["body"] = body; | |
| 402 annotation["target"] = base + "/canvas/p" + boost::lexical_cast<std::string>(page); | |
| 403 | |
| 404 Json::Value annotationPage; | |
| 405 annotationPage["id"] = base + "/page/p" + boost::lexical_cast<std::string>(page) + "/1"; | |
| 406 annotationPage["type"] = "AnnotationPage"; | |
| 407 annotationPage["items"].append(annotation); | |
| 408 | |
| 409 Json::Value canvas; | |
| 410 canvas["id"] = annotation["target"]; | |
| 411 canvas["type"] = "Canvas"; | |
| 412 canvas["width"] = width; | |
| 413 canvas["height"] = height; | |
| 414 canvas["label"]["en"].append(description); | |
| 415 canvas["items"].append(annotationPage); | |
| 416 | |
| 417 manifest["items"].append(canvas); | |
| 418 } | |
| 419 | |
| 420 | |
| 288 | 421 void ServeIIIFManifest(OrthancPluginRestOutput* output, |
| 422 const char* url, | |
| 423 const OrthancPluginHttpRequest* request) | |
| 261 | 424 { |
| 265 | 425 static const char* const KEY_INSTANCES = "Instances"; |
| 426 static const char* const SOP_CLASS_UID = "0008,0016"; | |
| 427 static const char* const SLICES_SHORT = "SlicesShort"; | |
| 261 | 428 |
|
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
429 const std::string seriesId(request->groups[0]); |
| 261 | 430 |
|
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
431 LOG(INFO) << "IIIF: Presentation API call to series " << seriesId; |
| 261 | 432 |
| 433 Json::Value study, series; | |
| 434 if (!OrthancPlugins::RestApiGet(series, "/series/" + seriesId, false) || | |
| 435 !OrthancPlugins::RestApiGet(study, "/series/" + seriesId + "/study", false)) | |
| 436 { | |
| 437 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); | |
| 438 } | |
| 439 | |
| 265 | 440 if (study.type() != Json::objectValue || |
| 441 series.type() != Json::objectValue || | |
| 442 !series.isMember(KEY_INSTANCES) || | |
| 443 series[KEY_INSTANCES].type() != Json::arrayValue || | |
| 444 series[KEY_INSTANCES].size() == 0u || | |
| 445 series[KEY_INSTANCES][0].type() != Json::stringValue) | |
| 261 | 446 { |
| 265 | 447 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
| 261 | 448 } |
| 449 | |
| 265 | 450 Json::Value oneInstance; |
| 451 if (!OrthancPlugins::RestApiGet(oneInstance, "/instances/" + series[KEY_INSTANCES][0].asString() + "/tags?short", false) || | |
| 452 oneInstance.type() != Json::objectValue || | |
| 453 !oneInstance.isMember(SOP_CLASS_UID) || | |
| 454 oneInstance[SOP_CLASS_UID].type() != Json::stringValue) | |
| 455 { | |
| 456 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); | |
| 457 } | |
| 458 | |
| 459 const std::string sopClassUid = Orthanc::Toolbox::StripSpaces(oneInstance[SOP_CLASS_UID].asString()); | |
| 460 | |
|
275
801790c81f20
configuration options of IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
274
diff
changeset
|
461 const std::string base = iiifPublicUrl_ + "series/" + seriesId; |
| 261 | 462 |
| 463 Json::Value manifest; | |
| 464 manifest["@context"] = "http://iiif.io/api/presentation/3/context.json"; | |
| 465 manifest["id"] = base + "/manifest.json"; | |
| 466 manifest["type"] = "Manifest"; | |
| 265 | 467 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
|
468 series["MainDicomTags"]["Modality"].asString() + " - " + |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
469 study["MainDicomTags"]["StudyDescription"].asString() + " - " + |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
470 series["MainDicomTags"]["SeriesDescription"].asString()); |
| 261 | 471 |
| 265 | 472 if (sopClassUid == OrthancWSI::VL_WHOLE_SLIDE_MICROSCOPY_IMAGE_STORAGE_IOD) |
| 473 { | |
| 474 /** | |
| 475 * This is based on IIIF cookbook: "Support Deep Viewing with Basic | |
| 476 * Use of a IIIF Image Service." | |
| 477 * https://iiif.io/api/cookbook/recipe/0005-image-service/ | |
| 478 **/ | |
| 479 unsigned int width, height; | |
| 480 | |
| 481 { | |
| 482 OrthancWSI::DicomPyramidCache::Locker locker(seriesId); | |
| 483 width = locker.GetPyramid().GetLevelWidth(0); | |
| 484 height = locker.GetPyramid().GetLevelHeight(0); | |
| 485 } | |
| 486 | |
|
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
487 AddCanvas(manifest, seriesId, "tiles/" + seriesId, 1, width, height, ""); |
| 265 | 488 } |
| 489 else | |
| 490 { | |
| 491 /** | |
| 492 * This is based on IIIF cookbook: "Simple Manifest - Book" | |
| 493 * https://iiif.io/api/cookbook/recipe/0009-book-1/ | |
| 494 **/ | |
| 495 | |
|
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
496 manifest["behavior"].append("individuals"); |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
497 |
| 265 | 498 uint32_t width, height; |
| 499 if (!oneInstance.isMember(COLUMNS) || | |
| 500 !oneInstance.isMember(ROWS) || | |
| 501 oneInstance[COLUMNS].type() != Json::stringValue || | |
| 502 oneInstance[ROWS].type() != Json::stringValue || | |
| 503 !Orthanc::SerializationToolbox::ParseFirstUnsignedInteger32(width, oneInstance[COLUMNS].asString()) || | |
| 504 !Orthanc::SerializationToolbox::ParseFirstUnsignedInteger32(height, oneInstance[ROWS].asString())) | |
| 505 { | |
| 506 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); | |
| 507 } | |
| 261 | 508 |
| 265 | 509 Json::Value orderedSlices; |
| 510 if (!OrthancPlugins::RestApiGet(orderedSlices, "/series/" + seriesId + "/ordered-slices", false)) | |
| 511 { | |
| 512 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); | |
| 513 } | |
| 514 | |
| 515 if (orderedSlices.type() != Json::objectValue || | |
| 516 !orderedSlices.isMember(SLICES_SHORT) || | |
| 517 orderedSlices[SLICES_SHORT].type() != Json::arrayValue) | |
| 518 { | |
| 519 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 520 } | |
| 521 | |
| 522 const Json::Value& slicesShort = orderedSlices[SLICES_SHORT]; | |
| 523 | |
| 524 unsigned int page = 1; | |
| 525 for (Json::ArrayIndex instance = 0; instance < slicesShort.size(); instance++) | |
| 526 { | |
| 527 if (slicesShort[instance].type() != Json::arrayValue || | |
| 528 slicesShort[instance].size() != 3u || | |
| 529 slicesShort[instance][0].type() != Json::stringValue || | |
| 530 slicesShort[instance][1].type() != Json::intValue || | |
| 531 slicesShort[instance][2].type() != Json::intValue) | |
| 532 { | |
| 533 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 534 } | |
| 535 | |
| 536 const std::string instanceId = slicesShort[instance][0].asString(); | |
| 537 const unsigned int start = slicesShort[instance][1].asUInt(); | |
| 538 const unsigned int count = slicesShort[instance][2].asUInt(); | |
| 539 | |
| 540 for (unsigned int frame = start; frame < start + count; frame++, page++) | |
| 541 { | |
|
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
542 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
|
543 page, width, height, ""); |
| 265 | 544 } |
| 545 } | |
| 546 } | |
| 261 | 547 |
| 548 std::string s = manifest.toStyledString(); | |
|
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
549 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
|
550 } |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
551 |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
552 |
| 288 | 553 void ServeIIIFFrameInfo(OrthancPluginRestOutput* output, |
| 554 const char* url, | |
| 555 const OrthancPluginHttpRequest* request) | |
|
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
556 { |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
557 const std::string instanceId(request->groups[0]); |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
558 const std::string frame(request->groups[1]); |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
559 |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
560 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
|
561 |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
562 Json::Value instance; |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
563 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
|
564 { |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
565 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
566 } |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
567 |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
568 uint32_t width, height; |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
569 if (!instance.isMember(COLUMNS) || |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
570 !instance.isMember(ROWS) || |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
571 instance[COLUMNS].type() != Json::stringValue || |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
572 instance[ROWS].type() != Json::stringValue || |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
573 !Orthanc::SerializationToolbox::ParseFirstUnsignedInteger32(width, instance[COLUMNS].asString()) || |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
574 !Orthanc::SerializationToolbox::ParseFirstUnsignedInteger32(height, instance[ROWS].asString())) |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
575 { |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
576 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); |
|
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 |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
579 Json::Value tile; |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
580 tile["height"] = height; |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
581 tile["width"] = width; |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
582 tile["scaleFactors"].append(1); |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
583 |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
584 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
|
585 result["@context"] = "http://iiif.io/api/image/3/context.json"; |
| 290 | 586 result["profile"] = "level0"; |
|
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
587 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
|
588 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
|
589 |
|
c766c25fe492
upgrade from IIIF Image API 2.1.1 to 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
590 result["id"] = iiifPublicUrl_ + "frames/" + instanceId + "/" + frame; |
|
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
591 result["width"] = width; |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
592 result["height"] = height; |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
593 result["tiles"].append(tile); |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
594 |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
595 std::string s = result.toStyledString(); |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
596 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
|
597 } |
|
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 |
| 288 | 600 void ServeIIIFFrameImage(OrthancPluginRestOutput* output, |
| 601 const char* url, | |
| 602 const OrthancPluginHttpRequest* request) | |
|
266
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
603 { |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
604 const std::string instanceId(request->groups[0]); |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
605 const std::string frame(request->groups[1]); |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
606 |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
607 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
|
608 |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
609 std::map<std::string, std::string> httpHeaders; |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
610 httpHeaders["Accept"] = Orthanc::EnumerationToString(Orthanc::MimeType_Jpeg); |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
611 |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
612 std::string jpeg; |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
613 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
|
614 { |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
615 throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
616 } |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
617 |
|
ca605878dc73
serving non-tiled images using IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
618 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
|
619 jpeg.size(), Orthanc::EnumerationToString(Orthanc::MimeType_Jpeg)); |
| 261 | 620 } |
| 621 | |
| 622 | |
| 623 void InitializeIIIF(const std::string& iiifPublicUrl) | |
| 624 { | |
| 625 iiifPublicUrl_ = iiifPublicUrl; | |
| 626 | |
|
264
75d933374805
preparing to serve non-tiled images with IIIF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
627 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
|
628 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
|
629 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
|
630 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
|
631 OrthancPlugins::RegisterRestCallback<ServeIIIFFrameImage>("/wsi/iiif/frames/([0-9a-f-]+)/([0-9]+)/full/max/0/default.jpg", true); |
| 261 | 632 } |
|
274
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
633 |
|
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
634 void SetIIIFForcePowersOfTwoScaleFactors(bool force) |
|
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
635 { |
|
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
636 iiifForcePowersOfTwoScaleFactors_ = force; |
|
2805246064aa
added SetIIIFForcePowersOfTwoScaleFactors()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
637 } |