Mercurial > hg > orthanc-stone

diff Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.h @ 949:32eaf4929b08 toa2019081301

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 4a593397b11c
line wrap: on
line diff
--- a/Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.h	Sat Aug 10 13:13:11 2019 +0200
+++ b/Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.h	Tue Aug 13 16:01:05 2019 +0200
@@ -44,7 +44,8 @@
   class OrthancSeriesVolumeProgressiveLoader : 
     public IObserver,
     public IObservable,
-    public IVolumeSlicer
+    public IVolumeSlicer,
+    public IGeometryProvider
   {
   private:
     static const unsigned int LOW_QUALITY = 0;
@@ -78,12 +79,12 @@
 
       void ComputeGeometry(SlicesSorter& slices);
 
-      bool HasGeometry() const
+      virtual bool HasGeometry() const
       {
         return geometry_.get() != NULL;
       }
 
-      const VolumeImageGeometry& GetImageGeometry() const;
+      virtual const VolumeImageGeometry& GetImageGeometry() const;
 
       const DicomInstanceParameters& GetSliceParameters(size_t index) const;
 
@@ -139,7 +140,7 @@
     subscribing, for instance if they are created or listening only AFTER the
     "geometry loaded" message is broadcast 
     */
-    bool HasGeometry() const
+    bool HasGeometry() const ORTHANC_OVERRIDE
     {
       return seriesGeometry_.HasGeometry();
     }
@@ -147,7 +148,7 @@
     /**
     Same remark as HasGeometry
     */
-    const VolumeImageGeometry& GetImageGeometry() const
+    const VolumeImageGeometry& GetImageGeometry() const ORTHANC_OVERRIDE
     {
       return seriesGeometry_.GetImageGeometry();
     }