Mercurial > hg > orthanc-stone
diff OrthancStone/Sources/Scene2DViewport/CreateLineMeasureCommand.cpp @ 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/CreateLineMeasureCommand.cpp Wed Oct 28 20:06:55 2020 +0100 +++ b/OrthancStone/Sources/Scene2DViewport/CreateLineMeasureCommand.cpp Wed Oct 28 20:14:34 2020 +0100 @@ -27,13 +27,13 @@ namespace OrthancStone { CreateLineMeasureCommand::CreateLineMeasureCommand( - boost::shared_ptr<IViewport> viewport, + boost::weak_ptr<IViewport> viewport, ScenePoint2D point) : CreateMeasureCommand(viewport) , measureTool_(LineMeasureTool::Create(viewport)) { - std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); + std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); ViewportController& controller = lock->GetController(); controller.AddMeasureTool(measureTool_); measureTool_->Set(point, point);