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

More tweaks to linechart overlay hovers

Browse Source
This commit is contained in:
Mark Watkins 2014-08-06 13:07:16 +10:00
parent d361a6398f
commit 81bbe323ef
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleepyhead/Graphs/gGraphView.cpp
View File

@ -514,7 +514,7 @@ void gGraphView::DrawTextQue(QPainter &painter)
painter.rotate(+q.angle); painter.rotate(+q.angle);
painter.translate(-xxx, -yyy); painter.translate(-xxx, -yyy);
} else { } else {
painter.drawPixmap(QRect(q.x - buf / 2, q.y - h + buf, w, h), pm); painter.drawPixmap(QRect(q.x - buf / 2 + 4, q.y - h + buf, w, h), pm);
} }
} else { } else {
// Just draw the fonts.. // Just draw the fonts..

2
sleepyhead/Graphs/gLineChart.cpp
View File

@ -172,7 +172,7 @@ skipcheck:
if (chan->type() == schema::FLAG) { if (chan->type() == schema::FLAG) {
lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Bar); lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Bar);
} else if (chan->type() == schema::MINOR_FLAG) { } else if (chan->type() == schema::MINOR_FLAG) {
lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Dot); lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Bar);
} else if (chan->type() == schema::SPAN) { } else if (chan->type() == schema::SPAN) {
lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Span); lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Span);
} }

8
sleepyhead/Graphs/gLineOverlay.cpp
View File

@ -50,7 +50,7 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
if (xx <= 0) { return; } if (xx <= 0) { return; }
float x1, x2; double x1, x2;
int x, y; int x, y;
@ -261,7 +261,7 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
} else { } else {
if (!m_blockhover && QRect(x1-d1-2, topp, d1+6, height).contains(mouse)) { if (!m_blockhover && QRect(x1-2, topp, 6, height).contains(mouse)) {
if (!m_hover) { if (!m_hover) {
m_hover = true; m_hover = true;
@ -271,8 +271,10 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
painter.setPen(QPen(Qt::gray,1)); painter.setPen(QPen(Qt::gray,1));
painter.drawRect(x1 - (x / 2) - x, start_py + 14 + (3 * w.printScaleY()), x+4,y+4); painter.drawRect(x1 - (x / 2) - x, start_py + 14 + (3 * w.printScaleY()), x+4,y+4);
w.renderText(lab, x1 - (x / 2)+2 - x, start_py + 14 + y + (3 * w.printScaleY()),0); w.renderText(lab, x1 - (x / 2)+2 - x, start_py + 14 + y + (3 * w.printScaleY()),0);
x1-=1; //x1-=1;
painter.setPen(QPen(m_flag_color,4)); painter.setPen(QPen(m_flag_color,4));
} else {
painter.setPen(QPen(m_flag_color,1));
} }
} else { } else {
painter.setPen(QPen(m_flag_color,1)); painter.setPen(QPen(m_flag_color,1));