Mercurial > hg > orthanc-stone
diff Framework/Radiography/RadiographyScene.h @ 1200:54cbffabdc45 broker
integration mainline->broker
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 29 Nov 2019 11:03:41 +0100 |
parents | bdc6837d5917 922d2e61aa5d |
children | b519c1c878f1 |
line wrap: on
line diff
--- a/Framework/Radiography/RadiographyScene.h Thu Nov 28 17:13:33 2019 +0100 +++ b/Framework/Radiography/RadiographyScene.h Fri Nov 29 11:03:41 2019 +0100 @@ -162,7 +162,7 @@ protected: typedef std::map<size_t, RadiographyLayer*> Layers; - size_t countLayers_; + size_t nextLayerIndex_; bool hasWindowing_; float windowingCenter_; float windowingWidth_; @@ -199,7 +199,7 @@ RadiographyPhotometricDisplayMode GetPreferredPhotomotricDisplayMode() const; RadiographyLayer& LoadText(const std::string& utf8, - size_t fontSize, + unsigned int fontSize, uint8_t foreground, RadiographyLayer::Geometry* geometry); @@ -288,7 +288,8 @@ virtual void Render(Orthanc::ImageAccessor& buffer, const AffineTransform2D& viewTransform, - ImageInterpolation interpolation) const; + ImageInterpolation interpolation, + bool applyWindowing) const; bool LookupLayer(size_t& index /* out */, double x, @@ -340,15 +341,17 @@ Orthanc::Image* ExportToImage(double pixelSpacingX, double pixelSpacingY, - ImageInterpolation interpolation) + ImageInterpolation interpolation, + bool applyWindowing) { - return ExportToImage(pixelSpacingX, pixelSpacingY, interpolation, false, 0); + return ExportToImage(pixelSpacingX, pixelSpacingY, interpolation, false, 0, applyWindowing); } Orthanc::Image* ExportToImage(double pixelSpacingX, double pixelSpacingY, ImageInterpolation interpolation, bool invert, - int64_t maxValue /* for inversion */); + int64_t maxValue /* for inversion */, + bool applyWindowing); // i.e.: when }; }