Mercurial > hg > orthanc-stone
diff Framework/Widgets/WorldSceneWidget.cpp @ 726:4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 21 May 2019 11:43:25 +0200 |
parents | 9a474e90e832 |
children |
line wrap: on
line diff
--- a/Framework/Widgets/WorldSceneWidget.cpp Mon May 20 16:26:34 2019 +0200 +++ b/Framework/Widgets/WorldSceneWidget.cpp Tue May 21 11:43:25 2019 +0200 @@ -32,7 +32,7 @@ #include <memory> #include <cassert> -namespace OrthancStone +namespace Deprecated { // this is an adapter between a IWorldSceneMouseTracker // that is tracking a mouse in scene coordinates/mm and @@ -60,8 +60,8 @@ { if (tracker_->HasRender()) { - CairoSurface surface(target, false /* no alpha */); - CairoContext context(surface); + OrthancStone::CairoSurface surface(target, false /* no alpha */); + OrthancStone::CairoContext context(surface); view_.ApplyTransform(context); tracker_->Render(context, view_.GetZoom()); } @@ -95,14 +95,14 @@ }; - bool WorldSceneWidget::RenderCairo(CairoContext& context) + bool WorldSceneWidget::RenderCairo(OrthancStone::CairoContext& context) { view_.ApplyTransform(context); return RenderScene(context, view_); } - void WorldSceneWidget::RenderMouseOverCairo(CairoContext& context, + void WorldSceneWidget::RenderMouseOverCairo(OrthancStone::CairoContext& context, int x, int y) { @@ -156,10 +156,10 @@ } - IMouseTracker* WorldSceneWidget::CreateMouseTracker(MouseButton button, + IMouseTracker* WorldSceneWidget::CreateMouseTracker(OrthancStone::MouseButton button, int x, int y, - KeyboardModifiers modifiers, + OrthancStone::KeyboardModifiers modifiers, const std::vector<Touch>& touches) { double sceneX, sceneY; @@ -189,10 +189,10 @@ { switch (button) { - case MouseButton_Middle: + case OrthancStone::MouseButton_Middle: return new SceneMouseTracker(view_, new PanMouseTracker(*this, x, y)); - case MouseButton_Right: + case OrthancStone::MouseButton_Right: return new SceneMouseTracker(view_, new ZoomMouseTracker(*this, x, y)); default: @@ -207,10 +207,10 @@ } - void WorldSceneWidget::MouseWheel(MouseWheelDirection direction, + void WorldSceneWidget::MouseWheel(OrthancStone::MouseWheelDirection direction, int x, int y, - KeyboardModifiers modifiers) + OrthancStone::KeyboardModifiers modifiers) { if (interactor_) { @@ -219,9 +219,9 @@ } - void WorldSceneWidget::KeyPressed(KeyboardKeys key, + void WorldSceneWidget::KeyPressed(OrthancStone::KeyboardKeys key, char keyChar, - KeyboardModifiers modifiers) + OrthancStone::KeyboardModifiers modifiers) { if (interactor_) {