Mercurial > hg > orthanc-stone
diff Framework/Radiography/RadiographyLayer.h @ 1259:69177b10e2b9
various fixes for RadiographyScene: support text layers outside the dicom layer, fix background in this case + extract dicom from rendered scene
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Tue, 21 Jan 2020 16:52:37 +0100 |
parents | a5f2a6b04a31 |
children | 2d8ab34c8c91 a989c7d46b9a |
line wrap: on
line diff
--- a/Framework/Radiography/RadiographyLayer.h Tue Jan 14 15:22:10 2020 +0100 +++ b/Framework/Radiography/RadiographyLayer.h Tue Jan 21 16:52:37 2020 +0100 @@ -217,16 +217,6 @@ const RadiographyScene& scene_; protected: - virtual const AffineTransform2D& GetTransform() const - { - return transform_; - } - - virtual const AffineTransform2D& GetTransformInverse() const - { - return transformInverse_; - } - void SetPreferredPhotomotricDisplayMode(RadiographyPhotometricDisplayMode prefferedPhotometricDisplayMode); private: @@ -254,6 +244,16 @@ { } + virtual const AffineTransform2D& GetTransform() const + { + return transform_; + } + + virtual const AffineTransform2D& GetTransformInverse() const + { + return transformInverse_; + } + size_t GetIndex() const { return index_; @@ -358,8 +358,6 @@ virtual bool GetRange(float& minValue, float& maxValue) const = 0; - friend class RadiographyMaskLayer; // because it needs to GetTransform on the dicomLayer it relates to - virtual size_t GetApproximateMemoryUsage() const // this is used to limit the number of scenes loaded in RAM when resources are limited (we actually only count the size used by the images, not the C structs) { return 0;