Mercurial > hg > orthanc-stone
diff Framework/Viewport/WidgetViewport.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 | 1201b12eb9f8 |
| children |
line wrap: on
line diff
--- a/Framework/Viewport/WidgetViewport.cpp Mon May 20 16:26:34 2019 +0200 +++ b/Framework/Viewport/WidgetViewport.cpp Tue May 21 11:43:25 2019 +0200 @@ -24,9 +24,9 @@ #include <Core/Images/ImageProcessing.h> #include <Core/OrthancException.h> -namespace OrthancStone +namespace Deprecated { - WidgetViewport::WidgetViewport(MessageBroker& broker) : + WidgetViewport::WidgetViewport(OrthancStone::MessageBroker& broker) : IViewport(broker), statusBar_(NULL), isMouseOver_(false), @@ -139,7 +139,7 @@ void WidgetViewport::TouchStart(const std::vector<Touch>& displayTouches) { - MouseDown(MouseButton_Left, (int)displayTouches[0].x, (int)displayTouches[0].y, KeyboardModifiers_None, displayTouches); // one touch is equivalent to a mouse tracker without left button -> set the mouse coordinates to the first touch coordinates + MouseDown(OrthancStone::MouseButton_Left, (int)displayTouches[0].x, (int)displayTouches[0].y, OrthancStone::KeyboardModifiers_None, displayTouches); // one touch is equivalent to a mouse tracker without left button -> set the mouse coordinates to the first touch coordinates } void WidgetViewport::TouchMove(const std::vector<Touch>& displayTouches) @@ -154,10 +154,10 @@ MouseUp(); } - void WidgetViewport::MouseDown(MouseButton button, + void WidgetViewport::MouseDown(OrthancStone::MouseButton button, int x, int y, - KeyboardModifiers modifiers, + OrthancStone::KeyboardModifiers modifiers, const std::vector<Touch>& displayTouches ) { @@ -241,10 +241,10 @@ } - void WidgetViewport::MouseWheel(MouseWheelDirection direction, + void WidgetViewport::MouseWheel(OrthancStone::MouseWheelDirection direction, int x, int y, - KeyboardModifiers modifiers) + OrthancStone::KeyboardModifiers modifiers) { if (centralWidget_.get() != NULL && mouseTracker_.get() == NULL) @@ -254,9 +254,9 @@ } - void WidgetViewport::KeyPressed(KeyboardKeys key, + void WidgetViewport::KeyPressed(OrthancStone::KeyboardKeys key, char keyChar, - KeyboardModifiers modifiers) + OrthancStone::KeyboardModifiers modifiers) { if (centralWidget_.get() != NULL && mouseTracker_.get() == NULL)