Mercurial > hg > orthanc-stone

comparison Framework/Scene2D/Internals/FixedPointAligner.cpp @ 818:e42b491f1fb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed typedefs to shared_ptr by making them explicit. Removed using namespace directives to make usage more explicit, too.
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 29 May 2019 10:51:28 +0200
parents c0fcb2757b0a
children 2d8ab34c8c91
comparison
equal deleted inserted replaced
817:68f888812af4 818:e42b491f1fb2
23 23
24 namespace OrthancStone 24 namespace OrthancStone
25 { 25 {
26 namespace Internals 26 namespace Internals
27 { 27 {
28 FixedPointAligner::FixedPointAligner(ViewportControllerWPtr controllerW, 28 FixedPointAligner::FixedPointAligner(boost::weak_ptr<ViewportController> controllerW,
29 const ScenePoint2D& p) 29 const ScenePoint2D& p)
30 : controllerW_(controllerW) 30 : controllerW_(controllerW)
31 , canvas_(p) 31 , canvas_(p)
32 { 32 {
33 ViewportControllerPtr controller = controllerW_.lock(); 33 boost::shared_ptr<ViewportController> controller = controllerW_.lock();
34 pivot_ = canvas_.Apply(controller->GetCanvasToSceneTransform()); 34 pivot_ = canvas_.Apply(controller->GetCanvasToSceneTransform());
35 } 35 }
36 36
37 37
38 void FixedPointAligner::Apply() 38 void FixedPointAligner::Apply()
39 { 39 {
40 ViewportControllerPtr controller = controllerW_.lock(); 40 boost::shared_ptr<ViewportController> controller = controllerW_.lock();
41 ScenePoint2D p = canvas_.Apply(controller->GetCanvasToSceneTransform()); 41 ScenePoint2D p = canvas_.Apply(controller->GetCanvasToSceneTransform());
42 42
43 controller->SetSceneToCanvasTransform( 43 controller->SetSceneToCanvasTransform(
44 AffineTransform2D::Combine( 44 AffineTransform2D::Combine(
45 controller->GetSceneToCanvasTransform(), 45 controller->GetSceneToCanvasTransform(),