Mercurial > hg > orthanc-stone

comparison OrthancStone/Sources/Scene2DViewport/EditLineMeasureTracker.cpp @ 1606:874e178f34e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- ViewportController now has weak ptr to Viewport - Measuring tools + related commands and all trackers now store only a weak_ptr to the Viewport and lock() on demand for usage - LayerHolder and FixedPoint aligner store only a weak_ptr to the Viewport, too - Fixed float/double warning in GrayscaleWindowingSceneTracker
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 28 Oct 2020 20:14:34 +0100
parents 8563ea5d8ae4
children 9ac2a65d4172
comparison
equal deleted inserted replaced
1605:b3c439d96d3e 1606:874e178f34e9
27 27
28 namespace OrthancStone 28 namespace OrthancStone
29 { 29 {
30 EditLineMeasureTracker::EditLineMeasureTracker( 30 EditLineMeasureTracker::EditLineMeasureTracker(
31 boost::shared_ptr<MeasureTool> measureTool, 31 boost::shared_ptr<MeasureTool> measureTool,
32 boost::shared_ptr<IViewport> viewport, 32 boost::weak_ptr<IViewport> viewport,
33 const PointerEvent& e) 33 const PointerEvent& e)
34 : EditMeasureTracker(viewport, e) 34 : EditMeasureTracker(viewport, e)
35 { 35 {
36 ScenePoint2D scenePos; 36 ScenePoint2D scenePos;
37 37
38 { 38 {
39 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); 39 std::unique_ptr<IViewport::ILock> lock(GetViewportLock());
40 Scene2D& scene = lock->GetController().GetScene(); 40 Scene2D& scene = lock->GetController().GetScene();
41 scenePos = e.GetMainPosition().Apply(scene.GetCanvasToSceneTransform()); 41 scenePos = e.GetMainPosition().Apply(scene.GetCanvasToSceneTransform());
42 } 42 }
43 43
44 modifiedZone_ = dynamic_cast<LineMeasureTool&>(*measureTool).LineHitTest(scenePos); 44 modifiedZone_ = dynamic_cast<LineMeasureTool&>(*measureTool).LineHitTest(scenePos);
45 command_.reset(new EditLineMeasureCommand(measureTool, viewport)); 45 command_.reset(new EditLineMeasureCommand(measureTool, viewport));
46 } 46 }
47 47
48 void EditLineMeasureTracker::PointerMove(const PointerEvent& e) 48 void EditLineMeasureTracker::PointerMove(const PointerEvent& e)
49 { 49 {
50 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); 50 std::unique_ptr<IViewport::ILock> lock(GetViewportLock());
51 ViewportController& controller = lock->GetController(); 51 ViewportController& controller = lock->GetController();
52 const Scene2D& scene = controller.GetScene(); 52 const Scene2D& scene = controller.GetScene();
53 53
54 ScenePoint2D scenePos = e.GetMainPosition().Apply( 54 ScenePoint2D scenePos = e.GetMainPosition().Apply(
55 scene.GetCanvasToSceneTransform()); 55 scene.GetCanvasToSceneTransform());