From 72195f6b17c0ed2e508c58bf3cadd5b9dc4e28ac Mon Sep 17 00:00:00 2001 From: Tim Moore Date: Tue, 22 Dec 2009 23:30:56 +0100 Subject: grapher: remove _zoomFactor from horizontal scaling calculation This makes zooming more consistent and less buggy. * grapher/Graph.cxx (Graph::draw): Set graph time spread using _zoomFactor. * grapher/Graph.hxx (Graph::getHorizontalScale): no _zoomFactor * grapher/GraphWidget.cxx (on_motion_notify_event): Dragging increment uses _zoomFactor. (on_scroll_event): Set extents after changing the zoom factor with the scroll wheel. --- grapher/GraphWidget.cxx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'grapher/GraphWidget.cxx') diff --git a/grapher/GraphWidget.cxx b/grapher/GraphWidget.cxx index be1ebdcd..ce2f934f 100644 --- a/grapher/GraphWidget.cxx +++ b/grapher/GraphWidget.cxx @@ -241,8 +241,10 @@ bool GraphWidget::on_motion_notify_event(GdkEventMotion* event) const int width = allocation.get_width(); double motion = (_mouseX - _dragOriginX) / (double) width; double increment = motion * (_dragOrigLeft - _dragOrigRight); - _activeGraph->_left = _dragOrigLeft + increment; - _activeGraph->_right = _dragOrigRight + increment; + _activeGraph->_left + = _dragOrigLeft + increment / _activeGraph->_zoomFactor; + _activeGraph->_right + = _dragOrigRight + increment / _activeGraph->_zoomFactor; queue_draw(); } if (_hoverText && _hoverText->isVisible()) @@ -263,10 +265,16 @@ bool GraphWidget::on_scroll_event(GdkEventScroll* event) { if ((*gitr)->containsPoint(event->x, event->y)) { + double oldZoom = (*gitr)->_zoomFactor; if (event->direction == GDK_SCROLL_UP) - (*gitr)->_zoomFactor += .1; + (*gitr)->_zoomFactor *= 1.1; else if (event->direction == GDK_SCROLL_DOWN) - (*gitr)->_zoomFactor -= .1; + (*gitr)->_zoomFactor /= 1.1; + int64_t left, right; + double top, bottom; + (*gitr)->getExtents(left, right, top, bottom); + right = left - (left - right) * (oldZoom / (*gitr)->_zoomFactor); + (*gitr)->setExtents(left, right, top, bottom); queue_draw(); break; } -- cgit