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

Fix double printing of flow waveform when there's more oximetry than CPAP.

Browse Source
This commit is contained in:
sawinglogz 2020-07-18 13:17:53 -04:00
parent 65b4440428
commit 5765da4096
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
oscar/reports.cpp
View File

@ -412,37 +412,26 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
if (!g->visible()) { continue; }
if (cpap && oxi) {
st = qMin(day->first(MT_CPAP), day->first(MT_OXIMETER));
et = qMax(day->last(MT_CPAP), day->last(MT_OXIMETER));
} else if (cpap) {
st = day->first(MT_CPAP);
et = day->last(MT_CPAP);
} else if (oxi) {
st = day->first(MT_OXIMETER);
et = day->last(MT_OXIMETER);
}
QString label = "";
if (!g->isSnapshot() && (g->name() == schema::channel[CPAP_FlowRate].code())) {
if (!((qAbs(g->min_x - st) < 5000) && (qAbs(g->max_x - et) < 60000))) {
qDebug() << "Current Selection difference" << (g->min_x - st) << " bleh " << (g->max_x - et);
st = day->first();
et = day->last();
// If the current selection is more than a minute smaller than the whole night:
if ((et - st) - (g->max_x - g->min_x) > 60000) {
// First draw the flow waveform in the context of the entire day (matching the flags chart)
start.push_back(st);
end.push_back(et);
graphs.push_back(g);
labels.push_back(QObject::tr("Entire Day's Flow Waveform"));
// And add a label to the selected flow graph below
label = QObject::tr("Current Selection");
}
}
start.push_back(g->min_x);
end.push_back(g->max_x);
graphs.push_back(g);
labels.push_back(QObject::tr("Current Selection"));
} else {
start.push_back(g->min_x);
end.push_back(g->max_x);
graphs.push_back(g);
labels.push_back("");
}
labels.push_back(label);
}
} else {
const QString EntireDay = QObject::tr("Entire Day");