# HG changeset patch
# User Benjamin Golinvaux <bgo@osimis.io>
# Date 1571129693 -7200
# Node ID 2d6237221ff107b9fc179c45826768cdd5470216
# Parent  eb28dfe432f71942b14cd376ee5ac08815b5acd0# Parent  5df50e0f039019d3ec01297c0daa9a6f3b97d270
Merge

diff -r 5df50e0f0390 -r 2d6237221ff1 Framework/Loaders/LoaderStateMachine.cpp
--- 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";
     }
   }
diff -r 5df50e0f0390 -r 2d6237221ff1 Framework/Scene2D/FloatTextureSceneLayer.cpp
--- 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)
   {
diff -r 5df50e0f0390 -r 2d6237221ff1 Framework/Scene2D/GrayscaleStyleConfigurator.cpp
--- 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)
   {
diff -r 5df50e0f0390 -r 2d6237221ff1 Framework/Scene2D/GrayscaleStyleConfigurator.h
--- 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);