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

CMS50F/i stuff, summary only colors in overview, sesslist cleanup, empty day cleanup

Browse Source
This commit is contained in:
Mark Watkins 2014-08-21 15:46:14 +10:00
parent 86c1cf88a2
commit 06ce5d686c
6 changed files with 67 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sleepyhead/Graphs/gSummaryChart.cpp
View File

@ -588,6 +588,8 @@ void SummaryChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
painter.setClipRect(left, top, width, height); painter.setClipRect(left, top, width, height);
painter.setClipping(true); painter.setClipping(true);
QColor summaryColor = QColor("dark gray");
for (qint64 Q = minx; Q <= maxx + ms_per_day; Q += ms_per_day) { for (qint64 Q = minx; Q <= maxx + ms_per_day; Q += ms_per_day) {
zd = Q / ms_per_day; zd = Q / ms_per_day;
d = m_values.find(zd); d = m_values.find(zd);
@ -598,6 +600,8 @@ void SummaryChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
if (d != m_values.end()) { if (d != m_values.end()) {
day = m_days[zd]; day = m_days[zd];
bool summary_only = day->summaryOnly();
if (!m_hours.contains(zd)) { if (!m_hours.contains(zd)) {
goto jumpnext; goto jumpnext;
@ -637,6 +641,9 @@ void SummaryChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
QColor col = m_colors[0]; QColor col = m_colors[0];
//if (hours<compliance_hours) col=QColor("#f03030"); //if (hours<compliance_hours) col=QColor("#f03030");
if (summary_only) {
col = summaryColor;
}
if (zd == hl_day) { if (zd == hl_day) {
col = QColor("gold"); col = QColor("gold");
} }
@ -730,6 +737,8 @@ void SummaryChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
if (tmp < compliance_hours) { if (tmp < compliance_hours) {
col = QColor("#f04040"); col = QColor("#f04040");
incompliant++; incompliant++;
} else if (summary_only) {
col = summaryColor;
} }
} }
@ -1113,6 +1122,7 @@ bool SummaryChart::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
day = m_days[zd]; day = m_days[zd];
if ((d != m_values.end()) && (day != nullptr)) { if ((d != m_values.end()) && (day != nullptr)) {
bool summary_only = day->summaryOnly();
QString z = dt.toString(Qt::SystemLocaleShortDate); QString z = dt.toString(Qt::SystemLocaleShortDate);
@ -1256,11 +1266,14 @@ bool SummaryChart::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
} }
} }
if (summary_only) {
z += "\r\n"+QObject::tr("(Summary Only)");
}
graph->ToolTip(z, x, y - 15); graph->ToolTip(z, x, y - 15);
return false; return false;
} else { } else {
QString z = dt.toString(Qt::SystemLocaleShortDate) + "\r\nNo Data"; QString z = dt.toString(Qt::SystemLocaleShortDate) + "\r\n"+QObject::tr("No Data");
graph->ToolTip(z, x, y - 15); graph->ToolTip(z, x, y - 15);
return false; return false;
} }

4
sleepyhead/SleepLib/day.cpp
View File

@ -54,7 +54,7 @@ Machine *Day::machine(MachineType type)
return nullptr; return nullptr;
} }
QList<Session *> Day::getSessions(MachineType type) QList<Session *> Day::getSessions(MachineType type, bool ignore_enabled)
{ {
QList<Session *>::iterator it; QList<Session *>::iterator it;
QList<Session *>::iterator sess_end = sessions.end(); QList<Session *>::iterator sess_end = sessions.end();
@ -62,7 +62,7 @@ QList<Session *> Day::getSessions(MachineType type)
QList<Session *> newlist; QList<Session *> newlist;
for (it = sessions.begin(); it != sess_end; ++it) { for (it = sessions.begin(); it != sess_end; ++it) {
if (!(*it)->enabled()) if (!ignore_enabled && !(*it)->enabled())
continue; continue;
if ((*it)->machine()->type() == type) if ((*it)->machine()->type() == type)

2
sleepyhead/SleepLib/day.h
View File

@ -41,7 +41,7 @@ class Day
Machine *machine(MachineType type); Machine *machine(MachineType type);
//! \brief Returns a list of sessions for the specified machine type //! \brief Returns a list of sessions for the specified machine type
QList<Session *> getSessions(MachineType type); QList<Session *> getSessions(MachineType type, bool ignore_enabled = false);
//! \brief Add Session to this Day object (called during Load) //! \brief Add Session to this Day object (called during Load)
void addSession(Session *s); void addSession(Session *s);

13
sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
View File

@ -460,12 +460,12 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
buf[i] = (buf[i] & 0x7f) | (msb & 0x01 ? 0x80 : 0); buf[i] = (buf[i] & 0x7f) | (msb & 0x01 ? 0x80 : 0);
} }
quint16 pi = buffer.data()[idx+4] | buffer.data()[idx+5] << 8; qint16 pi = buffer.data()[idx+4] | buffer.data()[idx+5] << 8;
pulse = buf[3]; pulse = buf[3];
quint8 spo2 = buf[2]; quint8 spo2 = buf[2];
oxirec->append(((spo2 == 0) || (pulse == 0) || (pi == 0xfff6)) ? OxiRecord(0,0,0) : OxiRecord(pulse, spo2, pi)); oxirec->append(((spo2 == 0) || (pulse == 0) || (pi>=0)) ? OxiRecord(0,0,0) : OxiRecord(pulse, spo2, pi));
} else if (res == 0x0f) { } else if (res == 0x0f) {
// f,80,de,c2,de,c2,de,c2 cms50F data... // f,80,de,c2,de,c2,de,c2 cms50F data...
@ -473,11 +473,14 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
buffer[idx+i] = (buffer[idx+i] & 0x7f) | (msb & 0x01 ? 0x80 : 0); buffer[idx+i] = (buffer[idx+i] & 0x7f) | (msb & 0x01 ? 0x80 : 0);
} }
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(buffer.at(idx+3), buffer.at(idx+2))); pulse = buffer.at(idx+3);
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(pulse, buffer.at(idx+2)));
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(buffer.at(idx+5), buffer.at(idx+4))); pulse = buffer.at(idx+5);
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(pulse, buffer.at(idx+4)));
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(buffer.at(idx+7), buffer.at(idx+6))); pulse = buffer.at(idx+7);
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(pulse, buffer.at(idx+6)));
} }
QStringList str; QStringList str;

