Mercurial > hg > orthanc-stone
comparison Framework/Scene2DViewport/EditLineMeasureTracker.cpp @ 1213:86a8266b8888 broker
moving the scene from IViewport to ViewportController
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 04 Dec 2019 17:54:10 +0100 |
parents | f3bb9a6dd949 |
children | 0ca50d275b9a |
comparison
equal
deleted
inserted
replaced
1212:ab06dfdf3b75 | 1213:86a8266b8888 |
---|---|
36 | 36 |
37 { | 37 { |
38 boost::shared_ptr<ViewportController> controller = controllerW.lock(); | 38 boost::shared_ptr<ViewportController> controller = controllerW.lock(); |
39 if (controller) | 39 if (controller) |
40 { | 40 { |
41 std::auto_ptr<IViewport::ILock> lock(controller->GetViewport().Lock()); | 41 scenePos = e.GetMainPosition().Apply(controller->GetScene().GetCanvasToSceneTransform()); |
42 scenePos = e.GetMainPosition().Apply(lock->GetScene().GetCanvasToSceneTransform()); | |
43 } | 42 } |
44 } | 43 } |
45 | 44 |
46 modifiedZone_ = dynamic_cast<LineMeasureTool&>(*measureTool).LineHitTest(scenePos); | 45 modifiedZone_ = dynamic_cast<LineMeasureTool&>(*measureTool).LineHitTest(scenePos); |
47 | 46 |
56 void EditLineMeasureTracker::PointerMove(const PointerEvent& e) | 55 void EditLineMeasureTracker::PointerMove(const PointerEvent& e) |
57 { | 56 { |
58 boost::shared_ptr<ViewportController> controller = controllerW_.lock(); | 57 boost::shared_ptr<ViewportController> controller = controllerW_.lock(); |
59 if (controller) | 58 if (controller) |
60 { | 59 { |
61 std::auto_ptr<IViewport::ILock> lock(controller->GetViewport().Lock()); | |
62 ScenePoint2D scenePos = e.GetMainPosition().Apply( | 60 ScenePoint2D scenePos = e.GetMainPosition().Apply( |
63 lock->GetScene().GetCanvasToSceneTransform()); | 61 controller->GetScene().GetCanvasToSceneTransform()); |
64 | 62 |
65 ScenePoint2D delta = scenePos - GetOriginalClickPosition(); | 63 ScenePoint2D delta = scenePos - GetOriginalClickPosition(); |
66 | 64 |
67 boost::shared_ptr<LineMeasureToolMemento> memento = | 65 boost::shared_ptr<LineMeasureToolMemento> memento = |
68 boost::dynamic_pointer_cast<LineMeasureToolMemento>(command_->mementoOriginal_); | 66 boost::dynamic_pointer_cast<LineMeasureToolMemento>(command_->mementoOriginal_); |
69 | 67 |