X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=sigview.cpp;h=5601be575d722df78302897fa19965fe3280464e;hp=c46476a30f386920b799e68580b1c31f4c0b2cf2;hb=a429590b40f74cebd13986bb1b4c06a4b47d8815;hpb=7ae275942e8efbe25df311fecbf3c2a4cb9b0cfe diff --git a/sigview.cpp b/sigview.cpp index c46476a3..5601be57 100644 --- a/sigview.cpp +++ b/sigview.cpp @@ -62,6 +62,11 @@ SigView::SigView(SigSession &session, QWidget *parent) : setAutoFillBackground(false); } +void SigView::zoom(double steps) +{ + zoom(steps, (width() - LabelMarginWidth) / 2); +} + void SigView::initializeGL() { } @@ -164,13 +169,7 @@ void SigView::mouseReleaseEvent(QMouseEvent *event) void SigView::wheelEvent(QWheelEvent *event) { assert(event); - - const double x = event->x() - LabelMarginWidth; - const double cursor_offset = _offset + _scale * x; - _scale *= powf(3.0/2.0, -event->delta() / 120); - _scale = max(min(_scale, MaxScale), MinScale); - _offset = cursor_offset - _scale * x; - update(); + zoom(event->delta() / 120, event->x() - LabelMarginWidth); } void SigView::setup_viewport(int width, int height) @@ -243,3 +242,12 @@ void SigView::paint_ruler(QPainter &p) division++; } } + +void SigView::zoom(double steps, int offset) +{ + const double cursor_offset = _offset + _scale * offset; + _scale *= pow(3.0/2.0, -steps); + _scale = max(min(_scale, MaxScale), MinScale); + _offset = cursor_offset - _scale * offset; + update(); +}