Mercurial > hg > orthanc-stone
diff Framework/Radiography/RadiographyLayer.h @ 860:238693c3bc51 am-dev
merge default -> am-dev
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Mon, 24 Jun 2019 14:35:00 +0200 |
parents | c237e0625065 |
children | 580dd82e13f5 |
line wrap: on
line diff
--- a/Framework/Radiography/RadiographyLayer.h Wed Jun 19 17:36:33 2019 +0200 +++ b/Framework/Radiography/RadiographyLayer.h Mon Jun 24 14:35:00 2019 +0200 @@ -23,7 +23,7 @@ #include "../Toolbox/AffineTransform2D.h" #include "../Toolbox/Extent2D.h" -#include "../Viewport/CairoContext.h" +#include "../Wrappers/CairoContext.h" #include "../Messages/IMessage.h" #include "../Messages/IObservable.h" @@ -31,6 +31,23 @@ { class RadiographyScene; + enum RadiographyControlPointType + { + RadiographyControlPointType_TopLeftCorner = 0, + RadiographyControlPointType_TopRightCorner = 1, + RadiographyControlPointType_BottomRightCorner = 2, + RadiographyControlPointType_BottomLeftCorner = 3 + }; + + enum RadiographyPhotometricDisplayMode + { + RadiographyPhotometricDisplayMode_Default, + + RadiographyPhotometricDisplayMode_Monochrome1, + RadiographyPhotometricDisplayMode_Monochrome2 + }; + + struct ControlPoint { double x; @@ -196,7 +213,7 @@ AffineTransform2D transform_; AffineTransform2D transformInverse_; Geometry geometry_; - PhotometricDisplayMode prefferedPhotometricDisplayMode_; + RadiographyPhotometricDisplayMode prefferedPhotometricDisplayMode_; const RadiographyScene& scene_; protected: @@ -210,7 +227,7 @@ return transformInverse_; } - void SetPreferredPhotomotricDisplayMode(PhotometricDisplayMode prefferedPhotometricDisplayMode); + void SetPreferredPhotomotricDisplayMode(RadiographyPhotometricDisplayMode prefferedPhotometricDisplayMode); private: void UpdateTransform(); @@ -325,7 +342,7 @@ virtual bool GetDefaultWindowing(float& center, float& width) const = 0; - PhotometricDisplayMode GetPreferredPhotomotricDisplayMode() const + RadiographyPhotometricDisplayMode GetPreferredPhotomotricDisplayMode() const { return prefferedPhotometricDisplayMode_; }