Mercurial > hg > orthanc-stone
comparison Framework/Loaders/OrthancMultiframeVolumeLoader.h @ 949:32eaf4929b08 toa2019081301
OrthancMultiframeVolumeLoader and OrthancSeriesVolumeProgressiveLoader now implement IGeometryProvider so that the geometry reference can be switched (CT or DOSE, for instance) + VolumeImageGeometry::SetSize renamed to VolumeImageGeometry::SetSizeInVoxels + prevent text layer update if text or properties do not change + a few stream operator<< for debug (Vector, Matrix,...) + fixed memory access aligment issues in ImageBuffer3D::ExtractSagittalSlice + fix for wrong screen Y offset of mpr slices in DicomVolumeImageMPRSlicer.
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Tue, 13 Aug 2019 16:01:05 +0200 |
parents | 86ac61a040c9 |
children | 34ee7204fde3 5a2d5380148d |
comparison
equal
deleted
inserted
replaced
948:141cc19e6b7d | 949:32eaf4929b08 |
---|---|
28 | 28 |
29 namespace OrthancStone | 29 namespace OrthancStone |
30 { | 30 { |
31 class OrthancMultiframeVolumeLoader : | 31 class OrthancMultiframeVolumeLoader : |
32 public LoaderStateMachine, | 32 public LoaderStateMachine, |
33 public IObservable | 33 public IObservable, |
34 public IGeometryProvider | |
34 { | 35 { |
35 private: | 36 private: |
36 class LoadRTDoseGeometry; | 37 class LoadRTDoseGeometry; |
37 class LoadGeometry; | 38 class LoadGeometry; |
38 class LoadTransferSyntax; | 39 class LoadTransferSyntax; |
54 template <typename T> | 55 template <typename T> |
55 void CopyPixelData(const std::string& pixelData); | 56 void CopyPixelData(const std::string& pixelData); |
56 | 57 |
57 void SetUncompressedPixelData(const std::string& pixelData); | 58 void SetUncompressedPixelData(const std::string& pixelData); |
58 | 59 |
60 virtual bool HasGeometry() const ORTHANC_OVERRIDE; | |
61 virtual const VolumeImageGeometry& GetImageGeometry() const ORTHANC_OVERRIDE; | |
62 | |
59 public: | 63 public: |
60 OrthancMultiframeVolumeLoader(boost::shared_ptr<DicomVolumeImage> volume, | 64 OrthancMultiframeVolumeLoader(boost::shared_ptr<DicomVolumeImage> volume, |
61 IOracle& oracle, | 65 IOracle& oracle, |
62 IObservable& oracleObservable); | 66 IObservable& oracleObservable); |
63 | 67 |