Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/LineMeasureTool.cpp @ 1331:ab81ee8fce1f broker
- Viewport is not passed and stored as a shared_ptr instead
of raw reference.
- ViewportController can now be injected with an undo
stack (not a ctor param anymore, as a preparation for the
move of the undo stack to an interactor)
- Added (temp) flag to disable emscripten events registration
in the WebAssemblyViewport (because legacy client code
deals with them directly)
- Added emscripten_clear_timeout in ~WebGLViewportsRegistry
- Removed GenericToolbox::HoldingRef whose responsibility is
better served with proper callback un-registration.
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Mon, 30 Mar 2020 14:23:46 +0200 |
| parents | 9b126de2cde2 |
| children | 30deba7bc8e2 |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/LineMeasureTool.cpp Mon Mar 30 08:47:30 2020 +0200 +++ b/Framework/Scene2DViewport/LineMeasureTool.cpp Mon Mar 30 14:23:46 2020 +0200 @@ -32,7 +32,7 @@ { LineMeasureTool::LineMeasureTool( - IViewport& viewport) + boost::shared_ptr<IViewport> viewport) : MeasureTool(viewport) #if ORTHANC_STONE_ENABLE_OUTLINED_TEXT == 1 , layerHolder_(boost::shared_ptr<LayerHolder>(new LayerHolder(viewport,1,5))) @@ -44,7 +44,7 @@ } - boost::shared_ptr<LineMeasureTool> LineMeasureTool::Create(IViewport& viewport) + boost::shared_ptr<LineMeasureTool> LineMeasureTool::Create(boost::shared_ptr<IViewport> viewport) { boost::shared_ptr<LineMeasureTool> obj(new LineMeasureTool(viewport)); obj->MeasureTool::PostConstructor(); @@ -116,7 +116,7 @@ LineMeasureTool::LineHighlightArea LineMeasureTool::LineHitTest(ScenePoint2D p) { - std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); + std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); ViewportController& controller = lock->GetController(); Scene2D& scene = controller.GetScene(); @@ -152,7 +152,7 @@ boost::shared_ptr<IFlexiblePointerTracker> LineMeasureTool::CreateEditionTracker(const PointerEvent& e) { - std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); + std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); ViewportController& controller = lock->GetController(); Scene2D& scene = controller.GetScene(); @@ -195,7 +195,7 @@ if (IsEnabled()) { - std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); + std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); ViewportController& controller = lock->GetController(); Scene2D& scene = controller.GetScene();