diff --git a/src/GUI/axisitem.cpp b/src/GUI/axisitem.cpp index 7dc4ba27..6702e88a 100644 --- a/src/GUI/axisitem.cpp +++ b/src/GUI/axisitem.cpp @@ -41,6 +41,7 @@ AxisItem::AxisItem(Type type, QGraphicsItem *parent) { _type = type; _size = 0; + _zoom = 1.0; _font.setPixelSize(FONT_SIZE); _font.setFamily(FONT_FAMILY); @@ -52,7 +53,8 @@ void AxisItem::setRange(const RangeF &range) _range = range; QFontMetrics fm(_font); - Ticks ticks(_range.min(), _range.max(), (_type == X) ? XTICKS : YTICKS); + Ticks ticks(_range.min(), _range.max(), + (_type == X) ? XTICKS * _zoom : YTICKS * _zoom); _ticks = QVector(ticks.count()); for (int i = 0; i < ticks.count(); i++) { Tick &t = _ticks[i]; diff --git a/src/GUI/axisitem.h b/src/GUI/axisitem.h index a49674b9..d35f82ac 100644 --- a/src/GUI/axisitem.h +++ b/src/GUI/axisitem.h @@ -20,6 +20,7 @@ public: void setRange(const RangeF &range); void setSize(qreal size); void setLabel(const QString& label); + void setZoom(qreal zoom) {_zoom = zoom;} QSizeF margin() const; QList ticks() const; @@ -41,6 +42,7 @@ private: QRectF _boundingRect; QFont _font; QLocale _locale; + qreal _zoom; }; #endif // AXISITEM_H diff --git a/src/GUI/graphview.cpp b/src/GUI/graphview.cpp index 61f6abf9..f1508046 100644 --- a/src/GUI/graphview.cpp +++ b/src/GUI/graphview.cpp @@ -279,6 +279,7 @@ void GraphView::redraw(const QSizeF &size) ry.resize(_minYRange * _yScale); _xAxis->setRange(rx); + _xAxis->setZoom(_zoom); _yAxis->setRange(ry); mx = _xAxis->margin(); my = _yAxis->margin();