Mirrors/inspectrum
2
0
Fork 0
mirror of https://github.com/miek/inspectrum.git synced 2026-03-05 16:04:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'kevinmehall-zoom'

Browse Source
This commit is contained in:
Mike Walters
2017-02-18 17:47:53 +00:00
parent 87d52d5274 90d798a93b
commit d8d1969a4c
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
plotview.cpp
View File

@@ -170,10 +170,24 @@ bool PlotView::viewportEvent(QEvent *event) {
if (event->type() == QEvent::Wheel) {
QWheelEvent *wheelEvent = (QWheelEvent*)event;
if (QApplication::keyboardModifiers() & Qt::ControlModifier) {
if (wheelEvent->angleDelta().y() > 0) {
emit zoomIn();
} else if (wheelEvent->angleDelta().y() < 0) {
emit zoomOut();
bool canZoomIn = zoomLevel < fftSize;
bool canZoomOut = zoomLevel > 1;
int delta = wheelEvent->angleDelta().y();
if ((delta > 0 && canZoomIn) || (delta < 0 && canZoomOut)) {
scrollZoomStepsAccumulated += delta;
// `updateViewRange()` keeps the center sample in the same place after zoom. Apply
// a scroll adjustment to keep the sample under the mouse cursor in the same place instead.
int fromCenter = wheelEvent->pos().x() - width()/2;
if (scrollZoomStepsAccumulated >= 120) {
scrollZoomStepsAccumulated -= 120;
emit zoomIn();
horizontalScrollBar()->setValue(horizontalScrollBar()->value() + fromCenter * samplesPerLine());
} else if (scrollZoomStepsAccumulated <= -120) {
scrollZoomStepsAccumulated += 120;
horizontalScrollBar()->setValue(horizontalScrollBar()->value() - fromCenter * samplesPerLine());
emit zoomOut();
}
}
return true;
}

1
plotview.h
View File

@@ -75,6 +75,7 @@ private:
bool cursorsEnabled;
off_t sampleRate = 0;
bool timeScaleEnabled;
int scrollZoomStepsAccumulated = 0;
void addPlot(Plot *plot);
void emitTimeSelection();