Mercurial > hg > orthanc-stone

diff Framework/Scene2DViewport/CreateLineMeasureTracker.cpp @ 1213:86a8266b8888 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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/CreateLineMeasureTracker.cpp	Wed Dec 04 16:54:24 2019 +0100
+++ b/Framework/Scene2DViewport/CreateLineMeasureTracker.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());
-        point = e.GetMainPosition().Apply(lock->GetScene().GetCanvasToSceneTransform());
+        point = e.GetMainPosition().Apply(controller->GetScene().GetCanvasToSceneTransform());
       }
     }
 
@@ -61,9 +60,8 @@
     boost::shared_ptr<ViewportController> controller = controllerW_.lock();
     if (controller)
     {
-      std::auto_ptr<IViewport::ILock> lock(controller->GetViewport().Lock());
       ScenePoint2D scenePos = event.GetMainPosition().Apply(
-        lock->GetScene().GetCanvasToSceneTransform());
+        controller->GetScene().GetCanvasToSceneTransform());
       
       //LOG(TRACE) << "scenePos.GetX() = " << scenePos.GetX() << "     " <<
       //  "scenePos.GetY() = " << scenePos.GetY();
@@ -95,5 +93,4 @@
   {
     return boost::dynamic_pointer_cast<CreateLineMeasureCommand>(command_);
   }
-
 }