comparison Framework/Scene2D/Scene2D.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 462a5074f914
children 15d493101c1e
comparison
equal deleted inserted replaced
699:5c551f078c18 700:059e1fd05fd6
74 } 74 }
75 }; 75 };
76 76
77 77
78 Scene2D::Scene2D(const Scene2D& other) 78 Scene2D::Scene2D(const Scene2D& other)
79 : IObservable(other.GetBroker()) 79 : sceneToCanvas_(other.sceneToCanvas_)
80 , sceneToCanvas_(other.sceneToCanvas_)
81 , canvasToScene_(other.canvasToScene_) 80 , canvasToScene_(other.canvasToScene_)
82 , layerCounter_(0) 81 , layerCounter_(0)
83 { 82 {
84 for (Content::const_iterator it = other.content_.begin(); 83 for (Content::const_iterator it = other.content_.begin();
85 it != other.content_.end(); ++it) 84 it != other.content_.end(); ++it)
219 // Make sure the transform is invertible before making any change 218 // Make sure the transform is invertible before making any change
220 AffineTransform2D inverse = AffineTransform2D::Invert(transform); 219 AffineTransform2D inverse = AffineTransform2D::Invert(transform);
221 220
222 sceneToCanvas_ = transform; 221 sceneToCanvas_ = transform;
223 canvasToScene_ = inverse; 222 canvasToScene_ = inverse;
224 BroadcastMessage(SceneTransformChanged(*this));
225 } 223 }
226 224
227 void Scene2D::FitContent(unsigned int canvasWidth, 225 void Scene2D::FitContent(unsigned int canvasWidth,
228 unsigned int canvasHeight) 226 unsigned int canvasHeight)
229 { 227 {