X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=95b94cf1a0ab8d768fd966207dad1b92628aaf97;hp=4e0fed063fca8c4d42e67c5bcb6cb58c23cee390;hb=17c0f398438df75dc5547d630e7d334e5de3c66a;hpb=64b60583ff73db2bd9458817276687b030fe48e1 diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 4e0fed06..95b94cf1 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -96,6 +96,19 @@ void View::zoom(double steps) zoom(steps, (width() - LabelMarginWidth) / 2); } +void View::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; + + _ruler->update(); + _viewport->update(); + update_scroll(); +} + + void View::set_scale_offset(double scale, double offset) { _scale = scale; @@ -132,18 +145,6 @@ void View::update_scroll() _viewport->get_total_height() - areaSize.height()); } -void View::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; - - _ruler->update(); - _viewport->update(); - update_scroll(); -} - bool View::viewportEvent(QEvent *e) { switch(e->type()) {