Mercurial > hg > orthanc-stone
diff Framework/Layers/RenderStyle.cpp @ 728:8190213e2279 am-dev
Merged default into am-dev
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Tue, 21 May 2019 13:25:58 +0200 |
| parents | 4f2416d519b4 |
| children |
line wrap: on
line diff
--- a/Framework/Layers/RenderStyle.cpp Thu May 16 19:10:38 2019 +0200 +++ b/Framework/Layers/RenderStyle.cpp Tue May 21 13:25:58 2019 +0200 @@ -23,13 +23,13 @@ #include <Core/OrthancException.h> -namespace OrthancStone +namespace Deprecated { RenderStyle::RenderStyle() { visible_ = true; reverse_ = false; - windowing_ = ImageWindowing_Custom; + windowing_ = OrthancStone::ImageWindowing_Custom; alpha_ = 1; applyLut_ = false; lut_ = Orthanc::EmbeddedResources::COLORMAP_HOT; @@ -39,7 +39,7 @@ drawColor_[2] = 255; customWindowCenter_ = 128; customWindowWidth_ = 256; - interpolation_ = ImageInterpolation_Nearest; + interpolation_ = OrthancStone::ImageInterpolation_Nearest; fontSize_ = 14; } @@ -49,7 +49,7 @@ float defaultCenter, float defaultWidth) const { - if (windowing_ == ImageWindowing_Custom) + if (windowing_ == OrthancStone::ImageWindowing_Custom) { targetCenter = customWindowCenter_; targetWidth = customWindowWidth_;