Mercurial > hg > orthanc-stone
changeset 1062:2d6237221ff1
Merge
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Tue, 15 Oct 2019 10:54:53 +0200 |
| parents | eb28dfe432f7 (diff) 5df50e0f0390 (current diff) |
| children | 3e8f59cefec6 6dd90b8d1589 |
| files | Applications/Sdl/SdlOpenGLContext.cpp Applications/Sdl/SdlOpenGLContext.h Applications/Sdl/SdlWindow.cpp Applications/Sdl/SdlWindow.h Framework/Messages/Promise.h UnitTestsSources/TestExceptions.cpp |
| diffstat | 4 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Framework/Loaders/LoaderStateMachine.cpp Fri Oct 11 13:37:21 2019 +0200 +++ b/Framework/Loaders/LoaderStateMachine.cpp Tue Oct 15 10:54:53 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"; } }
--- a/Framework/Scene2D/FloatTextureSceneLayer.cpp Fri Oct 11 13:37:21 2019 +0200 +++ b/Framework/Scene2D/FloatTextureSceneLayer.cpp Tue Oct 15 10:54:53 2019 +0200 @@ -61,7 +61,6 @@ } } - void FloatTextureSceneLayer::SetCustomWindowing(float customCenter, float customWidth) {
--- a/Framework/Scene2D/GrayscaleStyleConfigurator.cpp Fri Oct 11 13:37:21 2019 +0200 +++ b/Framework/Scene2D/GrayscaleStyleConfigurator.cpp Tue Oct 15 10:54:53 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) {
--- a/Framework/Scene2D/GrayscaleStyleConfigurator.h Fri Oct 11 13:37:21 2019 +0200 +++ b/Framework/Scene2D/GrayscaleStyleConfigurator.h Tue Oct 15 10:54:53 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);