Mercurial > hg > orthanc-stone
comparison 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 |
comparison
equal
deleted
inserted
replaced
896:875bd6aca5e6 | 897:9c2f6d6b9f4a |
---|---|
31 | 31 |
32 void ConvertFromPlatform( | 32 void ConvertFromPlatform( |
33 OrthancStone::GuiAdapterMouseEvent& guiEvent, | 33 OrthancStone::GuiAdapterMouseEvent& guiEvent, |
34 PointerEvent& pointerEvent, | 34 PointerEvent& pointerEvent, |
35 const QMouseEvent& qtEvent, | 35 const QMouseEvent& qtEvent, |
36 const OrthancStone::OpenGLCompositor& compositor) | 36 const IViewport& viewport) |
37 { | 37 { |
38 guiEvent.targetX = qtEvent.x(); | 38 guiEvent.targetX = qtEvent.x(); |
39 guiEvent.targetY = qtEvent.y(); | 39 guiEvent.targetY = qtEvent.y(); |
40 pointerEvent.AddPosition(compositor.GetPixelCenterCoordinates(guiEvent.targetX, guiEvent.targetY)); | 40 pointerEvent.AddPosition(viewport.GetPixelCenterCoordinates(guiEvent.targetX, guiEvent.targetY)); |
41 | 41 |
42 switch (qtEvent.button()) | 42 switch (qtEvent.button()) |
43 { | 43 { |
44 case Qt::LeftButton: guiEvent.button = OrthancStone::GUIADAPTER_MOUSEBUTTON_LEFT; break; | 44 case Qt::LeftButton: guiEvent.button = OrthancStone::GUIADAPTER_MOUSEBUTTON_LEFT; break; |
45 case Qt::MiddleButton: guiEvent.button = OrthancStone::GUIADAPTER_MOUSEBUTTON_MIDDLE; break; | 45 case Qt::MiddleButton: guiEvent.button = OrthancStone::GUIADAPTER_MOUSEBUTTON_MIDDLE; break; |
64 | 64 |
65 void QStoneOpenGlWidget::mouseEvent(QMouseEvent* qtEvent, OrthancStone::GuiAdapterHidEventType guiEventType) | 65 void QStoneOpenGlWidget::mouseEvent(QMouseEvent* qtEvent, OrthancStone::GuiAdapterHidEventType guiEventType) |
66 { | 66 { |
67 OrthancStone::GuiAdapterMouseEvent guiEvent; | 67 OrthancStone::GuiAdapterMouseEvent guiEvent; |
68 PointerEvent pointerEvent; | 68 PointerEvent pointerEvent; |
69 ConvertFromPlatform(guiEvent, pointerEvent, *qtEvent, *compositor_); | 69 ConvertFromPlatform(guiEvent, pointerEvent, *qtEvent, *viewport_); |
70 guiEvent.type = guiEventType; | 70 guiEvent.type = guiEventType; |
71 | 71 |
72 if (sceneInteractor_.get() != NULL && compositor_.get() != NULL) | 72 if (sceneInteractor_.get() != NULL && compositor_.get() != NULL) |
73 { | 73 { |
74 sceneInteractor_->OnMouseEvent(guiEvent, pointerEvent); | 74 sceneInteractor_->OnMouseEvent(guiEvent, pointerEvent); |