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

Copy changes from dev-branch into main

Browse Source 
History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad
2023-10-23 08:12:19 +02:00
parent 5688838899
commit 06f9c6126d
1778 changed files with 35036 additions and 12457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/UserInterface/RiuRmsNavigation.cpp
View File

@@ -62,7 +62,7 @@ bool RiuRmsNavigation::handleInputEvent( QInputEvent* inputEvent )
if ( me->button() == Qt::MiddleButton && isRotationEnabled() )
{
this->pickAndSetPointOfInterest( me->x(), me->y() );
pickAndSetPointOfInterest( me->x(), me->y() );
m_trackball->startNavigation( cvf::ManipulatorTrackball::ROTATE, translatedMousePosX, translatedMousePosY );
m_isNavigating = true;
@@ -138,7 +138,7 @@ bool RiuRmsNavigation::handleInputEvent( QInputEvent* inputEvent )
if ( m_isZooming )
{
int delta = -3 * ( m_lastPosY - me->y() );
this->zoomAlongRay( m_zoomRay.p(), delta );
zoomAlongRay( m_zoomRay.p(), delta );
m_lastPosX = me->x();
m_lastPosY = me->y();
}