Mercurial > hg > orthanc-stone

comparison OrthancStone/Sources/Scene2DViewport/EditAngleMeasureTracker.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
29 boost::shared_ptr<MeasureTool> measureTool, 29 boost::shared_ptr<MeasureTool> measureTool,
30 boost::shared_ptr<IViewport> viewport, 30 boost::shared_ptr<IViewport> viewport,
31 const PointerEvent& e) 31 const PointerEvent& e)
32 : EditMeasureTracker(viewport, e) 32 : EditMeasureTracker(viewport, e)
33 { 33 {
34 ScenePoint2D scenePos = e.GetMainPosition(); 34 ScenePoint2D scenePos;
35
35 { 36 {
36 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); 37 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
37 ViewportController& controller = lock->GetController(); 38 ViewportController& controller = lock->GetController();
38 scenePos = e.GetMainPosition().Apply(controller.GetScene().GetCanvasToSceneTransform()); 39 scenePos = e.GetMainPosition().Apply(controller.GetScene().GetCanvasToSceneTransform());
39 } 40 }
41
40 modifiedZone_ = dynamic_cast<AngleMeasureTool&>(*measureTool).AngleHitTest(scenePos); 42 modifiedZone_ = dynamic_cast<AngleMeasureTool&>(*measureTool).AngleHitTest(scenePos);
41 command_.reset(new EditAngleMeasureCommand(measureTool, viewport)); 43 command_.reset(new EditAngleMeasureCommand(measureTool, viewport));
42 } 44 }
43 45
44 EditAngleMeasureTracker::~EditAngleMeasureTracker() 46 EditAngleMeasureTracker::~EditAngleMeasureTracker()
47 } 49 }
48 50
49 void EditAngleMeasureTracker::PointerMove(const PointerEvent& e) 51 void EditAngleMeasureTracker::PointerMove(const PointerEvent& e)
50 { 52 {
51 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); 53 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
54
52 ViewportController& controller = lock->GetController(); 55 ViewportController& controller = lock->GetController();
53 Scene2D& scene = controller.GetScene(); 56 const Scene2D& scene = controller.GetScene();
54 57
55 ScenePoint2D scenePos = e.GetMainPosition().Apply( 58 ScenePoint2D scenePos = e.GetMainPosition().Apply(
56 scene.GetCanvasToSceneTransform()); 59 scene.GetCanvasToSceneTransform());
57 60
58 ScenePoint2D delta = scenePos - GetOriginalClickPosition(); 61 ScenePoint2D delta = scenePos - GetOriginalClickPosition();