Mercurial > hg > orthanc-stone
comparison Framework/Scene2D/Internals/FixedPointAligner.cpp @ 700:059e1fd05fd6 refactor-viewport-controller
Introduced the ViewportController that sits between the application and the
Scene2D to handle the trackers and measuring tools. This is a work in progress.
The Scene2D is no longer an observable. Message sending is managed by the
ViewportController.
Move some refs to shared and weak to prevent lifetime issues.
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Sun, 19 May 2019 16:26:17 +0200 |
parents | 7efa2543699d |
children | c0fcb2757b0a |
comparison
equal
deleted
inserted
replaced
699:5c551f078c18 | 700:059e1fd05fd6 |
---|---|
16 * | 16 * |
17 * You should have received a copy of the GNU Affero General Public License | 17 * You should have received a copy of the GNU Affero General Public License |
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 **/ | 19 **/ |
20 | 20 |
21 | 21 #include <Framework/Scene2DViewport/ViewportController.h> |
22 #include "FixedPointAligner.h" | 22 #include "FixedPointAligner.h" |
23 | 23 |
24 namespace OrthancStone | 24 namespace OrthancStone |
25 { | 25 { |
26 namespace Internals | 26 namespace Internals |
27 { | 27 { |
28 FixedPointAligner::FixedPointAligner(Scene2D& scene, | 28 FixedPointAligner::FixedPointAligner(ViewportControllerWPtr controllerW, |
29 const ScenePoint2D& p) : | 29 const ScenePoint2D& p) |
30 scene_(scene), | 30 : controllerW_(controllerW) |
31 canvas_(p) | 31 , canvas_(p) |
32 { | 32 { |
33 pivot_ = canvas_.Apply(scene_.GetCanvasToSceneTransform()); | 33 ViewportControllerPtr controller = controllerW_.lock(); |
34 pivot_ = canvas_.Apply(controller->GetCanvasToSceneTransform()); | |
34 } | 35 } |
35 | 36 |
36 | 37 |
37 void FixedPointAligner::Apply() | 38 void FixedPointAligner::Apply() |
38 { | 39 { |
39 ScenePoint2D p = canvas_.Apply(scene_.GetCanvasToSceneTransform()); | 40 ViewportControllerPtr controller = controllerW_.lock(); |
41 ScenePoint2D p = canvas_.Apply(controller->GetCanvasToSceneTransform()); | |
40 | 42 |
41 scene_.SetSceneToCanvasTransform( | 43 controller->SetSceneToCanvasTransform( |
42 AffineTransform2D::Combine( | 44 AffineTransform2D::Combine( |
43 scene_.GetSceneToCanvasTransform(), | 45 controller->GetSceneToCanvasTransform(), |
44 AffineTransform2D::CreateOffset(p.GetX() - pivot_.GetX(), | 46 AffineTransform2D::CreateOffset(p.GetX() - pivot_.GetX(), |
45 p.GetY() - pivot_.GetY()))); | 47 p.GetY() - pivot_.GetY()))); |
46 } | 48 } |
47 } | 49 } |
48 } | 50 } |