From f5490066271deebd48f72e884ffcdbe7957c6bc7 Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Sat, 3 Sep 2011 11:13:45 +0100 Subject: [PATCH] Swap Zoom and Select on LTM/Ride Plot This is a perennial issue for new users. The default action when click dragging on a chart is to Zoom -- this was probably right when we had no span sliders or stack view (and no facility for marking intervals either). But now, most users will expect click and drag on a metric chart or ride plot to mark an interval or date range. We get regular feature requests and bug reports related to this -- basically the mouse actions are not intuitive. Where selection is not meaningful (e.g. histogram) then left click will zoom. This should be reasonably intuitive to most users. Fixes #398. --- src/AllPlotWindow.cpp | 4 +++- src/LTMWindow.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/AllPlotWindow.cpp b/src/AllPlotWindow.cpp index 7774537f0..29d0bcdac 100644 --- a/src/AllPlotWindow.cpp +++ b/src/AllPlotWindow.cpp @@ -160,6 +160,8 @@ AllPlotWindow::AllPlotWindow(MainWindow *mainWindow) : // RightButton: zoom out by 1 // Ctrl+RightButton: zoom out to full size + allZoomer->setMousePattern(QwtEventPattern::MouseSelect1, + Qt::LeftButton, Qt::ShiftModifier); allZoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton, Qt::ControlModifier); allZoomer->setMousePattern(QwtEventPattern::MouseSelect3, @@ -179,7 +181,7 @@ AllPlotWindow::AllPlotWindow(MainWindow *mainWindow) : ""); allPlot->tooltip->setSelectionFlags(QwtPicker::PointSelection | QwtPicker::RectSelection | QwtPicker::DragSelection); allPlot->tooltip->setRubberBand(QwtPicker::VLineRubberBand); - allPlot->tooltip->setMousePattern(QwtEventPattern::MouseSelect1, Qt::LeftButton, Qt::ShiftModifier); + allPlot->tooltip->setMousePattern(QwtEventPattern::MouseSelect1, Qt::LeftButton); allPlot->tooltip->setTrackerPen(QColor(Qt::black)); QColor inv(Qt::white); inv.setAlpha(0); diff --git a/src/LTMWindow.cpp b/src/LTMWindow.cpp index f82650b3e..911dc9c72 100644 --- a/src/LTMWindow.cpp +++ b/src/LTMWindow.cpp @@ -67,6 +67,8 @@ LTMWindow::LTMWindow(MainWindow *parent, bool useMetricUnits, const QDir &home) | QwtPicker::CornerToCorner); ltmZoomer->setTrackerMode(QwtPicker::AlwaysOff); ltmZoomer->setEnabled(false); + ltmZoomer->setMousePattern(QwtEventPattern::MouseSelect1, + Qt::LeftButton, Qt::ShiftModifier); ltmZoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton, Qt::ControlModifier); ltmZoomer->setMousePattern(QwtEventPattern::MouseSelect3, @@ -79,7 +81,7 @@ LTMWindow::LTMWindow(MainWindow *parent, bool useMetricUnits, const QDir &home) ltmPlot->canvas(), ""); picker->setMousePattern(QwtEventPattern::MouseSelect1, - Qt::LeftButton, Qt::ShiftModifier); + Qt::LeftButton); picker->setTrackerPen(QColor(Qt::black)); QColor inv(Qt::white); inv.setAlpha(0);