Mercurial > hg > orthanc-stone

comparison Framework/Deprecated/Toolbox/OrthancSlicesLoader.h @ 1066:b537002f83a9 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removing broker from deprecated classes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 15 Oct 2019 15:39:39 +0200
parents be9c1530d40a
children 04a95ee91327
comparison
equal deleted inserted replaced
1065:9d42f89b8c3c 1066:b537002f83a9
20 20
21 21
22 #pragma once 22 #pragma once
23 23
24 #include "../../Messages/IObservable.h" 24 #include "../../Messages/IObservable.h"
25 #include "../../Messages/ObserverBase.h"
25 #include "../../StoneEnumerations.h" 26 #include "../../StoneEnumerations.h"
26 #include "../../Toolbox/SlicesSorter.h" 27 #include "../../Toolbox/SlicesSorter.h"
27 #include "IWebService.h" 28 #include "IWebService.h"
28 #include "OrthancApiClient.h" 29 #include "OrthancApiClient.h"
29 #include "Slice.h" 30 #include "Slice.h"
31 #include <Core/Images/Image.h> 32 #include <Core/Images/Image.h>
32 33
33 34
34 namespace Deprecated 35 namespace Deprecated
35 { 36 {
36 class OrthancSlicesLoader : public OrthancStone::IObservable, public OrthancStone::IObserver 37 class OrthancSlicesLoader :
38 public OrthancStone::IObservable,
39 public OrthancStone::ObserverBase<OrthancSlicesLoader>
37 { 40 {
38 public: 41 public:
39 ORTHANC_STONE_DEFINE_ORIGIN_MESSAGE(__FILE__, __LINE__, SliceGeometryReadyMessage, OrthancSlicesLoader); 42 ORTHANC_STONE_DEFINE_ORIGIN_MESSAGE(__FILE__, __LINE__, SliceGeometryReadyMessage, OrthancSlicesLoader);
40 ORTHANC_STONE_DEFINE_ORIGIN_MESSAGE(__FILE__, __LINE__, SliceGeometryErrorMessage, OrthancSlicesLoader); 43 ORTHANC_STONE_DEFINE_ORIGIN_MESSAGE(__FILE__, __LINE__, SliceGeometryErrorMessage, OrthancSlicesLoader);
41 44
181 SliceImageQuality quality); 184 SliceImageQuality quality);
182 185
183 void SortAndFinalizeSlices(); 186 void SortAndFinalizeSlices();
184 187
185 public: 188 public:
186 OrthancSlicesLoader(OrthancStone::MessageBroker& broker, 189 OrthancSlicesLoader(//ISliceLoaderObserver& callback,
187 //ISliceLoaderObserver& callback,
188 OrthancApiClient& orthancApi); 190 OrthancApiClient& orthancApi);
189 191
190 void ScheduleLoadSeries(const std::string& seriesId); 192 void ScheduleLoadSeries(const std::string& seriesId);
191 193
192 void ScheduleLoadInstance(const std::string& instanceId); 194 void ScheduleLoadInstance(const std::string& instanceId);