Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/EditAngleMeasureTracker.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 |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/EditAngleMeasureTracker.cpp Wed Dec 04 16:54:24 2019 +0100 +++ b/Framework/Scene2DViewport/EditAngleMeasureTracker.cpp Wed Dec 04 17:54:10 2019 +0100 @@ -36,8 +36,7 @@ boost::shared_ptr<ViewportController> controller = controllerW_.lock(); if (controller) { - std::auto_ptr<IViewport::ILock> lock(controller->GetViewport().Lock()); - scenePos = e.GetMainPosition().Apply(lock->GetScene().GetCanvasToSceneTransform()); + scenePos = e.GetMainPosition().Apply(controller->GetScene().GetCanvasToSceneTransform()); } modifiedZone_ = dynamic_cast<AngleMeasureTool&>(*measureTool).AngleHitTest(scenePos); @@ -55,9 +54,8 @@ boost::shared_ptr<ViewportController> controller = controllerW_.lock(); if (controller) { - std::auto_ptr<IViewport::ILock> lock(controller->GetViewport().Lock()); ScenePoint2D scenePos = e.GetMainPosition().Apply( - lock->GetScene().GetCanvasToSceneTransform()); + controller->GetScene().GetCanvasToSceneTransform()); ScenePoint2D delta = scenePos - GetOriginalClickPosition();