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

AppFwk : Guard use of timestamp() function introduced in Qt5

Browse Source
This commit is contained in:
Magne Sjaastad
2019-06-25 18:02:47 +02:00
parent b2857676c8
commit d108e1f354
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.cpp
View File

@@ -320,7 +320,10 @@ void caf::RotationSensitivityCalculator::init(QMouseEvent* eventAtRotationStart)
{ {
m_lastPosX = eventAtRotationStart->x(); m_lastPosX = eventAtRotationStart->x();
m_lastPosY = eventAtRotationStart->y(); m_lastPosY = eventAtRotationStart->y();
#if QT_VERSION >= 0x050000
m_lastTime = eventAtRotationStart->timestamp(); m_lastTime = eventAtRotationStart->timestamp();
#endif
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -332,6 +335,7 @@ double caf::RotationSensitivityCalculator::calculateSensitivity(QMouseEvent* eve
if ( m_isEnabled ) if ( m_isEnabled )
{ {
#if QT_VERSION >= 0x050000
auto presentTime = eventWhenRotating->timestamp(); auto presentTime = eventWhenRotating->timestamp();
unsigned long timeSinceLast = presentTime - m_lastTime; unsigned long timeSinceLast = presentTime - m_lastTime;
if ( timeSinceLast == 0 ) timeSinceLast = 1; // one millisecond if ( timeSinceLast == 0 ) timeSinceLast = 1; // one millisecond
@@ -356,6 +360,7 @@ double caf::RotationSensitivityCalculator::calculateSensitivity(QMouseEvent* eve
//openDebugWindow(); //openDebugWindow();
//std::cout << sensitivity << " Speed: " << mouseVelocity.length() << " " << mouseVelocityLengthCorr << " \tDelta " << deltaX << ", " << deltaY << " "<< timeSinceLast << std::endl; //std::cout << sensitivity << " Speed: " << mouseVelocity.length() << " " << mouseVelocityLengthCorr << " \tDelta " << deltaX << ", " << deltaY << " "<< timeSinceLast << std::endl;
#endif
} }
return sensitivity; return sensitivity;