Mercurial > hg > orthanc-stone
diff Framework/dev.h @ 252:40b21c1f8b8d am-2
more usage of IObservable/IObserver
author | am@osimis.io |
---|---|
date | Tue, 03 Jul 2018 10:26:56 +0200 |
parents | 192e6e349e69 |
children | c9cf95b49a86 |
line wrap: on
line diff
--- a/Framework/dev.h Mon Jul 02 18:13:46 2018 +0200 +++ b/Framework/dev.h Tue Jul 03 10:26:56 2018 +0200 @@ -43,7 +43,7 @@ // TODO: Handle errors while loading class OrthancVolumeImage : public SlicedVolumeBase, - private OrthancSlicesLoader::ICallback + private OrthancSlicesLoader::ISliceLoaderObserver { private: OrthancSlicesLoader loader_; @@ -106,7 +106,7 @@ } - virtual void NotifyGeometryReady(const OrthancSlicesLoader& loader) + virtual void OnSliceGeometryReady(const OrthancSlicesLoader& loader) { if (loader.GetSliceCount() == 0) { @@ -173,13 +173,13 @@ SlicedVolumeBase::NotifyGeometryReady(); } - virtual void NotifyGeometryError(const OrthancSlicesLoader& loader) + virtual void OnSliceGeometryError(const OrthancSlicesLoader& loader) { LOG(ERROR) << "Unable to download a volume image"; SlicedVolumeBase::NotifyGeometryError(); } - virtual void NotifySliceImageReady(const OrthancSlicesLoader& loader, + virtual void OnSliceImageReady(const OrthancSlicesLoader& loader, unsigned int sliceIndex, const Slice& slice, std::auto_ptr<Orthanc::ImageAccessor>& image, @@ -205,7 +205,7 @@ ScheduleSliceDownload(); } - virtual void NotifySliceImageError(const OrthancSlicesLoader& loader, + virtual void OnSliceImageError(const OrthancSlicesLoader& loader, unsigned int sliceIndex, const Slice& slice, SliceImageQuality quality) @@ -218,6 +218,7 @@ OrthancVolumeImage(MessageBroker& broker, IWebService& orthanc, bool computeRange) : + OrthancSlicesLoader::ISliceLoaderObserver(broker), loader_(broker, *this, orthanc), computeRange_(computeRange), pendingSlices_(0)