comparison Framework/Radiography/RadiographyScene.h @ 1066:b537002f83a9 broker

removing broker from deprecated classes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 15 Oct 2019 15:39:39 +0200
parents 692291406f6a
children d7e06542304c
comparison
equal deleted inserted replaced
1065:9d42f89b8c3c 1066:b537002f83a9
20 20
21 21
22 #pragma once 22 #pragma once
23 23
24 #include "RadiographyLayer.h" 24 #include "RadiographyLayer.h"
25 #include "../Messages/ObserverBase.h"
25 #include "../Deprecated/Toolbox/DicomFrameConverter.h" 26 #include "../Deprecated/Toolbox/DicomFrameConverter.h"
26 #include "../Deprecated/Toolbox/OrthancApiClient.h" 27 #include "../Deprecated/Toolbox/OrthancApiClient.h"
27 #include "../StoneEnumerations.h" 28 #include "../StoneEnumerations.h"
28 #include "Core/Images/Image.h" 29 #include "Core/Images/Image.h"
29 #include "Core/Images/ImageProcessing.h" 30 #include "Core/Images/ImageProcessing.h"
31 namespace OrthancStone 32 namespace OrthancStone
32 { 33 {
33 class RadiographyDicomLayer; 34 class RadiographyDicomLayer;
34 35
35 class RadiographyScene : 36 class RadiographyScene :
36 public IObserver, 37 public ObserverBase<RadiographyScene>,
37 public IObservable 38 public IObservable
38 { 39 {
39 public: 40 public:
40 class GeometryChangedMessage : public OriginMessage<RadiographyScene> 41 class GeometryChangedMessage : public OriginMessage<RadiographyScene>
41 { 42 {
42 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__); 43 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
157 158
158 void OnDicomWebReceived(const Deprecated::IWebService::HttpRequestSuccessMessage& message); 159 void OnDicomWebReceived(const Deprecated::IWebService::HttpRequestSuccessMessage& message);
159 160
160 virtual void OnLayerEdited(const RadiographyLayer::LayerEditedMessage& message); 161 virtual void OnLayerEdited(const RadiographyLayer::LayerEditedMessage& message);
161 public: 162 public:
162 RadiographyScene(MessageBroker& broker); 163 RadiographyScene();
163 164
164 virtual ~RadiographyScene(); 165 virtual ~RadiographyScene();
165 166
166 virtual size_t GetApproximateMemoryUsage() const; 167 virtual size_t GetApproximateMemoryUsage() const;
167 168