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

Merge branch 'qpainter' of ssh://git.code.sf.net/p/sleepyhead/code into qpainter

Browse Source
This commit is contained in:
Mark Watkins 2014-05-08 21:18:46 +10:00
commit 9a40b54f63
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sleepyhead/Graphs/gLineChart.cpp
View File

@ -253,13 +253,13 @@ void gLineChart::paint(QPainter &painter, gGraph &w, int left, int top, int widt
for (int gi = 0; gi < m_codes.size(); gi++) {
ChannelID code = m_codes[gi];
painter.setPen(QPen(m_colors[gi],1.5));
lines.clear();
codepoints = 0;
for (int svi = 0; svi < m_day->size(); svi++) {
int daysize = m_day->size();
for (int svi = 0; svi < daysize; svi++) {
Session *sess = (*m_day)[svi];
if (!sess) {
@ -274,9 +274,10 @@ void gLineChart::paint(QPainter &painter, gGraph &w, int left, int top, int widt
schema::Channel ch = schema::channel[code];
bool fndbetter = false;
for (QList<schema::Channel *>::iterator l = ch.m_links.begin(); l != ch.m_links.end(); l++) {
schema::Channel *c = *l;
ci = (*m_day)[svi]->eventlist.find(c->id());
QList<schema::Channel *>::iterator mlend=ch.m_links.end();
for (QList<schema::Channel *>::iterator l = ch.m_links.begin(); l != mlend; l++) {
schema::Channel &c = *(*l);
ci = (*m_day)[svi]->eventlist.find(c.id());
if (ci != (*m_day)[svi]->eventlist.end()) {
fndbetter = true;
@ -305,7 +306,8 @@ void gLineChart::paint(QPainter &painter, gGraph &w, int left, int top, int widt
// Max number of samples taken from samples per pixel for better min/max values
const int num_averages = 20;
for (int n = 0; n < evec.size(); n++) { // for each segment
int evecsize=evec.size();
for (int n = 0; n < evecsize; ++n) { // for each segment
EventList &el = *evec[n];
accel = (el.type() == EVL_Waveform); // Turn on acceleration if this is a waveform.
@ -664,6 +666,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, int left, int top, int widt
if (done) { break; }
}
}
painter.setPen(QPen(m_colors[gi],1.5));
painter.drawLines(lines);
////////////////////////////////////////////////////////////////////