# HG changeset patch # User Sebastien Jodogne # Date 1556193655 -7200 # Node ID 3080ec4ec6b9e5a53370f2917b3eb038eb597634 # Parent 2a8ac2d426dba8ba2356d4b57e3428d88b9d40da removed enum value: ImageWindowing_Default diff -r 2a8ac2d426db -r 3080ec4ec6b9 Framework/Layers/RenderStyle.cpp --- 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; diff -r 2a8ac2d426db -r 3080ec4ec6b9 Framework/StoneEnumerations.cpp --- 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: diff -r 2a8ac2d426db -r 3080ec4ec6b9 Framework/StoneEnumerations.h --- 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 */, diff -r 2a8ac2d426db -r 3080ec4ec6b9 Framework/Volumes/VolumeReslicer.cpp --- 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); }