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

Multiaxis: Fix mouse tracking for Qwt plot with multiple axis.

Browse Source
This commit is contained in:
Kristian Bendiksen
2022-04-01 13:07:37 +02:00
parent 288269fad7
commit 7cb72688ea
3 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationLibCode/UserInterface/RiuQwtCurvePointTracker.cpp
View File

@@ -103,8 +103,8 @@ QwtText RiuQwtCurvePointTracker::trackerText( const QPoint& pos ) const
if ( m_plot )
{
QwtAxis::Position relatedYAxis = QwtAxis::YLeft;
QwtAxis::Position relatedXAxis = QwtAxis::XBottom;
QwtAxisId relatedYAxis( QwtAxis::YLeft, 0 );
QwtAxisId relatedXAxis( QwtAxis::XBottom, 0 );
QString curveInfoText;
QString mainAxisValueString;
@@ -140,8 +140,8 @@ QPointF RiuQwtCurvePointTracker::closestCurvePoint( const QPoint& cursorPos
QString* curveInfoText,
QString* valueAxisValueString,
QString* mainAxisValueString,
QwtAxis::Position* relatedXAxis,
QwtAxis::Position* relatedYAxis ) const
QwtAxisId* relatedXAxis,
QwtAxisId* relatedYAxis ) const
{
QPointF samplePoint;
@@ -170,8 +170,8 @@ QPointF RiuQwtCurvePointTracker::closestCurvePoint( const QPoint& cursorPos
{
samplePoint = closestCurve->sample( closestPointSampleIndex );
if ( relatedXAxis ) *relatedXAxis = static_cast<QwtAxis::Position>( closestCurve->xAxis().pos );
if ( relatedYAxis ) *relatedYAxis = static_cast<QwtAxis::Position>( closestCurve->yAxis().pos );
if ( relatedXAxis ) *relatedXAxis = closestCurve->xAxis();
if ( relatedYAxis ) *relatedYAxis = closestCurve->yAxis();
}
if ( mainAxisValueString )
@@ -228,8 +228,8 @@ QPointF RiuQwtCurvePointTracker::closestCurvePoint( const QPoint& cursorPos
///
//--------------------------------------------------------------------------------------------------
void RiuQwtCurvePointTracker::updateClosestCurvePointMarker( const QPointF& closestPoint,
QwtAxis::Position relatedXAxis,
QwtAxis::Position relatedYAxis ) const
QwtAxisId relatedXAxis,
QwtAxisId relatedYAxis ) const
{
bool replotRequired = false;

8
ApplicationLibCode/UserInterface/RiuQwtCurvePointTracker.h
View File

@@ -46,11 +46,9 @@ protected:
QString* curveInfoText,
QString* valueAxisValueString,
QString* mainAxisValueString,
QwtAxis::Position* relatedXAxis,
QwtAxis::Position* relatedYAxis ) const;
void updateClosestCurvePointMarker( const QPointF& closestPoint,
QwtAxis::Position relatedXAxis,
QwtAxis::Position relatedYAxis ) const;
QwtAxisId* relatedXAxis,
QwtAxisId* relatedYAxis ) const;
void updateClosestCurvePointMarker( const QPointF& closestPoint, QwtAxisId relatedXAxis, QwtAxisId relatedYAxis ) const;
QPointer<QwtPlot> m_plot;
QwtPlotMarker* m_plotMarker;

4
ApplicationLibCode/UserInterface/RiuWellLogTrack.cpp
View File

@@ -58,8 +58,8 @@ protected:
if ( m_plot )
{
QwtAxis::Position relatedYAxis = QwtAxis::YLeft;
QwtAxis::Position relatedXAxis = QwtAxis::XTop;
QwtAxisId relatedYAxis( QwtAxis::YLeft, 0 );
QwtAxisId relatedXAxis( QwtAxis::XTop, 0 );
QString curveInfoText;
QString depthAxisValueString;