Mercurial > hg > orthanc-stone
annotate Framework/Toolbox/MessagingToolbox.cpp @ 118:a4d0b6c82b29 wasm
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 02 Oct 2017 14:31:26 +0200 |
| parents | 2eca030792aa |
| children | ba83e38cf3ff |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 2 * Stone of Orthanc | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
|
40
7207a407bcd8
shared copyright with osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
35
diff
changeset
|
5 * Copyright (C) 2017 Osimis, Belgium |
| 0 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 47 | 8 * modify it under the terms of the GNU Affero General Public License |
| 9 * as published by the Free Software Foundation, either version 3 of | |
| 10 * the License, or (at your option) any later version. | |
| 0 | 11 * |
| 12 * This program is distributed in the hope that it will be useful, but | |
| 13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 47 | 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 15 * Affero General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Affero General Public License | |
| 0 | 18 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 19 **/ | |
| 20 | |
| 21 | |
| 22 #include "MessagingToolbox.h" | |
| 23 | |
|
113
2eca030792aa
using the Orthanc Framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
24 #include <Core/Images/Image.h> |
|
2eca030792aa
using the Orthanc Framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
25 #include <Core/Images/ImageProcessing.h> |
|
2eca030792aa
using the Orthanc Framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
26 #include <Core/Images/JpegReader.h> |
|
2eca030792aa
using the Orthanc Framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
27 #include <Core/Images/PngReader.h> |
|
2eca030792aa
using the Orthanc Framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
28 #include <Core/OrthancException.h> |
|
2eca030792aa
using the Orthanc Framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
29 #include <Core/Toolbox.h> |
|
2eca030792aa
using the Orthanc Framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
30 #include <Core/Logging.h> |
| 0 | 31 |
| 32 #include <boost/lexical_cast.hpp> | |
| 33 #include <json/reader.h> | |
| 34 | |
| 35 namespace OrthancStone | |
| 36 { | |
| 37 namespace MessagingToolbox | |
| 38 { | |
| 39 static bool ParseVersion(std::string& version, | |
| 40 unsigned int& major, | |
| 41 unsigned int& minor, | |
| 42 unsigned int& patch, | |
| 43 const Json::Value& info) | |
| 44 { | |
| 45 if (info.type() != Json::objectValue || | |
| 46 !info.isMember("Version") || | |
| 47 info["Version"].type() != Json::stringValue) | |
| 48 { | |
| 49 return false; | |
| 50 } | |
| 51 | |
| 52 version = info["Version"].asString(); | |
| 53 if (version == "mainline") | |
| 54 { | |
| 55 // Some arbitrary high values Orthanc versions will never reach ;) | |
| 56 major = 999; | |
| 57 minor = 999; | |
| 58 patch = 999; | |
| 59 return true; | |
| 60 } | |
| 61 | |
| 62 std::vector<std::string> tokens; | |
| 63 Orthanc::Toolbox::TokenizeString(tokens, version, '.'); | |
| 64 | |
| 65 if (tokens.size() != 2 && | |
| 66 tokens.size() != 3) | |
| 67 { | |
| 68 return false; | |
| 69 } | |
| 70 | |
| 71 int a, b, c; | |
| 72 try | |
| 73 { | |
| 74 a = boost::lexical_cast<int>(tokens[0]); | |
| 75 b = boost::lexical_cast<int>(tokens[1]); | |
| 76 | |
| 77 if (tokens.size() == 3) | |
| 78 { | |
| 79 c = boost::lexical_cast<int>(tokens[2]); | |
| 80 } | |
| 81 else | |
| 82 { | |
| 83 c = 0; | |
| 84 } | |
| 85 } | |
| 86 catch (boost::bad_lexical_cast&) | |
| 87 { | |
| 88 return false; | |
| 89 } | |
| 90 | |
| 91 if (a < 0 || | |
| 92 b < 0 || | |
| 93 c < 0) | |
| 94 { | |
| 95 return false; | |
| 96 } | |
| 97 else | |
| 98 { | |
| 99 major = static_cast<unsigned int>(a); | |
| 100 minor = static_cast<unsigned int>(b); | |
| 101 patch = static_cast<unsigned int>(c); | |
| 102 return true; | |
| 103 } | |
| 104 } | |
| 105 | |
| 34 | 106 |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
107 bool ParseJson(Json::Value& target, |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
108 const void* content, |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
109 size_t size) |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
110 { |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
111 Json::Reader reader; |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
112 return reader.parse(reinterpret_cast<const char*>(content), |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
113 reinterpret_cast<const char*>(content) + size, |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
114 target); |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
115 } |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
116 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
117 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
118 static void ParseJsonException(Json::Value& target, |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
119 const std::string& source) |
| 0 | 120 { |
| 121 Json::Reader reader; | |
| 122 if (!reader.parse(source, target)) | |
| 123 { | |
| 124 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
| 125 } | |
| 126 } | |
| 127 | |
| 34 | 128 |
| 0 | 129 void RestApiGet(Json::Value& target, |
|
31
9aace933cb64
sharing code with the Orthanc core
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
130 OrthancPlugins::IOrthancConnection& orthanc, |
| 0 | 131 const std::string& uri) |
| 132 { | |
| 133 std::string tmp; | |
| 134 orthanc.RestApiGet(tmp, uri); | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
135 ParseJsonException(target, tmp); |
| 0 | 136 } |
| 137 | |
| 138 | |
| 34 | 139 void RestApiPost(Json::Value& target, |
| 140 OrthancPlugins::IOrthancConnection& orthanc, | |
| 141 const std::string& uri, | |
| 142 const std::string& body) | |
| 143 { | |
| 144 std::string tmp; | |
| 145 orthanc.RestApiPost(tmp, uri, body); | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
146 ParseJsonException(target, tmp); |
| 34 | 147 } |
| 148 | |
| 149 | |
|
31
9aace933cb64
sharing code with the Orthanc core
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
150 bool HasWebViewerInstalled(OrthancPlugins::IOrthancConnection& orthanc) |
| 0 | 151 { |
| 152 try | |
| 153 { | |
| 154 Json::Value json; | |
| 155 RestApiGet(json, orthanc, "/plugins/web-viewer"); | |
| 156 return json.type() == Json::objectValue; | |
| 157 } | |
| 158 catch (Orthanc::OrthancException&) | |
| 159 { | |
| 160 return false; | |
| 161 } | |
| 162 } | |
| 163 | |
| 164 | |
|
31
9aace933cb64
sharing code with the Orthanc core
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
165 bool CheckOrthancVersion(OrthancPlugins::IOrthancConnection& orthanc) |
| 0 | 166 { |
| 167 Json::Value json; | |
| 168 std::string version; | |
| 169 unsigned int major, minor, patch; | |
| 170 | |
| 171 try | |
| 172 { | |
| 173 RestApiGet(json, orthanc, "/system"); | |
| 174 } | |
| 175 catch (Orthanc::OrthancException&) | |
| 176 { | |
| 177 LOG(ERROR) << "Cannot connect to your Orthanc server"; | |
| 178 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
| 179 } | |
| 180 | |
| 181 if (!ParseVersion(version, major, minor, patch, json)) | |
| 182 { | |
| 183 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
| 184 } | |
| 185 | |
| 186 LOG(WARNING) << "Version of the Orthanc core (must be above 1.1.0): " << version; | |
| 187 | |
| 188 // Stone is only compatible with Orthanc >= 1.1.0, otherwise deadlocks might occur | |
| 189 if (major < 1 || | |
| 190 (major == 1 && minor < 1)) | |
| 191 { | |
| 192 return false; | |
| 193 } | |
| 194 | |
| 195 try | |
| 196 { | |
| 197 RestApiGet(json, orthanc, "/plugins/web-viewer"); | |
| 198 } | |
| 199 catch (Orthanc::OrthancException&) | |
| 200 { | |
| 201 // The Web viewer is not installed, this is OK | |
| 202 LOG(WARNING) << "The Web viewer plugin is not installed, progressive download is disabled"; | |
| 203 return true; | |
| 204 } | |
| 205 | |
| 206 if (!ParseVersion(version, major, minor, patch, json)) | |
| 207 { | |
| 208 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
| 209 } | |
| 210 | |
| 211 LOG(WARNING) << "Version of the Web viewer plugin (must be above 2.2): " << version; | |
| 212 | |
| 213 return (major >= 3 || | |
| 214 (major == 2 && minor >= 2)); | |
| 215 } | |
| 216 | |
| 217 | |
|
31
9aace933cb64
sharing code with the Orthanc core
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
218 Orthanc::ImageAccessor* DecodeFrame(OrthancPlugins::IOrthancConnection& orthanc, |
| 0 | 219 const std::string& instance, |
| 220 unsigned int frame, | |
| 221 Orthanc::PixelFormat targetFormat) | |
| 222 { | |
| 223 std::string uri = ("instances/" + instance + "/frames/" + | |
| 224 boost::lexical_cast<std::string>(frame)); | |
| 225 | |
| 226 std::string compressed; | |
| 227 | |
| 228 switch (targetFormat) | |
| 229 { | |
| 230 case Orthanc::PixelFormat_RGB24: | |
| 231 orthanc.RestApiGet(compressed, uri + "/preview"); | |
| 232 break; | |
| 233 | |
| 234 case Orthanc::PixelFormat_Grayscale16: | |
| 235 orthanc.RestApiGet(compressed, uri + "/image-uint16"); | |
| 236 break; | |
| 237 | |
| 238 case Orthanc::PixelFormat_SignedGrayscale16: | |
| 239 orthanc.RestApiGet(compressed, uri + "/image-int16"); | |
| 240 break; | |
| 241 | |
| 242 default: | |
| 243 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 244 } | |
| 245 | |
| 246 std::auto_ptr<Orthanc::PngReader> result(new Orthanc::PngReader); | |
| 247 result->ReadFromMemory(compressed); | |
| 248 | |
| 249 if (targetFormat == Orthanc::PixelFormat_SignedGrayscale16) | |
| 250 { | |
| 251 if (result->GetFormat() == Orthanc::PixelFormat_Grayscale16) | |
| 252 { | |
| 253 result->SetFormat(Orthanc::PixelFormat_SignedGrayscale16); | |
| 254 } | |
| 255 else | |
| 256 { | |
| 257 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
| 258 } | |
| 259 } | |
| 260 | |
| 261 return result.release(); | |
| 262 } | |
| 263 | |
| 264 | |
|
31
9aace933cb64
sharing code with the Orthanc core
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
265 Orthanc::ImageAccessor* DecodeJpegFrame(OrthancPlugins::IOrthancConnection& orthanc, |
| 0 | 266 const std::string& instance, |
| 267 unsigned int frame, | |
| 268 unsigned int quality, | |
| 269 Orthanc::PixelFormat targetFormat) | |
| 270 { | |
| 271 if (quality <= 0 || | |
| 272 quality > 100) | |
| 273 { | |
| 274 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 275 } | |
| 276 | |
| 277 // This requires the official Web viewer plugin to be installed! | |
| 278 std::string uri = ("web-viewer/instances/jpeg" + | |
| 279 boost::lexical_cast<std::string>(quality) + | |
| 280 "-" + instance + "_" + | |
| 281 boost::lexical_cast<std::string>(frame)); | |
| 282 | |
| 283 Json::Value encoded; | |
| 284 RestApiGet(encoded, orthanc, uri); | |
| 285 | |
| 286 if (encoded.type() != Json::objectValue || | |
| 287 !encoded.isMember("Orthanc") || | |
| 288 encoded["Orthanc"].type() != Json::objectValue) | |
| 289 { | |
| 290 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
| 291 } | |
| 292 | |
| 293 Json::Value& info = encoded["Orthanc"]; | |
| 294 if (!info.isMember("PixelData") || | |
| 295 !info.isMember("Stretched") || | |
| 296 !info.isMember("Compression") || | |
| 297 info["Compression"].type() != Json::stringValue || | |
| 298 info["PixelData"].type() != Json::stringValue || | |
| 299 info["Stretched"].type() != Json::booleanValue || | |
| 300 info["Compression"].asString() != "Jpeg") | |
| 301 { | |
| 302 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
| 303 } | |
| 304 | |
| 305 bool isSigned = false; | |
| 306 bool isStretched = info["Stretched"].asBool(); | |
| 307 | |
| 308 if (info.isMember("IsSigned")) | |
| 309 { | |
| 310 if (info["IsSigned"].type() != Json::booleanValue) | |
| 311 { | |
| 312 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
| 313 } | |
| 314 else | |
| 315 { | |
| 316 isSigned = info["IsSigned"].asBool(); | |
| 317 } | |
| 318 } | |
| 319 | |
| 320 std::string jpeg; | |
| 321 Orthanc::Toolbox::DecodeBase64(jpeg, info["PixelData"].asString()); | |
| 322 | |
| 323 std::auto_ptr<Orthanc::JpegReader> reader(new Orthanc::JpegReader); | |
| 324 reader->ReadFromMemory(jpeg); | |
| 325 | |
| 326 if (reader->GetFormat() == Orthanc::PixelFormat_RGB24) // This is a color image | |
| 327 { | |
| 328 if (targetFormat != Orthanc::PixelFormat_RGB24) | |
| 329 { | |
| 330 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
| 331 } | |
| 332 | |
| 333 if (isSigned || isStretched) | |
| 334 { | |
| 335 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); | |
| 336 } | |
| 337 else | |
| 338 { | |
| 339 return reader.release(); | |
| 340 } | |
| 341 } | |
| 342 | |
| 343 if (reader->GetFormat() != Orthanc::PixelFormat_Grayscale8) | |
| 344 { | |
| 345 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); | |
| 346 } | |
| 347 | |
| 348 if (!isStretched) | |
| 349 { | |
| 350 if (targetFormat != reader->GetFormat()) | |
| 351 { | |
| 352 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
| 353 } | |
| 354 | |
| 355 return reader.release(); | |
| 356 } | |
| 357 | |
| 358 int32_t stretchLow = 0; | |
| 359 int32_t stretchHigh = 0; | |
| 360 | |
| 361 if (!info.isMember("StretchLow") || | |
| 362 !info.isMember("StretchHigh") || | |
| 363 info["StretchLow"].type() != Json::intValue || | |
| 364 info["StretchHigh"].type() != Json::intValue) | |
| 365 { | |
| 366 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); | |
| 367 } | |
| 368 | |
| 369 stretchLow = info["StretchLow"].asInt(); | |
| 370 stretchHigh = info["StretchHigh"].asInt(); | |
| 371 | |
| 372 if (stretchLow < -32768 || | |
| 373 stretchHigh > 65535 || | |
| 374 (stretchLow < 0 && stretchHigh > 32767)) | |
| 375 { | |
| 376 // This range cannot be represented with a uint16_t or an int16_t | |
| 377 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); | |
| 378 } | |
| 379 | |
| 380 // Decode a grayscale JPEG 8bpp image coming from the Web viewer | |
| 381 std::auto_ptr<Orthanc::ImageAccessor> image | |
| 11 | 382 (new Orthanc::Image(targetFormat, reader->GetWidth(), reader->GetHeight(), false)); |
| 0 | 383 |
| 384 float scaling = static_cast<float>(stretchHigh - stretchLow) / 255.0f; | |
| 385 float offset = static_cast<float>(stretchLow) / scaling; | |
| 386 | |
| 387 Orthanc::ImageProcessing::Convert(*image, *reader); | |
| 388 Orthanc::ImageProcessing::ShiftScale(*image, offset, scaling); | |
| 389 | |
| 390 #if 0 | |
| 391 /*info.removeMember("PixelData"); | |
| 392 std::cout << info.toStyledString();*/ | |
| 393 | |
| 394 int64_t a, b; | |
| 395 Orthanc::ImageProcessing::GetMinMaxValue(a, b, *image); | |
| 396 std::cout << stretchLow << "->" << stretchHigh << " = " << a << "->" << b << std::endl; | |
| 397 #endif | |
| 398 | |
| 399 return image.release(); | |
| 400 } | |
|
118
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
401 |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
402 |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
403 static void AddTag(Orthanc::DicomMap& target, |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
404 const OrthancPlugins::IDicomDataset& source, |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
405 const Orthanc::DicomTag& tag) |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
406 { |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
407 OrthancPlugins::DicomTag key(tag.GetGroup(), tag.GetElement()); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
408 |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
409 std::string value; |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
410 if (source.GetStringValue(value, key)) |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
411 { |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
412 target.SetValue(tag, value, false); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
413 } |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
414 } |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
415 |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
416 |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
417 void ConvertDataset(Orthanc::DicomMap& target, |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
418 const OrthancPlugins::IDicomDataset& source) |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
419 { |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
420 target.Clear(); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
421 |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
422 AddTag(target, source, Orthanc::DICOM_TAG_BITS_ALLOCATED); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
423 AddTag(target, source, Orthanc::DICOM_TAG_BITS_STORED); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
424 AddTag(target, source, Orthanc::DICOM_TAG_COLUMNS); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
425 AddTag(target, source, Orthanc::DICOM_TAG_FRAME_INCREMENT_POINTER); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
426 AddTag(target, source, Orthanc::DICOM_TAG_GRID_FRAME_OFFSET_VECTOR); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
427 AddTag(target, source, Orthanc::DICOM_TAG_HIGH_BIT); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
428 AddTag(target, source, Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
429 AddTag(target, source, Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
430 AddTag(target, source, Orthanc::DICOM_TAG_NUMBER_OF_FRAMES); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
431 AddTag(target, source, Orthanc::DICOM_TAG_PHOTOMETRIC_INTERPRETATION); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
432 AddTag(target, source, Orthanc::DICOM_TAG_PIXEL_REPRESENTATION); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
433 AddTag(target, source, Orthanc::DICOM_TAG_PIXEL_SPACING); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
434 AddTag(target, source, Orthanc::DICOM_TAG_PLANAR_CONFIGURATION); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
435 AddTag(target, source, Orthanc::DICOM_TAG_RESCALE_INTERCEPT); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
436 AddTag(target, source, Orthanc::DICOM_TAG_RESCALE_SLOPE); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
437 AddTag(target, source, Orthanc::DICOM_TAG_ROWS); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
438 AddTag(target, source, Orthanc::DICOM_TAG_SAMPLES_PER_PIXEL); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
439 AddTag(target, source, Orthanc::DICOM_TAG_SLICE_THICKNESS); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
440 AddTag(target, source, Orthanc::DICOM_TAG_SOP_CLASS_UID); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
441 AddTag(target, source, Orthanc::DICOM_TAG_WINDOW_CENTER); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
442 AddTag(target, source, Orthanc::DICOM_TAG_WINDOW_WIDTH); |
|
a4d0b6c82b29
using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
443 } |
| 0 | 444 } |
| 445 } |