Mercurial > hg > orthanc-stone
comparison OrthancStone/Sources/Scene2DViewport/EditAngleMeasureTracker.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 |
---|---|
48 EditAngleMeasureTracker::~EditAngleMeasureTracker() | 48 EditAngleMeasureTracker::~EditAngleMeasureTracker() |
49 { | 49 { |
50 | 50 |
51 } | 51 } |
52 | 52 |
53 void EditAngleMeasureTracker::PointerMove(const PointerEvent& e) | 53 void EditAngleMeasureTracker::PointerMove(const PointerEvent& e, |
54 const Scene2D& scene) | |
54 { | 55 { |
55 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); | 56 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); |
56 | 57 |
57 ViewportController& controller = lock->GetController(); | 58 ViewportController& controller = lock->GetController(); |
58 const Scene2D& scene = controller.GetScene(); | 59 const Scene2D& scene2 = controller.GetScene(); |
59 | 60 |
60 ScenePoint2D scenePos = e.GetMainPosition().Apply( | 61 ScenePoint2D scenePos = e.GetMainPosition().Apply( |
61 scene.GetCanvasToSceneTransform()); | 62 scene2.GetCanvasToSceneTransform()); |
62 | 63 |
63 ScenePoint2D delta = scenePos - GetOriginalClickPosition(); | 64 ScenePoint2D delta = scenePos - GetOriginalClickPosition(); |
64 | 65 |
65 const AngleMeasureToolMemento& memento = | 66 const AngleMeasureToolMemento& memento = |
66 dynamic_cast<const AngleMeasureToolMemento&>(command_->GetMementoOriginal()); | 67 dynamic_cast<const AngleMeasureToolMemento&>(command_->GetMementoOriginal()); |
104 LOG(WARNING) << "Warning: please retry the measuring tool editing operation!"; | 105 LOG(WARNING) << "Warning: please retry the measuring tool editing operation!"; |
105 break; | 106 break; |
106 } | 107 } |
107 } | 108 } |
108 | 109 |
109 void EditAngleMeasureTracker::PointerUp(const PointerEvent& e) | 110 void EditAngleMeasureTracker::PointerUp(const PointerEvent& e, |
111 const Scene2D& scene) | |
110 { | 112 { |
111 alive_ = false; | 113 alive_ = false; |
112 } | 114 } |
113 | 115 |
114 void EditAngleMeasureTracker::PointerDown(const PointerEvent& e) | 116 void EditAngleMeasureTracker::PointerDown(const PointerEvent& e, |
117 const Scene2D& scene) | |
115 { | 118 { |
116 LOG(WARNING) << "Additional touches (fingers, pen, mouse buttons...) " | 119 LOG(WARNING) << "Additional touches (fingers, pen, mouse buttons...) " |
117 "are ignored when the edit angle tracker is active"; | 120 "are ignored when the edit angle tracker is active"; |
118 } | 121 } |
119 | 122 |