Mercurial > hg > orthanc-stone

changeset 589:3080ec4ec6b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed enum value: ImageWindowing_Default
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 25 Apr 2019 14:00:55 +0200
parents 2a8ac2d426db
children 5430bcffba57
files Framework/Layers/RenderStyle.cpp Framework/StoneEnumerations.cpp Framework/StoneEnumerations.h Framework/Volumes/VolumeReslicer.cpp
diffstat 4 files changed, 9 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/Layers/RenderStyle.cpp	Thu Apr 25 13:54:42 2019 +0200
+++ b/Framework/Layers/RenderStyle.cpp	Thu Apr 25 14:00:55 2019 +0200
@@ -29,7 +29,7 @@
   {
     visible_ = true;
     reverse_ = false;
-    windowing_ = ImageWindowing_Default;
+    windowing_ = ImageWindowing_Custom;
     alpha_ = 1;
     applyLut_ = false;
     lut_ = Orthanc::EmbeddedResources::COLORMAP_HOT;
--- a/Framework/StoneEnumerations.cpp	Thu Apr 25 13:54:42 2019 +0200
+++ b/Framework/StoneEnumerations.cpp	Thu Apr 25 14:00:55 2019 +0200
@@ -48,14 +48,14 @@
   void ComputeWindowing(float& targetCenter,
                         float& targetWidth,
                         ImageWindowing windowing,
-                        float defaultCenter,
-                        float defaultWidth)
+                        float customCenter,
+                        float customWidth)
   {
     switch (windowing)
     {
-      case ImageWindowing_Default:
-        targetCenter = defaultCenter;
-        targetWidth = defaultWidth;
+      case ImageWindowing_Custom:
+        targetCenter = customCenter;
+        targetWidth = customWidth;
         break;
 
       case ImageWindowing_Bone:
--- a/Framework/StoneEnumerations.h	Thu Apr 25 13:54:42 2019 +0200
+++ b/Framework/StoneEnumerations.h	Thu Apr 25 14:00:55 2019 +0200
@@ -34,7 +34,6 @@
 
   enum ImageWindowing
   {
-    ImageWindowing_Default,
     ImageWindowing_Bone,
     ImageWindowing_Lung,
     ImageWindowing_Custom
@@ -199,8 +198,8 @@
   void ComputeWindowing(float& targetCenter,
                         float& targetWidth,
                         ImageWindowing windowing,
-                        float defaultCenter,
-                        float defaultWidth);
+                        float customCenter,
+                        float customWidth);
 
   void ComputeAnchorTranslation(double& deltaX /* out */,
                                 double& deltaY /* out */,
--- a/Framework/Volumes/VolumeReslicer.cpp	Thu Apr 25 13:54:42 2019 +0200
+++ b/Framework/Volumes/VolumeReslicer.cpp	Thu Apr 25 14:00:55 2019 +0200
@@ -655,8 +655,7 @@
                                     float rescaleSlope,
                                     float rescaleIntercept)
   {
-    if (windowing == ImageWindowing_Custom ||
-        windowing == ImageWindowing_Default)
+    if (windowing == ImageWindowing_Custom)
     {
       throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
     }