OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Qt6: Fix QMouseEvent.x() and .y() deprecation.

Browse Source
This commit is contained in:
Kristian Bendiksen
2024-10-02 11:03:10 +02:00
parent a04d41b043
commit 835cf4a53c
10 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/Commands/IntersectionBoxCommands/RicBoxManipulatorEventHandler.cpp
View File

@@ -137,7 +137,7 @@ bool RicBoxManipulatorEventHandler::eventFilter( QObject* obj, QEvent* inputEven
QMouseEvent* mouseEvent = static_cast<QMouseEvent*>( inputEvent );
cvf::ref<cvf::RayIntersectSpec> rayIS =
viewer->rayIntersectSpecFromWindowCoordinates( mouseEvent->pos().x(), mouseEvent->pos().y() );
viewer->rayIntersectSpecFromWindowCoordinates( mouseEvent->position().x(), mouseEvent->position().y() );
if ( rayIS.notNull() )
{

5
ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulator.cpp
View File

@@ -128,8 +128,9 @@ bool RicPointTangentManipulator::eventFilter( QObject* obj, QEvent* inputEvent )
{
auto* mouseEvent = static_cast<QMouseEvent*>( inputEvent );
cvf::ref<cvf::RayIntersectSpec> rayIs =
m_viewer->rayIntersectSpecFromWindowCoordinates( mouseEvent->pos().x(), mouseEvent->pos().y(), m_isDraggingInComparisonView );
cvf::ref<cvf::RayIntersectSpec> rayIs = m_viewer->rayIntersectSpecFromWindowCoordinates( mouseEvent->position().x(),
mouseEvent->position().y(),
m_isDraggingInComparisonView );
if ( !rayIs.isNull() && rayIs->ray() )
{

4
ApplicationLibCode/UserInterface/RiuViewer.cpp
View File

@@ -1076,8 +1076,8 @@ void RiuViewer::mouseMoveEvent( QMouseEvent* mouseEvent )
RimViewLinker* viewLinker = m_rimView->assosiatedViewLinker();
if ( viewLinker )
{
int translatedMousePosX = mouseEvent->pos().x();
int translatedMousePosY = height() - mouseEvent->pos().y();
int translatedMousePosX = mouseEvent->position().x();
int translatedMousePosY = height() - mouseEvent->position().y();
cvf::Vec3d displayCoord( 0, 0, 0 );
if ( mainCamera()->unproject( cvf::Vec3d( static_cast<double>( translatedMousePosX ), static_cast<double>( translatedMousePosY ), 0 ),

4
ApplicationLibCode/UserInterface/RiuWellLogTrack.cpp
View File

@@ -139,11 +139,11 @@ void RiuWellLogTrack::onMouseMoveEvent( QMouseEvent* mouseEvent )
double depth = 0.0;
if ( depthTrackPlot->depthOrientation() == RiaDefines::Orientation::HORIZONTAL )
{
depth = axisMap.invTransform( mouseEvent->pos().x() );
depth = axisMap.invTransform( mouseEvent->position().x() );
}
else
{
depth = axisMap.invTransform( mouseEvent->pos().y() );
depth = axisMap.invTransform( mouseEvent->position().y() );
}
depthTrackPlot->setDepthMarkerPosition( depth );