Mercurial > hg > orthanc-stone

diff Framework/Deprecated/Loaders/DicomStructureSetLoader.cpp @ 1310:9bea7e15b519 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- 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 257f2c9a02ac
children 9b126de2cde2
line wrap: on
line diff
--- a/Framework/Deprecated/Loaders/DicomStructureSetLoader.cpp	Wed Mar 04 13:20:12 2020 +0100
+++ b/Framework/Deprecated/Loaders/DicomStructureSetLoader.cpp	Mon Mar 09 14:53:22 2020 +0100
@@ -345,16 +345,17 @@
   };
     
 
-  DicomStructureSetLoader::DicomStructureSetLoader(OrthancStone::IOracle& oracle,
-                                                   OrthancStone::IObservable& oracleObservable) :
-    LoaderStateMachine(oracle, oracleObservable),
-    revision_(0),
-    countProcessedInstances_(0),
-    countReferencedInstances_(0),
-    structuresReady_(false)
+  DicomStructureSetLoader::DicomStructureSetLoader(
+    OrthancStone::ILoadersContext& loadersContext) 
+    : LoaderStateMachine(loadersContext)
+    , loadersContext_(loadersContext)
+    , revision_(0)
+    , countProcessedInstances_(0)
+    , countReferencedInstances_(0)
+    , structuresReady_(false)
   {
   }
-    
+   
     
   void DicomStructureSetLoader::SetStructureDisplayState(size_t structureIndex, bool display)
   {