Mercurial > hg > orthanc-stone

diff Framework/Deprecated/Loaders/DicomStructureSetLoader.h @ 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.h	Wed Mar 04 13:20:12 2020 +0100
+++ b/Framework/Deprecated/Loaders/DicomStructureSetLoader.h	Mon Mar 09 14:53:22 2020 +0100
@@ -42,14 +42,15 @@
     class LookupInstance;          // 2nd state
     class LoadStructure;           // 1st state
     
+    OrthancStone::ILoadersContext&                    loadersContext_;
     std::unique_ptr<OrthancStone::DicomStructureSet>  content_;
-    uint64_t                          revision_;
-    std::string                       instanceId_;
-    unsigned int                      countProcessedInstances_;
-    unsigned int                      countReferencedInstances_;  
+    uint64_t                                          revision_;
+    std::string                                       instanceId_;
+    unsigned int                                      countProcessedInstances_;
+    unsigned int                                      countReferencedInstances_;  
 
     // will be set to true once the loading is finished
-    bool                              structuresReady_;
+    bool                                              structuresReady_;
 
     /**
     At load time, these strings are used to initialize the structureVisibility_ 
@@ -71,8 +72,7 @@
   public:
     ORTHANC_STONE_DEFINE_ORIGIN_MESSAGE(__FILE__, __LINE__, StructuresReady, DicomStructureSetLoader);
 
-    DicomStructureSetLoader(OrthancStone::IOracle& oracle,
-                            OrthancStone::IObservable& oracleObservable);    
+    DicomStructureSetLoader(OrthancStone::ILoadersContext& loadersContext);
     
     OrthancStone::DicomStructureSet* GetContent()
     {