Mercurial > hg > orthanc-stone
diff OrthancStone/Sources/Scene2DViewport/LayerHolder.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/LayerHolder.h Wed Oct 28 20:06:55 2020 +0100 +++ b/OrthancStone/Sources/Scene2DViewport/LayerHolder.h Wed Oct 28 20:14:34 2020 +0100 @@ -23,6 +23,8 @@ #include "PredeclaredTypes.h" +#include "../Viewport/IViewport.h" + #include <boost/noncopyable.hpp> #include <boost/weak_ptr.hpp> #include <boost/shared_ptr.hpp> @@ -44,7 +46,7 @@ performed at this time */ LayerHolder( - boost::shared_ptr<IViewport> viewport, + boost::weak_ptr<IViewport> viewport, int polylineLayerCount, int textLayerCount, int infoTextCount = 0); /** @@ -95,6 +97,13 @@ //TextSceneLayer* GetTextLayer(int index = 0); private: + + /** + This will return a scoped lock to the viewport. + If the viewport does not exist anymore, then nullptr is returned. + */ + IViewport::ILock* GetViewportLock(); + int GetPolylineLayerIndex(int index = 0); int GetTextLayerIndex(int index = 0); int GetInfoTextLayerIndex(int index = 0); @@ -102,7 +111,7 @@ int textLayerCount_; int polylineLayerCount_; int infoTextCount_; - boost::shared_ptr<IViewport> viewport_; + boost::weak_ptr<IViewport> viewport_; int baseLayerIndex_; }; }