Mercurial > hg > orthanc-stone

comparison Framework/Loaders/LoaderCache.h @ 930:bf03cb879eb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed LoaderCache
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 24 Jul 2019 18:45:33 +0200
parents 408bcc6c1505
children 86ac61a040c9
comparison
equal deleted inserted replaced
929:408bcc6c1505 930:bf03cb879eb4
29 { 29 {
30 class OrthancSeriesVolumeProgressiveLoader; 30 class OrthancSeriesVolumeProgressiveLoader;
31 class DicomVolumeImageMPRSlicer; 31 class DicomVolumeImageMPRSlicer;
32 class DicomStructureSetLoader; 32 class DicomStructureSetLoader;
33 class OrthancMultiframeVolumeLoader; 33 class OrthancMultiframeVolumeLoader;
34 class IOracle;
35 34
36 #if ORTHANC_ENABLE_WASM == 1 35 #if ORTHANC_ENABLE_WASM == 1
37 //class WebAssemblyOracle; 36 class WebAssemblyOracle;
38 #else 37 #else
39 //class ThreadedOracle; 38 class ThreadedOracle;
40 class LockingEmitter; 39 class LockingEmitter;
41 #endif 40 #endif
42 41
43 class LoaderCache 42 class LoaderCache
44 { 43 {
45 public: 44 public:
46 #if ORTHANC_ENABLE_WASM == 1 45 #if ORTHANC_ENABLE_WASM == 1
47 LoaderCache(IOracle& oracle); 46 LoaderCache(WebAssemblyOracle& oracle);
48 #else 47 #else
49 LoaderCache(IOracle& oracle, LockingEmitter& lockingEmitter); 48 LoaderCache(ThreadedOracle& oracle, LockingEmitter& lockingEmitter);
50 #endif 49 #endif
51 50
52 boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader> 51 boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader>
53 GetSeriesVolumeProgressiveLoader (std::string seriesUuid); 52 GetSeriesVolumeProgressiveLoader (std::string seriesUuid);
54 boost::shared_ptr<DicomVolumeImageMPRSlicer> 53 boost::shared_ptr<DicomVolumeImageMPRSlicer>
57 GetDicomStructureSetLoader (std::string instanceUuid); 56 GetDicomStructureSetLoader (std::string instanceUuid);
58 57
59 void ClearCache(); 58 void ClearCache();
60 59
61 private: 60 private:
62 IOracle& oracle_; 61
63 #if ORTHANC_ENABLE_WASM == 1 62 #if ORTHANC_ENABLE_WASM == 1
64 //WebAssemblyOracle& oracle_; 63 WebAssemblyOracle& oracle_;
65 #else 64 #else
66 //ThreadedOracle& oracle_; 65 ThreadedOracle& oracle_;
67 LockingEmitter& lockingEmitter_; 66 LockingEmitter& lockingEmitter_;
68 #endif 67 #endif
69 68
70 std::map<std::string, boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader> > 69 std::map<std::string, boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader> >
71 seriesVolumeProgressiveLoaders_; 70 seriesVolumeProgressiveLoaders_;