Mercurial > hg > orthanc-stone
diff OrthancStone/Sources/Toolbox/DicomInstanceParameters.h @ 1637:d569effcd433
cont
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 10 Nov 2020 16:25:20 +0100 |
parents | d1e0b08b809d |
children | 5cc589bfb385 |
line wrap: on
line diff
--- a/OrthancStone/Sources/Toolbox/DicomInstanceParameters.h Tue Nov 10 16:20:22 2020 +0100 +++ b/OrthancStone/Sources/Toolbox/DicomInstanceParameters.h Tue Nov 10 16:25:20 2020 +0100 @@ -53,14 +53,12 @@ double pixelSpacingY_; CoordinateSystem3D geometry_; Vector frameOffsets_; - bool isColor_; // TODO REMOVE bool hasRescale_; double rescaleIntercept_; double rescaleSlope_; bool hasDefaultWindowing_; float defaultWindowingCenter_; float defaultWindowingWidth_; - Orthanc::PixelFormat expectedPixelFormat_; // TODO REMOVE bool hasIndexInSeries_; unsigned int indexInSeries_; std::string doseUnits_; @@ -166,10 +164,7 @@ bool IsPlaneWithinSlice(unsigned int frame, const CoordinateSystem3D& plane) const; - bool IsColor() const - { - return data_.isColor_; - } + bool IsColor() const; bool HasRescale() const { @@ -189,10 +184,7 @@ float GetDefaultWindowingWidth() const; - Orthanc::PixelFormat GetExpectedPixelFormat() const - { - return data_.expectedPixelFormat_; - } + Orthanc::PixelFormat GetExpectedPixelFormat() const; Orthanc::ImageAccessor* ConvertToFloat(const Orthanc::ImageAccessor& pixelData) const;