Mercurial > hg > orthanc-stone
diff Framework/Deprecated/Loaders/OrthancSeriesVolumeProgressiveLoader.h @ 1310:9bea7e15b519 broker
- first pass at changes to cope with the refactoring of the loading system
- global loader-related data accessible through ILoadersContext::ILock
- many changes in legacy loaders (CT, RTSTRUCT, DOSE) + loader cache
- NOT FINISHED! there are shared_from_this calls in ctors! this will crash!
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Mon, 09 Mar 2020 14:53:22 +0100 |
| parents | adf234ecaa00 |
| children | 9b126de2cde2 |
line wrap: on
line diff
--- a/Framework/Deprecated/Loaders/OrthancSeriesVolumeProgressiveLoader.h Wed Mar 04 13:20:12 2020 +0100 +++ b/Framework/Deprecated/Loaders/OrthancSeriesVolumeProgressiveLoader.h Mon Mar 09 14:53:22 2020 +0100 @@ -38,6 +38,11 @@ #include <boost/shared_ptr.hpp> +namespace OrthancStone +{ + class ILoadersContext; +} + namespace Deprecated { /** @@ -108,7 +113,7 @@ void LoadJpegSliceContent(const OrthancStone::GetOrthancWebViewerJpegCommand::SuccessMessage& message); - OrthancStone::IOracle& oracle_; + OrthancStone::ILoadersContext& loadersContext_; bool active_; unsigned int simultaneousDownloads_; SeriesGeometry seriesGeometry_; @@ -118,14 +123,12 @@ std::vector<unsigned int> slicesQuality_; bool volumeImageReadyInHighQuality_; - public: ORTHANC_STONE_DEFINE_ORIGIN_MESSAGE(__FILE__, __LINE__, VolumeImageReadyInHighQuality, OrthancSeriesVolumeProgressiveLoader); - - OrthancSeriesVolumeProgressiveLoader(const boost::shared_ptr<OrthancStone::DicomVolumeImage>& volume, - OrthancStone::IOracle& oracle, - OrthancStone::IObservable& oracleObservable); + OrthancSeriesVolumeProgressiveLoader( + OrthancStone::ILoadersContext& context, + const boost::shared_ptr<OrthancStone::DicomVolumeImage>& volume); virtual ~OrthancSeriesVolumeProgressiveLoader();