comparison Framework/Deprecated/Volumes/StructureSetLoader.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 4fe4b221a31f
children 0ca50d275b9a
comparison
equal deleted inserted replaced
1065:9d42f89b8c3c 1066:b537002f83a9
19 **/ 19 **/
20 20
21 21
22 #pragma once 22 #pragma once
23 23
24 #include "../../Messages/ObserverBase.h"
24 #include "../../Toolbox/DicomStructureSet.h" 25 #include "../../Toolbox/DicomStructureSet.h"
25 #include "../Toolbox/OrthancApiClient.h" 26 #include "../Toolbox/OrthancApiClient.h"
26 #include "IVolumeLoader.h" 27 #include "IVolumeLoader.h"
27 28
28 namespace Deprecated 29 namespace Deprecated
29 { 30 {
30 class StructureSetLoader : 31 class StructureSetLoader :
31 public IVolumeLoader, 32 public IVolumeLoader,
32 public OrthancStone::IObserver 33 public OrthancStone::ObserverBase<StructureSetLoader>
33 { 34 {
34 private: 35 private:
35 OrthancApiClient& orthanc_; 36 OrthancApiClient& orthanc_;
36 std::auto_ptr<OrthancStone::DicomStructureSet> structureSet_; 37 std::auto_ptr<OrthancStone::DicomStructureSet> structureSet_;
37 38
40 void OnStructureSetLoaded(const OrthancApiClient::JsonResponseReadyMessage& message); 41 void OnStructureSetLoaded(const OrthancApiClient::JsonResponseReadyMessage& message);
41 42
42 void OnLookupCompleted(const OrthancApiClient::JsonResponseReadyMessage& message); 43 void OnLookupCompleted(const OrthancApiClient::JsonResponseReadyMessage& message);
43 44
44 public: 45 public:
45 StructureSetLoader(OrthancStone::MessageBroker& broker, 46 StructureSetLoader(OrthancApiClient& orthanc);
46 OrthancApiClient& orthanc);
47 47
48 void ScheduleLoadInstance(const std::string& instance); 48 void ScheduleLoadInstance(const std::string& instance);
49 49
50 bool HasStructureSet() const 50 bool HasStructureSet() const
51 { 51 {