Mercurial > hg > orthanc-stone

comparison OrthancStone/Sources/Scene2DViewport/AngleMeasureTool.cpp @ 1571:85e117739eca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cppcheck
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 21 Sep 2020 17:46:39 +0200
parents 244ad1e4e76a
children 8563ea5d8ae4
comparison
equal deleted inserted replaced
1570:9a04f42098a3 1571:85e117739eca
140 } 140 }
141 141
142 AngleMeasureTool::AngleHighlightArea AngleMeasureTool::AngleHitTest(ScenePoint2D p) const 142 AngleMeasureTool::AngleHighlightArea AngleMeasureTool::AngleHitTest(ScenePoint2D p) const
143 { 143 {
144 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); 144 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
145 ViewportController& controller = lock->GetController(); 145 const ViewportController& controller = lock->GetController();
146 Scene2D& scene = controller.GetScene(); 146 const Scene2D& scene = controller.GetScene();
147 147
148 const double pixelToScene = scene.GetCanvasToSceneTransform().ComputeZoom(); 148 const double pixelToScene = scene.GetCanvasToSceneTransform().ComputeZoom();
149 149
150 const double SQUARED_HIT_TEST_MAX_DISTANCE_SCENE_COORD = 150 const double SQUARED_HIT_TEST_MAX_DISTANCE_SCENE_COORD =
151 pixelToScene * HIT_TEST_MAX_DISTANCE_CANVAS_COORD * 151 pixelToScene * HIT_TEST_MAX_DISTANCE_CANVAS_COORD *
152 pixelToScene * HIT_TEST_MAX_DISTANCE_CANVAS_COORD; 152 pixelToScene * HIT_TEST_MAX_DISTANCE_CANVAS_COORD;
201 201
202 boost::shared_ptr<IFlexiblePointerTracker> AngleMeasureTool::CreateEditionTracker(const PointerEvent& e) 202 boost::shared_ptr<IFlexiblePointerTracker> AngleMeasureTool::CreateEditionTracker(const PointerEvent& e)
203 { 203 {
204 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); 204 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
205 ViewportController& controller = lock->GetController(); 205 ViewportController& controller = lock->GetController();
206 Scene2D& scene = controller.GetScene(); 206 const Scene2D& scene = controller.GetScene();
207 207
208 ScenePoint2D scenePos = e.GetMainPosition().Apply( 208 ScenePoint2D scenePos = e.GetMainPosition().Apply(
209 scene.GetCanvasToSceneTransform()); 209 scene.GetCanvasToSceneTransform());
210 210
211 if (!HitTest(scenePos)) 211 if (!HitTest(scenePos))