chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix graph legends on low dpi screens

Browse Source
This commit is contained in:
Mark Watkins 2014-08-29 15:54:03 +10:00
parent a91a11a7b9
commit b98cdffad0
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sleepyhead/Graphs/gLineChart.cpp
View File

@ -1019,7 +1019,10 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
painter.setPen(Qt::black); painter.setPen(Qt::black);
painter.drawText(rec, Qt::AlignBottom | Qt::AlignRight, text); painter.drawText(rec, Qt::AlignBottom | Qt::AlignRight, text);
painter.setPen(QPen(chan.defaultColor(), 1 * ratioY)); float ps = 1 * ratioY;
ps = qMax(ps, 1.0f);
painter.setPen(QPen(chan.defaultColor(), ps));
int linewidth = (10 * ratioX); int linewidth = (10 * ratioX);
int yp = rec.top()+(rec.height()/2); int yp = rec.top()+(rec.height()/2);
painter.drawLine(rec.left()-linewidth, yp , rec.left()-(2 * ratioX), yp); painter.drawLine(rec.left()-linewidth, yp , rec.left()-(2 * ratioX), yp);
@ -1051,7 +1054,9 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
QColor color = chan.calc[dot.type].color; QColor color = chan.calc[dot.type].color;
color.setAlpha(200); color.setAlpha(200);
painter.setPen(QPen(QBrush(color),1 * ratioY,Qt::DotLine)); float ps = 1 * ratioY;
ps = qMax(ps, 1.0f);
painter.setPen(QPen(QBrush(color), ps,Qt::DotLine));
int yp = rec.top()+(rec.height()/2); int yp = rec.top()+(rec.height()/2);
painter.drawLine(rec.left()-linewidth, yp , rec.left()-(2 * ratioX), yp); painter.drawLine(rec.left()-linewidth, yp , rec.left()-(2 * ratioX), yp);

11
sleepyhead/Graphs/gXAxis.cpp
View File

@ -53,7 +53,11 @@ int gXAxis::minimumHeight()
{ {
QFontMetrics fm(*defaultfont); QFontMetrics fm(*defaultfont);
int h = fm.height(); int h = fm.height();
#if defined(Q_OS_MAC)
return 9+h; return 9+h;
#else
return 11+h;
#endif
} }
void gXAxis::paint(QPainter &painter, gGraph &w, const QRegion &region) void gXAxis::paint(QPainter &painter, gGraph &w, const QRegion &region)
@ -243,9 +247,12 @@ void gXAxis::paint(QPainter &painter, gGraph &w, const QRegion &region)
//py+=usepixmap ? 20 : left; //py+=usepixmap ? 20 : left;
int mintop = top + 4.0 * (float(y) / 10.0); int mintop = top + 3.0 * (float(y) / 10.0);
int majtop = top + 6.0 * (float(y) / 10.0); int majtop = top + 6.0 * (float(y) / 10.0);
int texttop = majtop + y + 2; // 18*w.printScaleY(); int texttop = majtop + y; // 18*w.printScaleY();
#if defined (Q_OS_MAC)
texttop += 2
#endif
// Fill in the minor tick marks up to the first major alignment tick // Fill in the minor tick marks up to the first major alignment tick