2
sleepyhead/SleepLib/serialoximeter.h
View File

@ -21,7 +21,7 @@ struct OxiRecord
{ {
quint8 pulse; quint8 pulse;
quint8 spo2; quint8 spo2;
quint16 perf; qint16 perf;
OxiRecord():pulse(0), spo2(0),perf(0) {} OxiRecord():pulse(0), spo2(0),perf(0) {}
OxiRecord(quint8 p, quint8 s): pulse(p), spo2(s) {} OxiRecord(quint8 p, quint8 s): pulse(p), spo2(s) {}

66
sleepyhead/daily.cpp
View File

@ -957,13 +957,13 @@ QString Daily::getSessionInformation(Day * day)
} }
html+="</i></td></tr>\n"; html+="</i></td></tr>\n";
html+=QString("<tr>" html+=QString("<tr>"
"<th>"+STR_TR_On+"</th>" "<td>"+STR_TR_On+"</td>"
"<th>"+STR_TR_Date+"</th>" "<td>"+STR_TR_Date+"</td>"
"<th>"+STR_TR_Start+"</th>" "<td>"+STR_TR_Start+"</td>"
"<th>"+STR_TR_End+"</th>" "<td>"+STR_TR_End+"</td>"
"<th>"+tr("Duration")+"</th></tr>"); "<td>"+tr("Duration")+"</td></tr>");
QList<Session *> sesslist = day->getSessions(mi.key()); QList<Session *> sesslist = day->getSessions(mi.key(), true);
for (QList<Session *>::iterator s=sesslist.begin(); s != sesslist.end(); ++s) { for (QList<Session *>::iterator s=sesslist.begin(); s != sesslist.end(); ++s) {
if (((*s)->machine()->type() == MT_CPAP) && if (((*s)->machine()->type() == MT_CPAP) &&
@ -982,16 +982,14 @@ QString Daily::getSessionInformation(Day * day)
sess->settings[SESSION_ENABLED]=true; sess->settings[SESSION_ENABLED]=true;
} }
bool b=sess->settings[SESSION_ENABLED].toBool(); bool b=sess->settings[SESSION_ENABLED].toBool();
html+=QString("<tr class='datarow'><td colspan=5><table>" html+=QString("<tr class='datarow2'><td colspan=5 align=center>%2</td></tr>"
"<tr><td colspan=5 align=center>%2</td></tr>" "<tr class='datarow2'>"
"<tr>"
"<td width=26><a href='toggle"+type+"session=%1'>" "<td width=26><a href='toggle"+type+"session=%1'>"
"<img src='qrc:/icons/session-%4.png' width=24px></a></td>" "<img src='qrc:/icons/session-%4.png' width=24px></a></td>"
"<td align=center>%5</td>" "<td align=left>%5</td>"
"<td align=center>%6</td>" "<td align=left>%6</td>"
"<td align=center>%7</td>" "<td align=left>%7</td>"
"<td align=left>%3</td></tr>" "<td align=left>%3</td></tr>"
"</table></td></tr>"
) )
.arg((*s)->session()) .arg((*s)->session())
.arg(QObject::tr("%1 Session #%2").arg((*s)->machine()->loaderName()).arg((*s)->session(),8,10,QChar('0'))) .arg(QObject::tr("%1 Session #%2").arg((*s)->machine()->loaderName()).arg((*s)->session(),8,10,QChar('0')))
@ -1420,6 +1418,20 @@ void Daily::Load(QDate date)
"tr.datarow:nth-child(even) {" "tr.datarow:nth-child(even) {"
"background-color: #f8f8f8;" "background-color: #f8f8f8;"
"}" "}"
"tr.datarow2:nth-child(4n-1) {"
"background-color: #f8f8f8;"
"}"
"tr.datarow2:nth-child(4n+0) {"
"background-color: #f8f8f8;"
"}"
"table.curved {"
"border: 1px solid gray;"
"border-radius:10px;"
"-moz-border-radius:10px;"
"-webkit-border-radius:10px;"
"page-break-after:auto;"
"-fs-table-paginate: paginate;"
"}"
"</style>" "</style>"
"<link rel='stylesheet' type='text/css' href='qrc:/docs/tooltips.css' />" "<link rel='stylesheet' type='text/css' href='qrc:/docs/tooltips.css' />"
@ -1596,27 +1608,28 @@ void Daily::Load(QDate date)
} }
html+="</table>\n"; html+="</table>\n";
html+="<hr/>\n";
} else { } else {
html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n"; html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
if (!isBrick) { if (!isBrick) {
html+="<tr><td colspan='5'>&nbsp;</td></tr>\n"; html+="<tr><td colspan='5'>&nbsp;</td></tr>\n";
if (day->size()>0) { if (day->size()>0) {
html+="<tr><td colspan='5' align='center'><b><h2>"+tr("Sessions all off!")+"</h2></b></td></tr>"; html+="<tr><td colspan=5 align='center'><font size='+3'>"+tr("Sessions all off!")+"</font></td></tr>";
html+="<tr><td colspan='5' align='center'><i>"+tr("Sessions exist for this day but are switched off.")+"</i></td></tr>\n"; html+="<tr><td align=center><img src='qrc:/docs/sheep.png' width=120px></td></tr>";
html+="<tr bgcolor='#89abcd'><td colspan=5 align='center'><i><font color=white size=+1>"+tr("Sessions exist for this day but are switched off.")+"</font></i></td></tr>\n";
} else { } else {
html+="<tr><td colspan='5' align='center'><b><h2>"+tr("Impossibly short session")+"</h2></b></td></tr>"; html+="<tr><td colspan=5 align='center'><b><h2>"+tr("Impossibly short session")+"</h2></b></td></tr>";
html+="<tr><td colspan='5' align='center'><i>"+tr("Zero hours??")+"</i></td></tr>\n"; html+="<tr><td colspan=5 align='center'><i>"+tr("Zero hours??")+"</i></td></tr>\n";
} }
} else { // machine is a brick } else { // machine is a brick
html+="<tr><td colspan='5' align='center'><b><h2>"+tr("BRICK :(")+"</h2></b></td></tr>"; html+="<tr><td colspan=5 align='center'><b><h2>"+tr("BRICK :(")+"</h2></b></td></tr>";
html+="<tr><td colspan='5' align='center'><i>"+tr("Sorry, your machine only provides compliance data.")+"</i></td></tr>\n"; html+="<tr><td colspan=5 align='center'><i>"+tr("Sorry, your machine only provides compliance data.")+"</i></td></tr>\n";
html+="<tr><td colspan='5' align='center'><i>"+tr("Complain to your Equipment Provider!")+"</i></td></tr>\n"; html+="<tr><td colspan=5 align='center'><i>"+tr("Complain to your Equipment Provider!")+"</i></td></tr>\n";
} }
html+="<tr><td colspan='5'>&nbsp;</td></tr>\n"; html+="<tr><td colspan='5'>&nbsp;</td></tr>\n";
html+="</table>\n"; html+="</table>\n";
} }
html+="<hr/>\n";
} // if (!CPAP) } // if (!CPAP)
else html+=getSleepTime(day); else html+=getSleepTime(day);
@ -1628,11 +1641,14 @@ void Daily::Load(QDate date)
} else { } else {
if (cpap && day->hours(MT_CPAP)<0.0000001) { if (cpap && day->hours(MT_CPAP)<0.0000001) {
} else { } else {
html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n"; html+="<table cellspacing=0 cellpadding=0 border=0 height=100% width=100%>";
html+="<tr><td colspan=5 align=center><i>"+tr("No data available")+"</i></td></tr>\n"; html+="<tr height=25%><td align=center></td></tr>";
html+="<tr><td colspan=5>&nbsp;</td></tr>\n"; html+="<tr><td align=center><font size='+3'>"+tr("\"Nothing's here!\"")+"</font></td></tr>";
html+="<tr><td align=center><img src='qrc:/docs/sheep.png' width=120px></td></tr>";
html+="<tr height=5px><td align=center></td></tr>";
html+="<tr bgcolor='#89abcd'><td align=center><i><font size=+1 color=white>"+tr("Bob is bored with this days lack of data.")+"</font></i></td></tr>";
html+="<tr height=25%><td align=center></td></tr>";
html+="</table>\n"; html+="</table>\n";
html+="<hr/>\n";
} }
} }