Mercurial > hg > orthanc-stone

comparison 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
comparison
equal deleted inserted replaced
1212:ab06dfdf3b75 1213:86a8266b8888
34 34
35 { 35 {
36 boost::shared_ptr<ViewportController> controller = controllerW.lock(); 36 boost::shared_ptr<ViewportController> controller = controllerW.lock();
37 if (controller) 37 if (controller)
38 { 38 {
39 std::auto_ptr<IViewport::ILock> lock(controller->GetViewport().Lock()); 39 point = e.GetMainPosition().Apply(controller->GetScene().GetCanvasToSceneTransform());
40 point = e.GetMainPosition().Apply(lock->GetScene().GetCanvasToSceneTransform());
41 } 40 }
42 } 41 }
43 42
44 command_.reset(new CreateLineMeasureCommand(controllerW, point)); 43 command_.reset(new CreateLineMeasureCommand(controllerW, point));
45 } 44 }
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 //LOG(TRACE) << "scenePos.GetX() = " << scenePos.GetX() << " " << 66 //LOG(TRACE) << "scenePos.GetX() = " << scenePos.GetX() << " " <<
69 // "scenePos.GetY() = " << scenePos.GetY(); 67 // "scenePos.GetY() = " << scenePos.GetY();
70 68
71 CreateLineMeasureTracker* concreteThis = 69 CreateLineMeasureTracker* concreteThis =
93 91
94 boost::shared_ptr<CreateLineMeasureCommand> CreateLineMeasureTracker::GetCommand() 92 boost::shared_ptr<CreateLineMeasureCommand> CreateLineMeasureTracker::GetCommand()
95 { 93 {
96 return boost::dynamic_pointer_cast<CreateLineMeasureCommand>(command_); 94 return boost::dynamic_pointer_cast<CreateLineMeasureCommand>(command_);
97 } 95 }
98
99 } 96 }