Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/LayerHolder.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 | adf234ecaa00 |
| children |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/LayerHolder.cpp Mon Mar 30 08:47:30 2020 +0200 +++ b/Framework/Scene2DViewport/LayerHolder.cpp Mon Mar 30 14:23:46 2020 +0200 @@ -28,7 +28,7 @@ namespace OrthancStone { LayerHolder::LayerHolder( - IViewport& viewport, + boost::shared_ptr<IViewport> viewport, int polylineLayerCount, int textLayerCount, int infoTextCount) @@ -43,7 +43,7 @@ void LayerHolder::CreateLayers() { - std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); + std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); ViewportController& controller = lock->GetController(); Scene2D& scene = controller.GetScene(); @@ -84,7 +84,7 @@ void LayerHolder::DeleteLayers() { - std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); + std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); Scene2D& scene = lock->GetController().GetScene(); for (int i = 0; i < textLayerCount_ + polylineLayerCount_; ++i) @@ -98,7 +98,7 @@ PolylineSceneLayer* LayerHolder::GetPolylineLayer(int index /*= 0*/) { - std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); + std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); Scene2D& scene = lock->GetController().GetScene(); using namespace Orthanc; @@ -115,7 +115,7 @@ TextSceneLayer* LayerHolder::GetTextLayer(int index /*= 0*/) { - std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); + std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); Scene2D& scene = lock->GetController().GetScene(); using namespace Orthanc;