Mercurial > hg > orthanc-stone
diff Framework/Radiography/RadiographyWidget.cpp @ 754:92c400a09f1b
Merge from default
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Wed, 22 May 2019 16:13:46 +0200 |
parents | be9c1530d40a |
children | b537002f83a9 d33ae2b0db9d |
line wrap: on
line diff
--- a/Framework/Radiography/RadiographyWidget.cpp Wed May 22 16:01:34 2019 +0200 +++ b/Framework/Radiography/RadiographyWidget.cpp Wed May 22 16:13:46 2019 +0200 @@ -35,7 +35,7 @@ // MONOCHROME1 images must be inverted and the user can invert the // image, too -> XOR the two return (scene_->GetPreferredPhotomotricDisplayMode() == - PhotometricDisplayMode_Monochrome1) ^ invert_; + RadiographyPhotometricDisplayMode_Monochrome1) ^ invert_; } void RadiographyWidget::RenderBackground( @@ -46,14 +46,14 @@ switch (scene_->GetPreferredPhotomotricDisplayMode()) { - case PhotometricDisplayMode_Monochrome1: - case PhotometricDisplayMode_Default: + case RadiographyPhotometricDisplayMode_Monochrome1: + case RadiographyPhotometricDisplayMode_Default: if (IsInvertedInternal()) backgroundValue = maxValue; else backgroundValue = minValue; break; - case PhotometricDisplayMode_Monochrome2: + case RadiographyPhotometricDisplayMode_Monochrome2: if (IsInvertedInternal()) backgroundValue = minValue; else @@ -151,7 +151,7 @@ bool RadiographyWidget::RenderScene(CairoContext& context, - const ViewportGeometry& view) + const Deprecated::ViewportGeometry& view) { cairo_t* cr = context.GetObject();