Mercurial > hg > orthanc-stone

comparison Framework/Deprecated/Toolbox/OrthancSlicesLoader.cpp @ 792:4fe4b221a31f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deprecating MessagingToolbox
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 28 May 2019 08:49:49 +0200
parents be9c1530d40a
children b537002f83a9 2d8ab34c8c91
comparison
equal deleted inserted replaced
791:907189734acd 792:4fe4b221a31f
19 **/ 19 **/
20 20
21 21
22 #include "OrthancSlicesLoader.h" 22 #include "OrthancSlicesLoader.h"
23 23
24 #include "../../Toolbox/MessagingToolbox.h" 24 #include "../Toolbox/MessagingToolbox.h"
25 25
26 #include <Core/Compression/GzipCompressor.h> 26 #include <Core/Compression/GzipCompressor.h>
27 #include <Core/Endianness.h> 27 #include <Core/Endianness.h>
28 #include <Core/Images/Image.h> 28 #include <Core/Images/Image.h>
29 #include <Core/Images/ImageProcessing.h> 29 #include <Core/Images/ImageProcessing.h>
229 for (size_t i = 0; i < instances.size(); i++) 229 for (size_t i = 0; i < instances.size(); i++)
230 { 230 {
231 OrthancPlugins::FullOrthancDataset dataset(series[instances[i]]); 231 OrthancPlugins::FullOrthancDataset dataset(series[instances[i]]);
232 232
233 Orthanc::DicomMap dicom; 233 Orthanc::DicomMap dicom;
234 OrthancStone::MessagingToolbox::ConvertDataset(dicom, dataset); 234 MessagingToolbox::ConvertDataset(dicom, dataset);
235 235
236 unsigned int frames; 236 unsigned int frames;
237 if (!dicom.ParseUnsignedInteger32(frames, Orthanc::DICOM_TAG_NUMBER_OF_FRAMES)) 237 if (!dicom.ParseUnsignedInteger32(frames, Orthanc::DICOM_TAG_NUMBER_OF_FRAMES))
238 { 238 {
239 frames = 1; 239 frames = 1;
263 const std::string& instanceId = dynamic_cast<const OrthancSlicesLoader::Operation&>(message.GetPayload()).GetInstanceId(); 263 const std::string& instanceId = dynamic_cast<const OrthancSlicesLoader::Operation&>(message.GetPayload()).GetInstanceId();
264 264
265 OrthancPlugins::FullOrthancDataset dataset(tags); 265 OrthancPlugins::FullOrthancDataset dataset(tags);
266 266
267 Orthanc::DicomMap dicom; 267 Orthanc::DicomMap dicom;
268 OrthancStone::MessagingToolbox::ConvertDataset(dicom, dataset); 268 MessagingToolbox::ConvertDataset(dicom, dataset);
269 269
270 unsigned int frames; 270 unsigned int frames;
271 if (!dicom.ParseUnsignedInteger32(frames, Orthanc::DICOM_TAG_NUMBER_OF_FRAMES)) 271 if (!dicom.ParseUnsignedInteger32(frames, Orthanc::DICOM_TAG_NUMBER_OF_FRAMES))
272 { 272 {
273 frames = 1; 273 frames = 1;
304 OrthancPlugins::FullOrthancDataset dataset(tags); 304 OrthancPlugins::FullOrthancDataset dataset(tags);
305 305
306 state_ = State_GeometryReady; 306 state_ = State_GeometryReady;
307 307
308 Orthanc::DicomMap dicom; 308 Orthanc::DicomMap dicom;
309 OrthancStone::MessagingToolbox::ConvertDataset(dicom, dataset); 309 MessagingToolbox::ConvertDataset(dicom, dataset);
310 310
311 std::auto_ptr<Slice> slice(new Slice); 311 std::auto_ptr<Slice> slice(new Slice);
312 if (slice->ParseOrthancFrame(dicom, instanceId, frame)) 312 if (slice->ParseOrthancFrame(dicom, instanceId, frame))
313 { 313 {
314 LOG(INFO) << "Loaded instance geometry " << instanceId; 314 LOG(INFO) << "Loaded instance geometry " << instanceId;