Mercurial > hg > orthanc-stone

diff OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.h @ 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
line wrap: on
line diff
--- a/OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.h	Wed Oct 28 20:06:55 2020 +0100
+++ b/OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.h	Wed Oct 28 20:14:34 2020 +0100
@@ -36,12 +36,18 @@
     class FixedPointAligner : public boost::noncopyable
     {
     private:
-      boost::shared_ptr<IViewport> viewport_;
-      ScenePoint2D           pivot_;
-      ScenePoint2D           canvas_;
+      boost::weak_ptr<IViewport> viewport_;
+      ScenePoint2D               pivot_;
+      ScenePoint2D               canvas_;
+
+      /**
+      This will return a scoped lock to the viewport.
+      If the viewport does not exist anymore, then nullptr is returned.
+      */
+      IViewport::ILock* GetViewportLock();
 
     public:
-      FixedPointAligner(boost::shared_ptr<IViewport> viewport,
+      FixedPointAligner(boost::weak_ptr<IViewport> viewport,
                         const ScenePoint2D& p);
 
       void Apply();