Mercurial > hg > orthanc-stone
comparison OrthancStone/Sources/Scene2DViewport/EditLineMeasureTracker.cpp @ 1972:9c0adcc8feec
refactoring to simplify OneGesturePointerTracker
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 28 Oct 2022 16:21:28 +0200 |
parents | 7053b8a0aaec |
children | 07964689cb0b |
comparison
equal
deleted
inserted
replaced
1971:e5b31d55206d | 1972:9c0adcc8feec |
---|---|
44 | 44 |
45 modifiedZone_ = dynamic_cast<LineMeasureTool&>(*measureTool).LineHitTest(scenePos); | 45 modifiedZone_ = dynamic_cast<LineMeasureTool&>(*measureTool).LineHitTest(scenePos); |
46 command_.reset(new EditLineMeasureCommand(measureTool, viewport)); | 46 command_.reset(new EditLineMeasureCommand(measureTool, viewport)); |
47 } | 47 } |
48 | 48 |
49 void EditLineMeasureTracker::PointerMove(const PointerEvent& e) | 49 void EditLineMeasureTracker::PointerMove(const PointerEvent& e, |
50 const Scene2D& scene) | |
50 { | 51 { |
51 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); | 52 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); |
52 ViewportController& controller = lock->GetController(); | 53 ViewportController& controller = lock->GetController(); |
53 const Scene2D& scene = controller.GetScene(); | 54 const Scene2D& scene2 = controller.GetScene(); |
54 | 55 |
55 ScenePoint2D scenePos = e.GetMainPosition().Apply( | 56 ScenePoint2D scenePos = e.GetMainPosition().Apply( |
56 scene.GetCanvasToSceneTransform()); | 57 scene2.GetCanvasToSceneTransform()); |
57 | 58 |
58 ScenePoint2D delta = scenePos - GetOriginalClickPosition(); | 59 ScenePoint2D delta = scenePos - GetOriginalClickPosition(); |
59 | 60 |
60 const LineMeasureToolMemento& memento = | 61 const LineMeasureToolMemento& memento = |
61 dynamic_cast<const LineMeasureToolMemento&>(command_->GetMementoOriginal()); | 62 dynamic_cast<const LineMeasureToolMemento&>(command_->GetMementoOriginal()); |
89 LOG(WARNING) << "Warning: please retry the measuring tool editing operation!"; | 90 LOG(WARNING) << "Warning: please retry the measuring tool editing operation!"; |
90 break; | 91 break; |
91 } | 92 } |
92 } | 93 } |
93 | 94 |
94 void EditLineMeasureTracker::PointerUp(const PointerEvent& e) | 95 void EditLineMeasureTracker::PointerUp(const PointerEvent& e, |
96 const Scene2D& scene) | |
95 { | 97 { |
96 alive_ = false; | 98 alive_ = false; |
97 } | 99 } |
98 | 100 |
99 void EditLineMeasureTracker::PointerDown(const PointerEvent& e) | 101 void EditLineMeasureTracker::PointerDown(const PointerEvent& e, |
102 const Scene2D& scene) | |
100 { | 103 { |
101 LOG(WARNING) << "Additional touches (fingers, pen, mouse buttons...) " | 104 LOG(WARNING) << "Additional touches (fingers, pen, mouse buttons...) " |
102 "are ignored when the edit line tracker is active"; | 105 "are ignored when the edit line tracker is active"; |
103 } | 106 } |
104 | 107 |