Mercurial > hg > orthanc-stone

comparison Framework/Radiography/RadiographySceneReader.h @ 1195:bdc6837d5917 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->broker
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 27 Nov 2019 14:34:34 +0100
parents d7887f88710f f417a0ae282b
children 7ec8fea061b9
comparison
equal deleted inserted replaced
1189:09fc591d8ff9 1195:bdc6837d5917
38 // It needs some architecturing... 38 // It needs some architecturing...
39 class RadiographySceneBuilder : public boost::noncopyable 39 class RadiographySceneBuilder : public boost::noncopyable
40 { 40 {
41 protected: 41 protected:
42 RadiographyScene& scene_; 42 RadiographyScene& scene_;
43 const Orthanc::FontRegistry* fontRegistry_;
44 std::auto_ptr<Orthanc::ImageAccessor> dicomImage_; 43 std::auto_ptr<Orthanc::ImageAccessor> dicomImage_;
45 std::auto_ptr<Deprecated::DicomFrameConverter> dicomFrameConverter_; 44 std::auto_ptr<Deprecated::DicomFrameConverter> dicomFrameConverter_;
46 RadiographyPhotometricDisplayMode preferredPhotometricDisplayMode_; 45 RadiographyPhotometricDisplayMode preferredPhotometricDisplayMode_;
47 46
48 public: 47 public:
49 RadiographySceneBuilder(RadiographyScene& scene) : 48 RadiographySceneBuilder(RadiographyScene& scene) :
50 scene_(scene), 49 scene_(scene)
51 fontRegistry_(NULL)
52 { 50 {
53 } 51 }
54 52
55 void Read(const Json::Value& input); 53 void Read(const Json::Value& input);
56 void Read(const Json::Value& input, 54 void Read(const Json::Value& input,
57 Orthanc::ImageAccessor* dicomImage, // takes ownership 55 Orthanc::ImageAccessor* dicomImage, // takes ownership
58 Deprecated::DicomFrameConverter* dicomFrameConverter, // takes ownership 56 Deprecated::DicomFrameConverter* dicomFrameConverter, // takes ownership
59 RadiographyPhotometricDisplayMode preferredPhotometricDisplayMode 57 RadiographyPhotometricDisplayMode preferredPhotometricDisplayMode
60 ); 58 );
61
62 void SetFontRegistry(const Orthanc::FontRegistry& fontRegistry)
63 {
64 fontRegistry_ = &fontRegistry;
65 }
66 59
67 static void ReadLayerGeometry(RadiographyLayer::Geometry& geometry, const Json::Value& input); 60 static void ReadLayerGeometry(RadiographyLayer::Geometry& geometry, const Json::Value& input);
68 static void ReadDicomLayerGeometry(RadiographyLayer::Geometry& geometry, const Json::Value& input); 61 static void ReadDicomLayerGeometry(RadiographyLayer::Geometry& geometry, const Json::Value& input);
69 62
70 protected: 63 protected: