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

Fix daily AHI tooltip description, dont show time in ramp when not available

Browse Source
This commit is contained in:
Mark Watkins 2014-07-29 03:10:26 +10:00
parent 81add30486
commit 38f6938561
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleepyhead/build_number.h
View File

@ -1 +1 @@
const int build_number = 5; const int build_number = 6;

15
sleepyhead/daily.cpp
View File

@ -1025,22 +1025,21 @@ QString Daily::getCPAPInformation(Day * cpap)
html="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n"; html="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
html+="<tr><td colspan=4 align=center><a class=info2 href='#'>"+info.model+"<span>"; html+="<tr><td align=center><a class=info2 href='#'>"+info.model+"<span>";
QString tooltip=(info.brand+"\n"+info.series+" "+info.modelnumber+"\n"+info.serial); QString tooltip=(info.brand+"\n"+info.series+" "+info.modelnumber+"\n"+info.serial);
tooltip=tooltip.replace(" ","&nbsp;"); tooltip=tooltip.replace(" ","&nbsp;");
html+=tooltip; html+=tooltip;
html+="</span></td></tr>\n"; html+="</span></td></tr>\n";
//CPAPMode mode=(CPAPMode)(int)cpap->settings_max(CPAP_Mode); //CPAPMode mode=(CPAPMode)(int)cpap->settings_max(CPAP_Mode);
html+="<tr><td colspan=4 align=center>"; html+="<tr><td align=center>";
html+=tr("PAP Mode: %1<br/>").arg(cpap->getCPAPMode()); html+=tr("PAP Mode: %1<br/>").arg(cpap->getCPAPMode());
html+= cpap->getPressureSettings(); html+= cpap->getPressureSettings();
html+="</td></tr>\n"; html+="</td></tr>\n";
if ((cpap && cpap->settingExists(CPAP_BrokenSummary))) { if ((cpap && cpap->settingExists(CPAP_BrokenSummary))) {
html+="<tr><td colspan=4>&nbsp;</td></tr>\n"; html+="<tr><td>&nbsp;</td></tr>\n";
html+=QString("<tr><td colspan=4 align=center><i>%1</i></td></tr>").arg("<b>"+STR_MessageBox_PleaseNote+":</b> "+ tr("This day has missing pressure, mode and settings data.")); html+=QString("<tr><td colspan=2><i>%1</i></td></tr>").arg("<b>"+STR_MessageBox_PleaseNote+":</b> "+ tr("This day has missing pressure, mode and settings data."));
} }
html+="</table>\n"; html+="</table>\n";
@ -1169,13 +1168,13 @@ QString Daily::getStatisticsInfo(Day * cpap,Day * oxi,Day *pos)
if (cpap) { if (cpap) {
int l = cpap->sum(CPAP_Ramp); int l = cpap->sum(CPAP_Ramp);
// if (l>0) { if (l>0) {
int h = l / 3600; int h = l / 3600;
int m = (l / 60) % 60; int m = (l / 60) % 60;
int s = l % 60; int s = l % 60;
html+="<tr><td colspan=3 align='left' bgcolor='white'><b>"+tr("Time spent in ramp")+ html+="<tr><td colspan=3 align='left' bgcolor='white'><b>"+tr("Time spent in ramp")+
QString("</b></td><td colspan=2 bgcolor='white'>%1:%2:%3</td></tr>").arg(h, 2, 10, QChar('0')).arg(m, 2, 10, QChar('0')).arg(s, 2, 10, QChar('0')); QString("</b></td><td colspan=2 bgcolor='white'>%1:%2:%3</td></tr>").arg(h, 2, 10, QChar('0')).arg(m, 2, 10, QChar('0')).arg(s, 2, 10, QChar('0'));
// } }
} }
@ -1334,7 +1333,7 @@ void Daily::Load(QDate date)
} }
html+="<tr>"; html+="<tr>";
html+=QString("<td colspan=4 bgcolor='%1' align=center><a class=info2 href='#'><font size=+4 color='%2'><b>%3</b></font><span>%4</span></a> &nbsp; <font size=+4 color='%2'><b>%5</b></font></td>\n") html+=QString("<td colspan=4 bgcolor='%1' align=center><a class=info2 href='#'><font size=+4 color='%2'><b>%3</b></font><span>%4</span></a> &nbsp; <font size=+4 color='%2'><b>%5</b></font></td>\n")
.arg("#F88017").arg(COLOR_Text.name()).arg(ahiname).arg(schema::channel[ahichan].description()).arg(ahi,0,'f',2); .arg("#F88017").arg(COLOR_Text.name()).arg(ahiname).arg(schema::channel[ahichan].fullname()).arg(ahi,0,'f',2);
html+="</tr>\n"; html+="</tr>\n";
html+="</table>\n"; html+="</table>\n";
html+=getCPAPInformation(cpap); html+=getCPAPInformation(cpap);

5
sleepyhead/docs/release_notes.html
View File

@ -10,7 +10,10 @@
<br/> <br/>
<b>New features & bug fixes in v0.9.7</b><br/> <b>New features & bug fixes in v0.9.7</b><br/>
<list> <list>
<li>New Feature: Show current pressure while holding in Alt and hovering over LineCharts</li> <li>New Feature: Added a Welcome page to make things a little friendlier</li>
<li>Fixes another issue that caused session dupplicates on ResMed machines</li>
<li>Improved support for Intellipap BiLevel machines</li>
<li>New Feature: Press F3 to switch on/off a "line cursor", and display current graph information above graphs while hovering over graphs</li>
<li>New Feature: Preference option to Realign machine detected codes and fix dodgy PRS1 durations using user event flagging.</li> <li>New Feature: Preference option to Realign machine detected codes and fix dodgy PRS1 durations using user event flagging.</li>
<li>New Feature: Added second set of User Flags detection and preferences.</li> <li>New Feature: Added second set of User Flags detection and preferences.</li>
<li>New Feature: Hit Escape key to go back through previous graph selection history</li> <li>New Feature: Hit Escape key to go back through previous graph selection history</li>

3
sleepyhead/mainwindow.h
View File

@ -61,6 +61,9 @@ class MainWindow;
extern QStatusBar *qstatusbar; extern QStatusBar *qstatusbar;
QString getCPAPPixmap(QString mach_class);
class Daily; class Daily;
class Report; class Report;
class Overview; class Overview;

2
sleepyhead/scripts/build_number
View File

@ -1 +1 @@
5 6