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 LineCursor information line for square plots

Browse Source
This commit is contained in:
Mark Watkins 2014-08-06 17:28:24 +10:00
parent 8d3a96a5a5
commit 4e9e44b9a5
6 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleepyhead/Graphs/gLineChart.cpp
View File

@ -222,7 +222,7 @@ QString gLineChart::getMetaString(qint64 time)
for (int i=0; i<m_codes.size(); ++i) { for (int i=0; i<m_codes.size(); ++i) {
ChannelID code = m_codes[i]; ChannelID code = m_codes[i];
if (m_day->channelHasData(code)) { if (m_day->channelHasData(code)) {
val = m_day->lookupValue(code, time); val = m_day->lookupValue(code, time, m_square_plot);
lasttext += " "+QString("%1: %2 %3").arg(schema::channel[code].label()).arg(val,0,'f',2).arg(schema::channel[code].units()); lasttext += " "+QString("%1: %2 %3").arg(schema::channel[code].label()).arg(val,0,'f',2).arg(schema::channel[code].units());
if (code == CPAP_IPAP) { if (code == CPAP_IPAP) {

3
sleepyhead/Graphs/gLineOverlay.cpp
View File

@ -253,10 +253,11 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
// col = QColor("gold"); // col = QColor("gold");
hover = true; hover = true;
painter.setPen(QPen(col,3));
} else { } else {
painter.setPen(QPen(col,1)); painter.setPen(QPen(col,1));
painter.drawLine(x1, top, x1, bottom);
} }
painter.drawLine(x1, top, x1, bottom);
if (xx < (3600000)) { if (xx < (3600000)) {
QString lab = QString("%1").arg(m_label); QString lab = QString("%1").arg(m_label);
GetTextExtent(lab, x, y); GetTextExtent(lab, x, y);

4
sleepyhead/SleepLib/day.cpp
View File

@ -70,7 +70,7 @@ EventDataType Day::countInsideSpan(ChannelID span, ChannelID code)
return count; return count;
} }
EventDataType Day::lookupValue(ChannelID code, qint64 time) EventDataType Day::lookupValue(ChannelID code, qint64 time, bool square)
{ {
QList<Session *>::iterator end = sessions.end(); QList<Session *>::iterator end = sessions.end();
for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) { for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) {
@ -78,7 +78,7 @@ EventDataType Day::lookupValue(ChannelID code, qint64 time)
if (sess.enabled()) { if (sess.enabled()) {
if ((time > sess.first()) && (time < sess.last())) { if ((time > sess.first()) && (time < sess.last())) {
return sess.SearchValue(code,time); return sess.SearchValue(code,time,square);
} }
} }
} }

2
sleepyhead/SleepLib/day.h
View File

@ -104,7 +104,7 @@ class Day
EventDataType timeBelowThreshold(ChannelID code, EventDataType threshold); EventDataType timeBelowThreshold(ChannelID code, EventDataType threshold);
//! \brief Returns the value for Channel code at a given time //! \brief Returns the value for Channel code at a given time
EventDataType lookupValue(ChannelID code, qint64 time); EventDataType lookupValue(ChannelID code, qint64 time, bool square);
//! \brief Returns the count of code events inside span flag event durations //! \brief Returns the count of code events inside span flag event durations
EventDataType countInsideSpan(ChannelID span, ChannelID code); EventDataType countInsideSpan(ChannelID span, ChannelID code);

13
sleepyhead/SleepLib/session.cpp
View File

@ -953,7 +953,7 @@ void Session::UpdateSummaries()
} }
} }
EventDataType Session::SearchValue(ChannelID code, qint64 time) EventDataType Session::SearchValue(ChannelID code, qint64 time, bool square)
{ {
qint64 t1, t2, start; qint64 t1, t2, start;
QHash<ChannelID, QVector<EventList *> >::iterator it; QHash<ChannelID, QVector<EventList *> >::iterator it;
@ -996,7 +996,15 @@ EventDataType Session::SearchValue(ChannelID code, qint64 time)
start = el->first(); start = el->first();
tptr = el->rawTime(); tptr = el->rawTime();
// TODO: square plots need fixing // TODO: square plots need fixing
if (square) {
for (int j = 0; j < cnt-1; ++j) {
tptr++;
t2 = start + *tptr;
if (t2 > time) {
return el->data(j);
}
}
} else {
for (int j = 0; j < cnt-1; ++j) { for (int j = 0; j < cnt-1; ++j) {
tptr++; tptr++;
t2 = start + *tptr; t2 = start + *tptr;
@ -1019,6 +1027,7 @@ EventDataType Session::SearchValue(ChannelID code, qint64 time)
} }
} }
} }
}
return 0; return 0;
} }

2
sleepyhead/SleepLib/session.h
View File

@ -65,7 +65,7 @@ class Session
inline bool isEmpty() { return (s_first == s_last); } inline bool isEmpty() { return (s_first == s_last); }
//! \brief Search for Event code happening at supplied time (ms since epoch) //! \brief Search for Event code happening at supplied time (ms since epoch)
EventDataType SearchValue(ChannelID code, qint64 time); EventDataType SearchValue(ChannelID code, qint64 time, bool square);
//! \brief Return the sessionID //! \brief Return the sessionID
inline const SessionID &session() { inline const SessionID &session() {