Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/LineMeasureTool.cpp @ 911:64e5f3ff6360 am-dev
Merge
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Thu, 18 Jul 2019 10:50:59 +0200 |
parents | 52b1c6ff10c5 |
children | ac88989817e3 |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/LineMeasureTool.cpp Wed Jul 17 15:33:07 2019 +0200 +++ b/Framework/Scene2DViewport/LineMeasureTool.cpp Thu Jul 18 10:50:59 2019 +0200 @@ -33,7 +33,11 @@ LineMeasureTool::LineMeasureTool( MessageBroker& broker, boost::weak_ptr<ViewportController> controllerW) : MeasureTool(broker, controllerW) +#if ORTHANC_STONE_ENABLE_OUTLINED_TEXT == 1 , layerHolder_(boost::make_shared<LayerHolder>(controllerW, 1, 5)) +#else + , layerHolder_(boost::make_shared<LayerHolder>(controllerW, 1, 1)) +#endif , lineHighlightArea_(LineHighlightArea_None) { @@ -234,8 +238,13 @@ double midX = 0.5 * (end_.GetX() + start_.GetX()); double midY = 0.5 * (end_.GetY() + start_.GetY()); +#if ORTHANC_STONE_ENABLE_OUTLINED_TEXT == 1 SetTextLayerOutlineProperties( - GetController()->GetScene(), layerHolder_, buf, ScenePoint2D(midX, midY)); + GetController()->GetScene(), layerHolder_, buf, ScenePoint2D(midX, midY), 0); +#else + SetTextLayerProperties( + GetController()->GetScene(), layerHolder_, buf, ScenePoint2D(midX, midY), 0); +#endif } } else