Mercurial > hg > orthanc-stone
diff Framework/Widgets/WorldSceneWidget.h @ 53:c2dc924f1a63 wasm
removing threading out of the framework
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 27 Apr 2017 16:57:49 +0200 |
parents | 25befef48c35 |
children | 01aa453d4d5b |
line wrap: on
line diff
--- a/Framework/Widgets/WorldSceneWidget.h Thu Apr 27 14:50:40 2017 +0200 +++ b/Framework/Widgets/WorldSceneWidget.h Thu Apr 27 16:57:49 2017 +0200 @@ -24,7 +24,6 @@ #include "CairoWidget.h" #include "IWorldSceneInteractor.h" -#include "../Toolbox/SharedValue.h" #include "../Toolbox/ViewportGeometry.h" namespace OrthancStone @@ -32,7 +31,6 @@ class WorldSceneWidget : public CairoWidget { public: - // Must be thread-safe class IWorldObserver : public boost::noncopyable { public: @@ -57,9 +55,9 @@ typedef ObserversRegistry<WorldSceneWidget, IWorldObserver> Observers; - SharedValue<ViewportGeometry> view_; - Observers observers_; - IWorldSceneInteractor* interactor_; + ViewportGeometry view_; + Observers observers_; + IWorldSceneInteractor* interactor_; protected: @@ -72,7 +70,7 @@ int x, int y); - void SetSceneExtent(SharedValue<ViewportGeometry>::Locker& locker); + void SetSceneExtent(ViewportGeometry& geometry); public: WorldSceneWidget() :