Mercurial > hg > orthanc-stone
diff OrthancStone/Sources/Scene2DViewport/LineMeasureTool.cpp @ 1571:85e117739eca
cppcheck
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 21 Sep 2020 17:46:39 +0200 |
parents | 244ad1e4e76a |
children | 8563ea5d8ae4 |
line wrap: on
line diff
--- a/OrthancStone/Sources/Scene2DViewport/LineMeasureTool.cpp Mon Sep 21 14:50:26 2020 +0200 +++ b/OrthancStone/Sources/Scene2DViewport/LineMeasureTool.cpp Mon Sep 21 17:46:39 2020 +0200 @@ -30,16 +30,16 @@ namespace OrthancStone { - LineMeasureTool::LineMeasureTool( - boost::shared_ptr<IViewport> viewport) - : MeasureTool(viewport) + boost::shared_ptr<IViewport> viewport): + MeasureTool(viewport), #if ORTHANC_STONE_ENABLE_OUTLINED_TEXT == 1 - , layerHolder_(boost::shared_ptr<LayerHolder>(new LayerHolder(viewport,1,5))) + layerHolder_(boost::shared_ptr<LayerHolder>(new LayerHolder(viewport,1,5))), #else - , layerHolder_(boost::shared_ptr<LayerHolder>(new LayerHolder(viewport,1,1))) + layerHolder_(boost::shared_ptr<LayerHolder>(new LayerHolder(viewport,1,1))), #endif - , lineHighlightArea_(LineHighlightArea_None) + baseLayerIndex_(0), + lineHighlightArea_(LineHighlightArea_None) { } @@ -118,7 +118,7 @@ { std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); ViewportController& controller = lock->GetController(); - Scene2D& scene = controller.GetScene(); + const Scene2D& scene = controller.GetScene(); const double pixelToScene = scene.GetCanvasToSceneTransform().ComputeZoom(); const double SQUARED_HIT_TEST_MAX_DISTANCE_SCENE_COORD = @@ -154,7 +154,7 @@ { std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); ViewportController& controller = lock->GetController(); - Scene2D& scene = controller.GetScene(); + const Scene2D& scene = controller.GetScene(); ScenePoint2D scenePos = e.GetMainPosition().Apply( scene.GetCanvasToSceneTransform());