# HG changeset patch # User Benjamin Golinvaux # Date 1571129608 -7200 # Node ID eb28dfe432f71942b14cd376ee5ac08815b5acd0 # Parent 839d2bff92abffc8dd4aa375658d033d5bf4a7d2 fixed typo in assert. msg. + getters for custom windowing in grayscale layer configurator. diff -r 839d2bff92ab -r eb28dfe432f7 Framework/Loaders/LoaderStateMachine.cpp --- a/Framework/Loaders/LoaderStateMachine.cpp Mon Oct 07 15:09:45 2019 +0200 +++ b/Framework/Loaders/LoaderStateMachine.cpp Tue Oct 15 10:53:28 2019 +0200 @@ -106,7 +106,7 @@ { LOG(TRACE) << " LoaderStateMachine(" << std::hex << this << std::dec << ")::Step(): activeCommands_ (" << activeCommands_ << - ") < simultaneousDownloads_ (" << simultaneousDownloads_ << + ") >= simultaneousDownloads_ (" << simultaneousDownloads_ << ") --> will NOT Schedule command"; } } diff -r 839d2bff92ab -r eb28dfe432f7 Framework/Scene2D/FloatTextureSceneLayer.cpp --- a/Framework/Scene2D/FloatTextureSceneLayer.cpp Mon Oct 07 15:09:45 2019 +0200 +++ b/Framework/Scene2D/FloatTextureSceneLayer.cpp Tue Oct 15 10:53:28 2019 +0200 @@ -61,7 +61,6 @@ } } - void FloatTextureSceneLayer::SetCustomWindowing(float customCenter, float customWidth) { diff -r 839d2bff92ab -r eb28dfe432f7 Framework/Scene2D/GrayscaleStyleConfigurator.cpp --- a/Framework/Scene2D/GrayscaleStyleConfigurator.cpp Mon Oct 07 15:09:45 2019 +0200 +++ b/Framework/Scene2D/GrayscaleStyleConfigurator.cpp Tue Oct 15 10:53:28 2019 +0200 @@ -41,6 +41,11 @@ customWindowWidth_ = windowWidth; } + void GrayscaleStyleConfigurator::GetCustomWindowing(float& windowCenter, float& windowWidth) const + { + windowCenter = customWindowCenter_; + windowWidth = customWindowWidth_; + } void GrayscaleStyleConfigurator::SetInverted(bool inverted) { diff -r 839d2bff92ab -r eb28dfe432f7 Framework/Scene2D/GrayscaleStyleConfigurator.h --- a/Framework/Scene2D/GrayscaleStyleConfigurator.h Mon Oct 07 15:09:45 2019 +0200 +++ b/Framework/Scene2D/GrayscaleStyleConfigurator.h Tue Oct 15 10:53:28 2019 +0200 @@ -53,7 +53,9 @@ void SetWindowing(ImageWindowing windowing); - void SetCustomWindowing(float windowWidth, float windowCenter); + void SetCustomWindowing(float windowCenter, float windowWidth); + + void GetCustomWindowing(float& windowCenter, float& windowWidth) const; void SetInverted(bool inverted);