diff OrthancStone/Sources/Toolbox/DicomInstanceParameters.h @ 1635:1a714e21ea7c

start refactoring DicomInstanceParameters
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 10 Nov 2020 16:08:44 +0100
parents a4418a489e86
children d1e0b08b809d
line wrap: on
line diff
--- a/OrthancStone/Sources/Toolbox/DicomInstanceParameters.h	Tue Nov 10 11:11:28 2020 +0100
+++ b/OrthancStone/Sources/Toolbox/DicomInstanceParameters.h	Tue Nov 10 16:08:44 2020 +0100
@@ -43,21 +43,24 @@
       std::string                       studyInstanceUid_;
       std::string                       seriesInstanceUid_;
       std::string                       sopInstanceUid_;
-      Orthanc::DicomImageInformation    imageInformation_;
+      Orthanc::DicomImageInformation    imageInformation_;  // TODO REMOVE
       SopClassUid                       sopClassUid_;
+      unsigned int                      numberOfFrames_;
+      unsigned int                      width_;
+      unsigned int                      height_;
       double                            sliceThickness_;
       double                            pixelSpacingX_;
       double                            pixelSpacingY_;
       CoordinateSystem3D                geometry_;
       Vector                            frameOffsets_;
-      bool                              isColor_;
+      bool                              isColor_;   // TODO REMOVE
       bool                              hasRescale_;
       double                            rescaleIntercept_;
       double                            rescaleSlope_;
       bool                              hasDefaultWindowing_;
       float                             defaultWindowingCenter_;
       float                             defaultWindowingWidth_;
-      Orthanc::PixelFormat              expectedPixelFormat_;
+      Orthanc::PixelFormat              expectedPixelFormat_;  // TODO REMOVE
       bool                              hasIndexInSeries_;
       unsigned int                      indexInSeries_;
       std::string                       doseUnits_;
@@ -135,6 +138,21 @@
       return data_.sopClassUid_;
     }
 
+    unsigned int GetNumberOfFrames() const
+    {
+      return data_.numberOfFrames_;
+    }
+
+    unsigned int GetWidth() const
+    {
+      return data_.width_;
+    }
+
+    unsigned int GetHeight() const
+    {
+      return data_.height_;
+    }
+
     double GetSliceThickness() const
     {
       return data_.sliceThickness_;