root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-17 16:20:48 +01:00
Code Issues Projects Releases Activity

Fixed Y legend plotting issue

Browse Source
This commit is contained in:
Martin Tůma 2016-03-22 06:48:49 +01:00
parent a0b64b4227
commit b1b8d68610
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/axisitem.cpp
View File

@ -77,7 +77,18 @@ void AxisItem::updateBoundingRect()
_size + es.width()/2 + ss.width()/2, _size + es.width()/2 + ss.width()/2,
ls.height() + es.height() - fm.descent() + TICK + 2*PADDING); ls.height() + es.height() - fm.descent() + TICK + 2*PADDING);
} else { } else {
_boundingRect = QRectF(-(ls.height() + es.width() + 2*PADDING int mtw = 0;
QRect ts;
qreal val;
for (int i = 0; i < ((l.max - l.min) / l.d) + 1; i++) {
val = l.min + i * l.d;
QString str = QString::number(val);
ts = fm.tightBoundingRect(str);
mtw = qMax(ts.width(), mtw);
}
_boundingRect = QRectF(-(ls.height() + mtw + 2*PADDING
- fm.descent() + TICK/2), -(_size + es.height()/2 - fm.descent() + TICK/2), -(_size + es.height()/2
+ fm.descent()), ls.height() -fm.descent() + es.width() + 2*PADDING + fm.descent()), ls.height() -fm.descent() + es.width() + 2*PADDING
+ TICK, _size + es.height()/2 + fm.descent() + ss.height()/2); + TICK, _size + es.height()/2 + fm.descent() + ss.height()/2);
@ -124,6 +135,7 @@ void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
painter->drawLine(0, 0, 0, -_size); painter->drawLine(0, 0, 0, -_size);
l = label(_range.x(), _range.y(), YTICKS); l = label(_range.x(), _range.y(), YTICKS);
int mtw = 0;
for (int i = 0; i < ((l.max - l.min) / l.d) + 1; i++) { for (int i = 0; i < ((l.max - l.min) / l.d) + 1; i++) {
val = l.min + i * l.d; val = l.min + i * l.d;
QString str = QString::number(val); QString str = QString::number(val);
@ -131,13 +143,14 @@ void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
painter->drawLine(TICK/2, -((_size/range) * (val - _range.x())), painter->drawLine(TICK/2, -((_size/range) * (val - _range.x())),
-TICK/2, -((_size/range) * (val - _range.x()))); -TICK/2, -((_size/range) * (val - _range.x())));
ts = fm.tightBoundingRect(str); ts = fm.tightBoundingRect(str);
mtw = qMax(ts.width(), mtw);
painter->drawText(-(ts.width() + PADDING + TICK/2), -((_size/range) painter->drawText(-(ts.width() + PADDING + TICK/2), -((_size/range)
* (val - _range.x())) + (ts.height()/2), str); * (val - _range.x())) + (ts.height()/2), str);
} }
painter->rotate(-90); painter->rotate(-90);
painter->drawText(_size/2 - ls.width()/2, -(ts.width() painter->drawText(_size/2 - ls.width()/2, -(mtw + 2*PADDING + TICK/2),
+ 2*PADDING + TICK/2), _label); _label);
painter->rotate(90); painter->rotate(90);
} }
@ -165,7 +178,18 @@ QSizeF AxisItem::margin() const
return QSizeF(es.width()/2, return QSizeF(es.width()/2,
ls.height() + es.height() - fm.descent() + TICK/2 + 2*PADDING); ls.height() + es.height() - fm.descent() + TICK/2 + 2*PADDING);
} else { } else {
return QSizeF(ls.height() -fm.descent() + es.width() + 2*PADDING int mtw = 0;
QRect ts;
qreal val;
for (int i = 0; i < ((l.max - l.min) / l.d) + 1; i++) {
val = l.min + i * l.d;
QString str = QString::number(val);
ts = fm.tightBoundingRect(str);
mtw = qMax(ts.width(), mtw);
}
return QSizeF(ls.height() -fm.descent() + mtw + 2*PADDING
+ TICK/2, es.height()/2 + fm.descent()); + TICK/2, es.height()/2 + fm.descent());
} }
} }