Mercurial > hg > orthanc-stone
comparison Framework/Radiography/RadiographySceneReader.cpp @ 860:238693c3bc51 am-dev
merge default -> am-dev
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Mon, 24 Jun 2019 14:35:00 +0200 |
parents | cfb4d39065a4 be9c1530d40a |
children | 1e80a925323a |
comparison
equal
deleted
inserted
replaced
856:a6e17a5a39e7 | 860:238693c3bc51 |
---|---|
19 **/ | 19 **/ |
20 | 20 |
21 | 21 |
22 #include "RadiographySceneReader.h" | 22 #include "RadiographySceneReader.h" |
23 | 23 |
24 #include <Framework/Toolbox/DicomFrameConverter.h> | 24 #include "../Deprecated/Toolbox/DicomFrameConverter.h" |
25 | 25 |
26 #include <Core/Images/FontRegistry.h> | 26 #include <Core/Images/FontRegistry.h> |
27 #include <Core/Images/PngReader.h> | 27 #include <Core/Images/PngReader.h> |
28 #include <Core/OrthancException.h> | 28 #include <Core/OrthancException.h> |
29 #include <Core/Toolbox.h> | 29 #include <Core/Toolbox.h> |
31 namespace OrthancStone | 31 namespace OrthancStone |
32 { | 32 { |
33 | 33 |
34 void RadiographySceneBuilder::Read(const Json::Value& input, Orthanc::ImageAccessor* dicomImage /* takes ownership */, | 34 void RadiographySceneBuilder::Read(const Json::Value& input, Orthanc::ImageAccessor* dicomImage /* takes ownership */, |
35 Deprecated::DicomFrameConverter* dicomFrameConverter /* takes ownership */, | 35 Deprecated::DicomFrameConverter* dicomFrameConverter /* takes ownership */, |
36 PhotometricDisplayMode preferredPhotometricDisplayMode | 36 RadiographyPhotometricDisplayMode preferredPhotometricDisplayMode |
37 ) | 37 ) |
38 { | 38 { |
39 dicomImage_.reset(dicomImage); | 39 dicomImage_.reset(dicomImage); |
40 dicomFrameConverter_.reset(dicomFrameConverter); | 40 dicomFrameConverter_.reset(dicomFrameConverter); |
41 preferredPhotometricDisplayMode_ = preferredPhotometricDisplayMode; | 41 preferredPhotometricDisplayMode_ = preferredPhotometricDisplayMode; |