Mercurial > hg > orthanc-stone

comparison Framework/Radiography/RadiographySceneReader.h @ 860:238693c3bc51 am-dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default -> am-dev
author Alain Mazy <alain@mazy.be>
date Mon, 24 Jun 2019 14:35:00 +0200
parents be9c1530d40a
children 1e80a925323a
comparison
equal deleted inserted replaced
856:a6e17a5a39e7 860:238693c3bc51
24 #include "RadiographyScene.h" 24 #include "RadiographyScene.h"
25 #include "RadiographyAlphaLayer.h" 25 #include "RadiographyAlphaLayer.h"
26 #include "RadiographyDicomLayer.h" 26 #include "RadiographyDicomLayer.h"
27 #include "RadiographyMaskLayer.h" 27 #include "RadiographyMaskLayer.h"
28 #include "RadiographyTextLayer.h" 28 #include "RadiographyTextLayer.h"
29 #include "../Toolbox/OrthancApiClient.h" 29 #include "../Deprecated/Toolbox/OrthancApiClient.h"
30 30
31 #include <json/value.h> 31 #include <json/value.h>
32 #include <Core/Images/FontRegistry.h> 32 #include <Core/Images/FontRegistry.h>
33 33
34 namespace OrthancStone 34 namespace OrthancStone
40 { 40 {
41 protected: 41 protected:
42 RadiographyScene& scene_; 42 RadiographyScene& scene_;
43 const Orthanc::FontRegistry* fontRegistry_; 43 const Orthanc::FontRegistry* fontRegistry_;
44 std::auto_ptr<Orthanc::ImageAccessor> dicomImage_; 44 std::auto_ptr<Orthanc::ImageAccessor> dicomImage_;
45 std::auto_ptr<Deprecated::DicomFrameConverter> dicomFrameConverter_; 45 std::auto_ptr<Deprecated::DicomFrameConverter> dicomFrameConverter_;
46 PhotometricDisplayMode preferredPhotometricDisplayMode_; 46 RadiographyPhotometricDisplayMode preferredPhotometricDisplayMode_;
47 47
48 public: 48 public:
49 RadiographySceneBuilder(RadiographyScene& scene) : 49 RadiographySceneBuilder(RadiographyScene& scene) :
50 scene_(scene), 50 scene_(scene),
51 fontRegistry_(NULL) 51 fontRegistry_(NULL)
54 54
55 void Read(const Json::Value& input); 55 void Read(const Json::Value& input);
56 void Read(const Json::Value& input, 56 void Read(const Json::Value& input,
57 Orthanc::ImageAccessor* dicomImage, // takes ownership 57 Orthanc::ImageAccessor* dicomImage, // takes ownership
58 Deprecated::DicomFrameConverter* dicomFrameConverter, // takes ownership 58 Deprecated::DicomFrameConverter* dicomFrameConverter, // takes ownership
59 PhotometricDisplayMode preferredPhotometricDisplayMode 59 RadiographyPhotometricDisplayMode preferredPhotometricDisplayMode
60 ); 60 );
61 61
62 void SetFontRegistry(const Orthanc::FontRegistry& fontRegistry) 62 void SetFontRegistry(const Orthanc::FontRegistry& fontRegistry)
63 { 63 {
64 fontRegistry_ = &fontRegistry; 64 fontRegistry_ = &fontRegistry;