Mercurial > hg > orthanc-stone
comparison Framework/Scene2DViewport/CreateAngleMeasureTracker.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 |
---|---|
35 | 35 |
36 { | 36 { |
37 boost::shared_ptr<ViewportController> controller = controllerW.lock(); | 37 boost::shared_ptr<ViewportController> controller = controllerW.lock(); |
38 if (controller) | 38 if (controller) |
39 { | 39 { |
40 std::auto_ptr<IViewport::ILock> lock(controller->GetViewport().Lock()); | 40 point = e.GetMainPosition().Apply(controller->GetScene().GetCanvasToSceneTransform()); |
41 point = e.GetMainPosition().Apply(lock->GetScene().GetCanvasToSceneTransform()); | |
42 } | 41 } |
43 } | 42 } |
44 | 43 |
45 command_.reset(new CreateAngleMeasureCommand(controllerW, point)); | 44 command_.reset(new CreateAngleMeasureCommand(controllerW, point)); |
46 } | 45 } |
59 } | 58 } |
60 | 59 |
61 boost::shared_ptr<ViewportController> controller = controllerW_.lock(); | 60 boost::shared_ptr<ViewportController> controller = controllerW_.lock(); |
62 if (controller) | 61 if (controller) |
63 { | 62 { |
64 std::auto_ptr<IViewport::ILock> lock(controller->GetViewport().Lock()); | |
65 ScenePoint2D scenePos = event.GetMainPosition().Apply( | 63 ScenePoint2D scenePos = event.GetMainPosition().Apply( |
66 lock->GetScene().GetCanvasToSceneTransform()); | 64 controller->GetScene().GetCanvasToSceneTransform()); |
67 | 65 |
68 switch (state_) | 66 switch (state_) |
69 { | 67 { |
70 case CreatingSide1: | 68 case CreatingSide1: |
71 GetCommand()->SetCenter(scenePos); | 69 GetCommand()->SetCenter(scenePos); |