Mercurial > hg > orthanc-stone
diff Samples/Qt/QStoneOpenGlWidget.cpp @ 897:9c2f6d6b9f4a am-dev
Merge
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Tue, 16 Jul 2019 12:37:29 +0200 |
parents | aad5ccf1be10 |
children | a911f5bb48da |
line wrap: on
line diff
--- a/Samples/Qt/QStoneOpenGlWidget.cpp Fri Jul 12 14:57:48 2019 +0200 +++ b/Samples/Qt/QStoneOpenGlWidget.cpp Tue Jul 16 12:37:29 2019 +0200 @@ -33,11 +33,11 @@ OrthancStone::GuiAdapterMouseEvent& guiEvent, PointerEvent& pointerEvent, const QMouseEvent& qtEvent, - const OrthancStone::OpenGLCompositor& compositor) + const IViewport& viewport) { guiEvent.targetX = qtEvent.x(); guiEvent.targetY = qtEvent.y(); - pointerEvent.AddPosition(compositor.GetPixelCenterCoordinates(guiEvent.targetX, guiEvent.targetY)); + pointerEvent.AddPosition(viewport.GetPixelCenterCoordinates(guiEvent.targetX, guiEvent.targetY)); switch (qtEvent.button()) { @@ -66,7 +66,7 @@ { OrthancStone::GuiAdapterMouseEvent guiEvent; PointerEvent pointerEvent; - ConvertFromPlatform(guiEvent, pointerEvent, *qtEvent, *compositor_); + ConvertFromPlatform(guiEvent, pointerEvent, *qtEvent, *viewport_); guiEvent.type = guiEventType; if (sceneInteractor_.get() != NULL && compositor_.get() != NULL)