Mercurial > hg > orthanc-stone
comparison Framework/Deprecated/Loaders/DicomStructureSetLoader.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 | 257f2c9a02ac |
children | 9b126de2cde2 |
comparison
equal
deleted
inserted
replaced
1309:1f877e0846fe | 1310:9bea7e15b519 |
---|---|
40 // States of LoaderStateMachine | 40 // States of LoaderStateMachine |
41 class AddReferencedInstance; // 3rd state | 41 class AddReferencedInstance; // 3rd state |
42 class LookupInstance; // 2nd state | 42 class LookupInstance; // 2nd state |
43 class LoadStructure; // 1st state | 43 class LoadStructure; // 1st state |
44 | 44 |
45 OrthancStone::ILoadersContext& loadersContext_; | |
45 std::unique_ptr<OrthancStone::DicomStructureSet> content_; | 46 std::unique_ptr<OrthancStone::DicomStructureSet> content_; |
46 uint64_t revision_; | 47 uint64_t revision_; |
47 std::string instanceId_; | 48 std::string instanceId_; |
48 unsigned int countProcessedInstances_; | 49 unsigned int countProcessedInstances_; |
49 unsigned int countReferencedInstances_; | 50 unsigned int countReferencedInstances_; |
50 | 51 |
51 // will be set to true once the loading is finished | 52 // will be set to true once the loading is finished |
52 bool structuresReady_; | 53 bool structuresReady_; |
53 | 54 |
54 /** | 55 /** |
55 At load time, these strings are used to initialize the structureVisibility_ | 56 At load time, these strings are used to initialize the structureVisibility_ |
56 vector. | 57 vector. |
57 | 58 |
69 std::vector<bool> structureVisibility_; | 70 std::vector<bool> structureVisibility_; |
70 | 71 |
71 public: | 72 public: |
72 ORTHANC_STONE_DEFINE_ORIGIN_MESSAGE(__FILE__, __LINE__, StructuresReady, DicomStructureSetLoader); | 73 ORTHANC_STONE_DEFINE_ORIGIN_MESSAGE(__FILE__, __LINE__, StructuresReady, DicomStructureSetLoader); |
73 | 74 |
74 DicomStructureSetLoader(OrthancStone::IOracle& oracle, | 75 DicomStructureSetLoader(OrthancStone::ILoadersContext& loadersContext); |
75 OrthancStone::IObservable& oracleObservable); | |
76 | 76 |
77 OrthancStone::DicomStructureSet* GetContent() | 77 OrthancStone::DicomStructureSet* GetContent() |
78 { | 78 { |
79 return content_.get(); | 79 return content_.get(); |
80 } | 80 } |