Mercurial > hg > orthanc-stone
diff OrthancStone/Sources/Scene2DViewport/MeasureTool.h @ 1606:874e178f34e9
- 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/Scene2DViewport/MeasureTool.h Wed Oct 28 20:06:55 2020 +0100 +++ b/OrthancStone/Sources/Scene2DViewport/MeasureTool.h Wed Oct 28 20:14:34 2020 +0100 @@ -46,7 +46,7 @@ protected: - explicit MeasureTool(boost::shared_ptr<IViewport> viewport); + explicit MeasureTool(boost::weak_ptr<IViewport> viewport); void PostConstructor(); @@ -74,8 +74,14 @@ Protected to allow sub-classes to use this weak pointer in factory methods (pass them to created objects) */ - boost::shared_ptr<IViewport> viewport_; + boost::weak_ptr<IViewport> viewport_; + /** + This will return a scoped lock to the viewport. + If the viewport does not exist anymore, then nullptr is returned. + */ + IViewport::ILock* GetViewportLock(); + IViewport::ILock* GetViewportLock() const; public: virtual ~MeasureTool()