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 regression in da60a5a and underlying bug.

Browse Source 
Note that operator[] on a non-const QHash inserts a default-constructed
item in the hash if the key doesn't already exist.
This commit is contained in:
sawinglogz 2020-05-23 21:51:43 -04:00
parent 47ea2bbf91
commit 4fa353a263
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oscar/Graphs/gLineChart.cpp
View File

@ -116,7 +116,9 @@ void gLineChart::SetDay(Day *d)
Session *sess = d->sessions[i]; Session *sess = d->sessions[i];
if (!sess->enabled()) continue; if (!sess->enabled()) continue;
CPAPMode mode = (CPAPMode)sess->settings[CPAP_Mode].toInt(); // Don't use operator[] here or else it will insert a default-constructed entry
// into sess->settings if it's not present.
CPAPMode mode = (CPAPMode)sess->settings.value(CPAP_Mode).toInt();
if (mode >= MODE_BILEVEL_FIXED) { if (mode >= MODE_BILEVEL_FIXED) {
m_enabled[CPAP_Pressure] = true; // probably a confusion of Pressure and IPAP somewhere m_enabled[CPAP_Pressure] = true; // probably a confusion of Pressure and IPAP somewhere

9
oscar/SleepLib/day.cpp
View File

@ -304,10 +304,17 @@ EventDataType Day::settings_wavg(ChannelID code)
double s0 = 0, s1 = 0, s2 = 0, tmp; double s0 = 0, s1 = 0, s2 = 0, tmp;
for (auto & sess : sessions) { for (auto & sess : sessions) {
if (sess->enabled() && sess->type() == MT_CPAP) { if (sess->enabled()) {
auto set = sess->settings.find(code); auto set = sess->settings.find(code);
if (set != sess->settings.end()) { if (set != sess->settings.end()) {
if (code == CPAP_Mode && sess->type() != MT_CPAP) {
// There used to be a bug in gLineChart::SetDay that inserted a CPAP_Mode
// setting in any session that didn't already have one. That shouldn't
// happen any more, but leave this diagnostic message here in case it does.
qWarning() << sess->session() << "non-CPAP session with CPAP mode setting";
continue;
}
s0 = sess->hours(); s0 = sess->hours();
tmp = set.value().toDouble(); tmp = set.value().toDouble();
s1 += tmp * s0; s1 += tmp * s0;