Mercurial > hg > orthanc-stone
comparison Framework/Scene2DViewport/MeasureTrackers.cpp @ 891:0aff28f15ea2
new abstraction: IViewport
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 10 Jul 2019 18:18:42 +0200 |
parents | c71ef52602a0 |
children | f3bb9a6dd949 2d8ab34c8c91 |
comparison
equal
deleted
inserted
replaced
890:77c96ba899f9 | 891:0aff28f15ea2 |
---|---|
51 controllerW_.lock()->PushCommand(command_); | 51 controllerW_.lock()->PushCommand(command_); |
52 else | 52 else |
53 command_->Undo(); | 53 command_->Undo(); |
54 } | 54 } |
55 | 55 |
56 boost::shared_ptr<Scene2D> CreateMeasureTracker::GetScene() | 56 Scene2D& CreateMeasureTracker::GetScene() |
57 { | 57 { |
58 return controllerW_.lock()->GetScene(); | 58 return controllerW_.lock()->GetScene(); |
59 } | 59 } |
60 | 60 |
61 EditMeasureTracker::EditMeasureTracker(boost::weak_ptr<ViewportController> controllerW, const PointerEvent& e) | 61 EditMeasureTracker::EditMeasureTracker(boost::weak_ptr<ViewportController> controllerW, const PointerEvent& e) |
62 : controllerW_(controllerW) | 62 : controllerW_(controllerW) |
63 , alive_(true) | 63 , alive_(true) |
64 , commitResult_(true) | 64 , commitResult_(true) |
65 { | 65 { |
66 boost::shared_ptr<ViewportController> controller = controllerW.lock(); | 66 boost::shared_ptr<ViewportController> controller = controllerW.lock(); |
67 originalClickPosition_ = e.GetMainPosition().Apply(controller->GetScene()->GetCanvasToSceneTransform()); | 67 originalClickPosition_ = e.GetMainPosition().Apply(controller->GetScene().GetCanvasToSceneTransform()); |
68 } | 68 } |
69 | 69 |
70 boost::shared_ptr<Scene2D> EditMeasureTracker::GetScene() | 70 Scene2D& EditMeasureTracker::GetScene() |
71 { | 71 { |
72 return controllerW_.lock()->GetScene(); | 72 return controllerW_.lock()->GetScene(); |
73 } | 73 } |
74 | 74 |
75 void EditMeasureTracker::Cancel() | 75 void EditMeasureTracker::Cancel() |