comparison Framework/Layers/IVolumeSlicer.h @ 643:f0008c55e5f7

getting rid of MessageType enumeration
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 10 May 2019 17:34:48 +0200
parents b70e9be013e4
children d2c0e347ddc2
comparison
equal deleted inserted replaced
642:7ca8dc7ec17b 643:f0008c55e5f7
31 namespace OrthancStone 31 namespace OrthancStone
32 { 32 {
33 class IVolumeSlicer : public IObservable 33 class IVolumeSlicer : public IObservable
34 { 34 {
35 public: 35 public:
36 typedef OriginMessage<MessageType_VolumeSlicer_GeometryReady, IVolumeSlicer> GeometryReadyMessage; 36 ORTHANC_STONE_DEFINE_ORIGIN_MESSAGE(__FILE__, __LINE__, GeometryReadyMessage, IVolumeSlicer);
37 typedef OriginMessage<MessageType_VolumeSlicer_GeometryError, IVolumeSlicer> GeometryErrorMessage; 37 ORTHANC_STONE_DEFINE_ORIGIN_MESSAGE(__FILE__, __LINE__, GeometryErrorMessage, IVolumeSlicer);
38 typedef OriginMessage<MessageType_VolumeSlicer_ContentChanged, IVolumeSlicer> ContentChangedMessage; 38 ORTHANC_STONE_DEFINE_ORIGIN_MESSAGE(__FILE__, __LINE__, ContentChangedMessage, IVolumeSlicer);
39 39
40 class SliceContentChangedMessage : public OriginMessage<MessageType_VolumeSlicer_SliceChanged, IVolumeSlicer> 40 class SliceContentChangedMessage : public OriginMessage<IVolumeSlicer>
41 { 41 {
42 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
43
42 private: 44 private:
43 const Slice& slice_; 45 const Slice& slice_;
44 46
45 public: 47 public:
46 SliceContentChangedMessage(IVolumeSlicer& origin, 48 SliceContentChangedMessage(IVolumeSlicer& origin,
47 const Slice& slice) : 49 const Slice& slice) :
48 OriginMessage(origin), 50 OriginMessage(origin),
49 slice_(slice) 51 slice_(slice)
50 { 52 {
51 } 53 }
52 54
55 return slice_; 57 return slice_;
56 } 58 }
57 }; 59 };
58 60
59 61
60 class LayerReadyMessage : public OriginMessage<MessageType_VolumeSlicer_LayerReady, IVolumeSlicer> 62 class LayerReadyMessage : public OriginMessage<IVolumeSlicer>
61 { 63 {
64 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
65
62 public: 66 public:
63 class IRendererFactory : public boost::noncopyable 67 class IRendererFactory : public boost::noncopyable
64 { 68 {
65 public: 69 public:
66 virtual ~IRendererFactory() 70 virtual ~IRendererFactory()
94 return slice_; 98 return slice_;
95 } 99 }
96 }; 100 };
97 101
98 102
99 class LayerErrorMessage : public OriginMessage<MessageType_VolumeSlicer_LayerError, IVolumeSlicer> 103 class LayerErrorMessage : public OriginMessage<IVolumeSlicer>
100 { 104 {
105 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
106
101 private: 107 private:
102 const CoordinateSystem3D& slice_; 108 const CoordinateSystem3D& slice_;
103 109
104 public: 110 public:
105 LayerErrorMessage(IVolumeSlicer& origin, 111 LayerErrorMessage(IVolumeSlicer& origin,