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

Fix minutes-at-pressure graph for PRS1 CPAP/BiPAP devices.

Browse Source 
Also fix a drawing bug when there were spurious 0 pressures reported.
This commit is contained in:
sawinglogz 2020-04-10 16:49:23 -04:00
parent 5e2b51c6b9
commit 3306c00b26
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
oscar/Graphs/MinutesAtPressure.cpp
View File

@ -50,23 +50,23 @@ void MinutesAtPressure::SetDay(Day *day)
Machine * cpap = nullptr; Machine * cpap = nullptr;
if (day) cpap = day->machine(MT_CPAP); if (day) cpap = day->machine(MT_CPAP);
if (cpap) { if (cpap) {
EventDataType minpressure = 20; EventDataType minpressure = 30;
EventDataType maxpressure = 0; EventDataType maxpressure = 0;
// look at overall pressure ranges and find the max // look at overall pressure ranges across all days for this machine and find the min and max
QList<ChannelID> channels = { CPAP_Pressure, CPAP_EPAP, CPAP_IPAP, CPAP_PressureSet, CPAP_EPAPSet, CPAP_IPAPSet };
for (const auto d : cpap->day) { for (const auto d : cpap->day) {
for (const auto sess : d->sessions) { for (const auto sess : d->sessions) {
if (sess->channelExists(CPAP_Pressure)) { //qDebug() << sess->session();
minpressure = qMin(sess->Min(CPAP_Pressure), minpressure); for (auto ch : channels) {
maxpressure = qMax(sess->Max(CPAP_Pressure), maxpressure); if (sess->channelExists(ch)) {
} // Filter out 0 pressures.
if (sess->channelExists(CPAP_EPAP)) { if (sess->Min(ch) > 0) {
minpressure = qMin(sess->Min(CPAP_EPAP), minpressure); minpressure = qMin(sess->Min(ch), minpressure);
maxpressure = qMax(sess->Max(CPAP_EPAP), maxpressure); }
} maxpressure = qMax(sess->Max(ch), maxpressure);
if (sess->channelExists(CPAP_IPAP)) { //qDebug() << ch << sess->Min(ch) << sess->Max(ch);
minpressure = qMin(sess->Min(CPAP_IPAP), minpressure); }
maxpressure = qMax(sess->Max(CPAP_IPAP), maxpressure);
} }
} }
} }
@ -96,7 +96,7 @@ void MinutesAtPressure::SetDay(Day *day)
m_recalculating = false; m_recalculating = false;
m_lastminx = 0; m_lastminx = 0;
m_lastmaxx = 0; m_lastmaxx = 0;
m_empty = !m_day || !(m_day->channelExists(CPAP_Pressure) || m_day->channelExists(CPAP_EPAP)); m_empty = !m_day || !(m_day->channelExists(CPAP_Pressure) || m_day->channelExists(CPAP_EPAP) || m_day->channelExists(CPAP_PressureSet) || m_day->channelExists(CPAP_EPAPSet));
} }
int MinutesAtPressure::minimumHeight() int MinutesAtPressure::minimumHeight()
@ -312,7 +312,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
label = QObject::tr("Peak %1").arg(qMax(ipap.peaktime, epap.peaktime)/60.0); label = QObject::tr("Peak %1").arg(qMax(ipap.peaktime, epap.peaktime)/60.0);
graph.renderText(label, left, top+5 ); graph.renderText(label, left, top+5 );
xstep /= 5.0; xstep /= 5.0; // each iteration below increments xp 5 times.
painter.setPen(QPen(ichan.defaultColor(), lineThickness)); painter.setPen(QPen(ichan.defaultColor(), lineThickness));
@ -1043,8 +1043,22 @@ void RecalcMAP::run()
// qDebug() << chan.fullname(); // qDebug() << chan.fullname();
// } // }
ChannelID ipapcode = (day->channelExists(CPAP_IPAP)) ? CPAP_IPAP : CPAP_Pressure; QList<ChannelID> ipapChannels = { CPAP_IPAPSet, CPAP_IPAP, CPAP_PressureSet }; // preferred, if present
ChannelID epapcode = (day->channelExists(CPAP_EPAP)) ? CPAP_EPAP : 0; ChannelID ipapcode = CPAP_Pressure; // default
for (auto & ch : ipapChannels) {
if (day->channelExists(ch)) {
ipapcode = ch;
break;
}
}
QList<ChannelID> epapChannels = { CPAP_EPAPSet, CPAP_EPAP }; // preferred, if present
ChannelID epapcode = NoChannel; // default
for (auto & ch : epapChannels) {
if (day->channelExists(ch)) {
epapcode = ch;
break;
}
}
qint64 minx, maxx; qint64 minx, maxx;
map->m_graph->graphView()->GetXBounds(minx, maxx); map->m_graph->graphView()->GetXBounds(minx, maxx);