Mercurial > hg > orthanc-stone
comparison 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 |
comparison
equal
deleted
inserted
replaced
903:ef6e425dc79f | 911:64e5f3ff6360 |
---|---|
31 { | 31 { |
32 | 32 |
33 LineMeasureTool::LineMeasureTool( | 33 LineMeasureTool::LineMeasureTool( |
34 MessageBroker& broker, boost::weak_ptr<ViewportController> controllerW) | 34 MessageBroker& broker, boost::weak_ptr<ViewportController> controllerW) |
35 : MeasureTool(broker, controllerW) | 35 : MeasureTool(broker, controllerW) |
36 #if ORTHANC_STONE_ENABLE_OUTLINED_TEXT == 1 | |
36 , layerHolder_(boost::make_shared<LayerHolder>(controllerW, 1, 5)) | 37 , layerHolder_(boost::make_shared<LayerHolder>(controllerW, 1, 5)) |
38 #else | |
39 , layerHolder_(boost::make_shared<LayerHolder>(controllerW, 1, 1)) | |
40 #endif | |
37 , lineHighlightArea_(LineHighlightArea_None) | 41 , lineHighlightArea_(LineHighlightArea_None) |
38 { | 42 { |
39 | 43 |
40 } | 44 } |
41 | 45 |
232 // TODO: for now we simply position the text overlay at the middle | 236 // TODO: for now we simply position the text overlay at the middle |
233 // of the measuring segment | 237 // of the measuring segment |
234 double midX = 0.5 * (end_.GetX() + start_.GetX()); | 238 double midX = 0.5 * (end_.GetX() + start_.GetX()); |
235 double midY = 0.5 * (end_.GetY() + start_.GetY()); | 239 double midY = 0.5 * (end_.GetY() + start_.GetY()); |
236 | 240 |
241 #if ORTHANC_STONE_ENABLE_OUTLINED_TEXT == 1 | |
237 SetTextLayerOutlineProperties( | 242 SetTextLayerOutlineProperties( |
238 GetController()->GetScene(), layerHolder_, buf, ScenePoint2D(midX, midY)); | 243 GetController()->GetScene(), layerHolder_, buf, ScenePoint2D(midX, midY), 0); |
244 #else | |
245 SetTextLayerProperties( | |
246 GetController()->GetScene(), layerHolder_, buf, ScenePoint2D(midX, midY), 0); | |
247 #endif | |
239 } | 248 } |
240 } | 249 } |
241 else | 250 else |
242 { | 251 { |
243 RemoveFromScene(); | 252 RemoveFromScene(); |