Mercurial > hg > orthanc-stone
diff Framework/Loaders/LoaderCache.h @ 1019:29f5f2031310
Added a way to specificy which structures are to be initially displayed (the
default being ALL structures displayed) + the loader maintains a list of
structure display state, that can be modified continuously + the cache now takes
the initial list of structure into account for computing the entry + added methods
to change the loaded structure visibility + disabled the alternate loaders
(DicomStructureSetLoader2 and friends) + disabled corresponding tests
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Fri, 27 Sep 2019 13:32:05 +0200 |
| parents | e704a53c9d0a |
| children | 4383382db01d 2d8ab34c8c91 |
line wrap: on
line diff
--- a/Framework/Loaders/LoaderCache.h Thu Sep 26 09:22:27 2019 +0200 +++ b/Framework/Loaders/LoaderCache.h Fri Sep 27 13:32:05 2019 +0200 @@ -24,15 +24,19 @@ #include <map> #include <string> +#include <vector> namespace OrthancStone { class OrthancSeriesVolumeProgressiveLoader; class DicomVolumeImageMPRSlicer; class DicomStructureSetLoader; +#ifdef BGO_ENABLE_DICOMSTRUCTURESETLOADER2 class DicomStructureSetLoader2; class DicomStructureSetSlicer2; class DicomStructureSet2; +#endif + //BGO_ENABLE_DICOMSTRUCTURESETLOADER2 class OrthancMultiframeVolumeLoader; #if ORTHANC_ENABLE_WASM == 1 @@ -61,13 +65,18 @@ GetMultiframeVolumeLoader(std::string instanceUuid); boost::shared_ptr<DicomStructureSetLoader> - GetDicomStructureSetLoader (std::string instanceUuid); + GetDicomStructureSetLoader( + std::string instanceUuid, + const std::vector<std::string>& initiallyVisibleStructures); +#ifdef BGO_ENABLE_DICOMSTRUCTURESETLOADER2 boost::shared_ptr<DicomStructureSetLoader2> GetDicomStructureSetLoader2(std::string instanceUuid); boost::shared_ptr<DicomStructureSetSlicer2> GetDicomStructureSetSlicer2(std::string instanceUuid); +#endif + //BGO_ENABLE_DICOMSTRUCTURESETLOADER2 void ClearCache(); @@ -89,12 +98,15 @@ dicomVolumeImageMPRSlicers_; std::map<std::string, boost::shared_ptr<DicomStructureSetLoader> > dicomStructureSetLoaders_; +#ifdef BGO_ENABLE_DICOMSTRUCTURESETLOADER2 std::map<std::string, boost::shared_ptr<DicomStructureSetLoader2> > dicomStructureSetLoaders2_; std::map<std::string, boost::shared_ptr<DicomStructureSet2> > dicomStructureSets2_; std::map<std::string, boost::shared_ptr<DicomStructureSetSlicer2> > dicomStructureSetSlicers2_; +#endif + //BGO_ENABLE_DICOMSTRUCTURESETLOADER2 }; }