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 CPAP hours and AHI calculations

Browse Source 
Daily page: total hours was elapsed time of all machines, including large blocks that are not CPAP.  Now just MT_CPAP time.
    Welcome page: Same problem with total hours reporting, and AHI was calculated as events/total hours instead of events/CPAP hours.
    Statistics page: Same problems as on Welcome page -- total hours and index calculations.  Changed to using total CPAP hours.
This commit is contained in:
Guy Scharf 2020-07-24 11:29:19 -07:00
parent eaf4ab69cf
commit 5cefc90a16
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Htmldocs/release_notes.html
View File

@ -27,6 +27,8 @@
<li>[fix] Improve language in various error messages.</li>
<li>[fix] Date at right end of Overview page reflects actual data, not any future notes.</li>
<li>[fix] Limit SD card scan to mounted vfat volumes.</li>
<li>[fix] Correct Statistics page calculations when CPAP and Oximetry use do not overlap.</li>
<li>[fix] Hours used on Welcome and Daily page are now hours of CPAP machine use.</li>
</ul>
<p>
<b>Changes and fixes in OSCAR v1.1.1</b>

2
oscar/SleepLib/profiles.cpp
View File

@ -1342,7 +1342,7 @@ EventDataType Profile::calcHours(MachineType mt, QDate start, QDate end)
Day *day = GetGoodDay(date, mt);
if (day) {
val += day->hours();
val += day->hours(mt);
}
date = date.addDays(1);

2
oscar/daily.cpp
View File

@ -1431,7 +1431,7 @@ QString Daily::getSleepTime(Day * day)
html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
html+="<tr><td align='center'><b>"+STR_TR_Date+"</b></td><td align='center'><b>"+tr("Start")+"</b></td><td align='center'><b>"+tr("End")+"</b></td><td align='center'><b>"+STR_UNIT_Hours+"</b></td></tr>";
int tt=qint64(day->total_time())/1000L;
int tt=qint64(day->total_time(MT_CPAP))/1000L;
QDateTime date=QDateTime::fromTime_t(day->first()/1000L);
QDateTime date2=QDateTime::fromTime_t(day->last()/1000L);

2
oscar/welcome.cpp
View File

@ -183,7 +183,7 @@ QString Welcome::GenerateCPAPHTML()
html += tr("was %1 (on %2)").arg(daystring).arg(date.toString(Qt::SystemLocaleLongDate)) + "<br/>";
EventDataType hours = day->hours();
EventDataType hours = day->hours(MT_CPAP);
html += "<br/>";
int seconds = int(hours * 3600.0) % 60;