Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/MeasureTool.cpp @ 1314:9b126de2cde2 broker
Since the observer system now uses shared_ptr and many registrations are
done in the constructors, and since we cannot called shared_from_this() in
the constructors, it is mandatory to split construction from registration.
This has been done by making many ctors protected and replacing them
by factory methods that directly return shared_ptrs + added PostConstructor
method when base classes perform shared_from_this() calls too.
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Mon, 16 Mar 2020 11:19:50 +0100 |
parents | a5326ce4f24b |
children | ab81ee8fce1f |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/MeasureTool.cpp Mon Mar 16 11:12:39 2020 +0100 +++ b/Framework/Scene2DViewport/MeasureTool.cpp Mon Mar 16 11:19:50 2020 +0100 @@ -52,10 +52,14 @@ : viewport_(viewport) , enabled_(true) { + + } + + void MeasureTool::PostConstructor() + { std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); ViewportController& controller = lock->GetController(); - // TODO => Move this out of constructor Register<ViewportController::SceneTransformChanged>( controller, &MeasureTool::OnSceneTransformChanged);