Mercurial > hg > orthanc-stone
diff Framework/Radiography/RadiographyScene.h @ 646:b4fe9642e83b
Merge from default
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Mon, 13 May 2019 15:22:08 +0200 |
parents | f0008c55e5f7 |
children | 63982c8c294a |
line wrap: on
line diff
--- a/Framework/Radiography/RadiographyScene.h Mon May 13 15:12:56 2019 +0200 +++ b/Framework/Radiography/RadiographyScene.h Mon May 13 15:22:08 2019 +0200 @@ -37,9 +37,10 @@ public IObservable { public: - class GeometryChangedMessage : - public OriginMessage<MessageType_RadiographyScene_GeometryChanged, RadiographyScene> + class GeometryChangedMessage : public OriginMessage<RadiographyScene> { + ORTHANC_STONE_MESSAGE(__FILE__, __LINE__); + private: RadiographyLayer& layer_; @@ -57,9 +58,10 @@ } }; - class ContentChangedMessage : - public OriginMessage<MessageType_RadiographyScene_ContentChanged, RadiographyScene> + class ContentChangedMessage : public OriginMessage<RadiographyScene> { + ORTHANC_STONE_MESSAGE(__FILE__, __LINE__); + private: RadiographyLayer& layer_; @@ -77,9 +79,10 @@ } }; - class LayerEditedMessage : - public OriginMessage<MessageType_RadiographyScene_LayerEdited, RadiographyScene> + class LayerEditedMessage : public OriginMessage<RadiographyScene> { + ORTHANC_STONE_MESSAGE(__FILE__, __LINE__); + private: const RadiographyLayer& layer_; @@ -95,20 +98,12 @@ { return layer_; } - }; - class WindowingChangedMessage : - public OriginMessage<MessageType_RadiographyScene_WindowingChanged, RadiographyScene> - { - public: - WindowingChangedMessage(const RadiographyScene& origin) : - OriginMessage(origin) - { - } - }; + ORTHANC_STONE_DEFINE_ORIGIN_MESSAGE(__FILE__, __LINE__, WindowingChangedMessage, RadiographyScene); + class LayerAccessor : public boost::noncopyable { private: