OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-02 09:00:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prepare building with Qt6

Browse Source 
* Fwk: Switch from delta to angleDelta for QWheelEvent
* Fwk: Add option to build more libraries with Qt6
* Fwk: Remove unused includes of QtOpenGL
* Fwk: Don't forward declare QStringList
* Fwk: Store cursor position in QPoint variable
* Fwk: Use QWheelEvent::position in Qt6
This commit is contained in:
Eirik Marthinsen authored and GitHub committed 2024-03-06 08:32:27 +01:00
1 parent 9f96cb9694
commit ea27e952f5
10 files changed
+99 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Fwk/AppFwk/cafViewer/CMakeLists.txt
+17 -7
View File
@@ -11,13 +11,23 @@ endif()
# These headers need to go through Qt's MOC compiler
set(MOC_HEADER_FILES cafViewer.h)
find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets OpenGL
)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
if(CEE_USE_QT6)
find_package(
Qt6
COMPONENTS
REQUIRED Core Gui Widgets OpenGL
)
set(QT_LIBRARIES Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGL)
qt_standard_project_setup()
else()
find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets OpenGL
)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
endif()
add_library(
${PROJECT_NAME}
Fwk/AppFwk/cafViewer/cafCadNavigation.cpp
+9 -3
View File
@@ -144,16 +144,22 @@ bool caf::CadNavigation::handleInputEvent( QInputEvent* inputEvent )
{
QWheelEvent* we = static_cast<QWheelEvent*>( inputEvent );
updatePointOfInterestDuringZoomIfNecessary( we->x(), we->y() );
#if ( QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ) )
QPoint cursorPosition = we->pos();
#else
QPoint cursorPosition = we->position().toPoint();
#endif
updatePointOfInterestDuringZoomIfNecessary( cursorPosition.x(), cursorPosition.y() );
if ( m_isRotCenterInitialized )
{
int translatedMousePosX, translatedMousePosY;
cvfEventPos( we->x(), we->y(), &translatedMousePosX, &translatedMousePosY );
cvfEventPos( cursorPosition.x(), cursorPosition.y(), &translatedMousePosX, &translatedMousePosY );
cvf::ref<cvf::Ray> ray = createZoomRay( translatedMousePosX, translatedMousePosY );
zoomAlongRay( ray.p(), -we->delta() );
zoomAlongRay( ray.p(), -we->angleDelta().y() );
}
isEventHandled = true;
}
Fwk/AppFwk/cafViewer/cafCeetronNavigation.cpp
+9 -4
View File
@@ -200,13 +200,18 @@ void caf::CeetronNavigation::wheelEvent( QWheelEvent* event )
if ( vpHeight <= 0 ) return;
int navDelta = vpHeight / 5;
if ( event->delta() < 0 ) navDelta *= -1;
if ( event->angleDelta().y() < 0 ) navDelta *= -1;
int posY = m_viewer->height() - event->y();
#if ( QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ) )
QPoint cursorPosition = event->pos();
#else
QPoint cursorPosition = event->position().toPoint();
#endif
int posY = m_viewer->height() - cursorPosition.y();
m_trackball->startNavigation( ManipulatorTrackball::WALK, event->x(), posY );
m_trackball->startNavigation( ManipulatorTrackball::WALK, cursorPosition.x(), posY );
m_trackball->updateNavigation( event->x(), posY + navDelta );
m_trackball->updateNavigation( cursorPosition.x(), posY + navDelta );
m_trackball->endNavigation();
m_viewer->updateParallelProjectionHeightFromMoveZoom( m_pointOfInterest );
Fwk/AppFwk/cafViewer/cafCeetronPlusNavigation.cpp
+9 -3
View File
@@ -185,16 +185,22 @@ bool caf::CeetronPlusNavigation::handleInputEvent( QInputEvent* inputEvent )
{
QWheelEvent* we = static_cast<QWheelEvent*>( inputEvent );
updatePointOfInterestDuringZoomIfNecessary( we->x(), we->y() );
#if ( QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ) )
QPoint cursorPosition = we->pos();
#else
QPoint cursorPosition = we->position().toPoint();
#endif
updatePointOfInterestDuringZoomIfNecessary( cursorPosition.x(), cursorPosition.y() );
if ( m_isRotCenterInitialized )
{
int translatedMousePosX, translatedMousePosY;
cvfEventPos( we->x(), we->y(), &translatedMousePosX, &translatedMousePosY );
cvfEventPos( cursorPosition.x(), cursorPosition.y(), &translatedMousePosX, &translatedMousePosY );
cvf::ref<cvf::Ray> ray = createZoomRay( translatedMousePosX, translatedMousePosY );
zoomAlongRay( ray.p(), we->delta() );
zoomAlongRay( ray.p(), we->angleDelta().y() );
}
isEventHandled = true;
}