Mercurial > hg > orthanc-stone

comparison OrthancStone/Sources/Scene2DViewport/EditLineMeasureTracker.cpp @ 1571:85e117739eca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cppcheck
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 21 Sep 2020 17:46:39 +0200
parents 244ad1e4e76a
children 8563ea5d8ae4
comparison
equal deleted inserted replaced
1570:9a04f42098a3 1571:85e117739eca
30 boost::shared_ptr<MeasureTool> measureTool, 30 boost::shared_ptr<MeasureTool> measureTool,
31 boost::shared_ptr<IViewport> viewport, 31 boost::shared_ptr<IViewport> viewport,
32 const PointerEvent& e) 32 const PointerEvent& e)
33 : EditMeasureTracker(viewport, e) 33 : EditMeasureTracker(viewport, e)
34 { 34 {
35 ScenePoint2D scenePos = e.GetMainPosition(); 35 ScenePoint2D scenePos;
36
36 { 37 {
37 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); 38 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
38 Scene2D& scene = lock->GetController().GetScene(); 39 Scene2D& scene = lock->GetController().GetScene();
39 scenePos = e.GetMainPosition().Apply(scene.GetCanvasToSceneTransform()); 40 scenePos = e.GetMainPosition().Apply(scene.GetCanvasToSceneTransform());
40 } 41 }
42
41 modifiedZone_ = dynamic_cast<LineMeasureTool&>(*measureTool).LineHitTest(scenePos); 43 modifiedZone_ = dynamic_cast<LineMeasureTool&>(*measureTool).LineHitTest(scenePos);
42 command_.reset(new EditLineMeasureCommand(measureTool, viewport)); 44 command_.reset(new EditLineMeasureCommand(measureTool, viewport));
43 }
44
45 EditLineMeasureTracker::~EditLineMeasureTracker()
46 {
47
48 } 45 }
49 46
50 void EditLineMeasureTracker::PointerMove(const PointerEvent& e) 47 void EditLineMeasureTracker::PointerMove(const PointerEvent& e)
51 { 48 {
52 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); 49 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
53 ViewportController& controller = lock->GetController(); 50 ViewportController& controller = lock->GetController();
54 Scene2D& scene = controller.GetScene(); 51 const Scene2D& scene = controller.GetScene();
55 52
56 ScenePoint2D scenePos = e.GetMainPosition().Apply( 53 ScenePoint2D scenePos = e.GetMainPosition().Apply(
57 scene.GetCanvasToSceneTransform()); 54 scene.GetCanvasToSceneTransform());
58 55
59 ScenePoint2D delta = scenePos - GetOriginalClickPosition(); 56 ScenePoint2D delta = scenePos - GetOriginalClickPosition();