chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add tooltip to index names on Daily page that shows channel description.

Browse Source 
Update release notes to match, and show changes as in 1.3.1-beta-2
This commit is contained in:
Guy Scharf 2022-01-09 14:51:08 -07:00
parent 321a94379f
commit 59e4b5be41
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Htmldocs/release_notes.html
View File

@ -17,6 +17,7 @@
<ul> <ul>
<li>[new] Skip first 20 seconds of TiVol, RR, and MinVent in ResMed loader.</li> <li>[new] Skip first 20 seconds of TiVol, RR, and MinVent in ResMed loader.</li>
<li>[new] Add ResMed 39423 Canadian Autoset to tested list.</li> <li>[new] Add ResMed 39423 Canadian Autoset to tested list.</li>
<li>[new] Show channel description when hovering over index name on Daily page.</li>
<li>[fix] Fix pressure values for AutoForHer mode on AS1x.</li> <li>[fix] Fix pressure values for AutoForHer mode on AS1x.</li>
<li>[fix] Fix missing oximetry and motion waveforms on Overview pages.</li> <li>[fix] Fix missing oximetry and motion waveforms on Overview pages.</li>
<li>[fix] Fix rare problem of minimum pressure shown as zero on Overview and Statistics pages.</li> <li>[fix] Fix rare problem of minimum pressure shown as zero on Overview and Statistics pages.</li>
@ -34,13 +35,13 @@
<li>DreamStation CPAP Pro with Auto-Trial (401X150)</li> <li>DreamStation CPAP Pro with Auto-Trial (401X150)</li>
</ul> </ul>
</li> </li>
<li>[fix] Correct selection of CPAP and AutoForHer modes for ResMed AS11 modes.</li>
<li>{fix} Skip first 10 seconds of pressure data for ResMed grapths and statistics.</li>
<li>[new] Choose AS11 data instead of AS10 data if both are present on the SD card.</li> <li>[new] Choose AS11 data instead of AS10 data if both are present on the SD card.</li>
<li>[new] Add support for new settings codes in recently manufactured 700X110 DreamStations.</li> <li>[new] Add support for new settings codes in recently manufactured 700X110 DreamStations.</li>
<li>[new] Add 95% flow limitation to Therapy Efficacy section on Statistics page.</li> <li>[new] Add 95% flow limitation to Therapy Efficacy section on Statistics page.</li>
<li>[new] Add date range option to Statistics page.</li> <li>[new] Add date range option to Statistics page.</li>
<li>[new] Improve appearance and operation of event types and graphs comboboxes on Daily and Overview pages.</li> <li>[new] Improve appearance and operation of event types and graphs comboboxes on Daily and Overview pages.</li>
<li>[fix] Correct selection of CPAP and AutoForHer modes for ResMed AS11 modes.</li>
<li>{fix} Skip first 10 seconds of pressure data for ResMed grapths and statistics.</li>
<li>[fix] Correct SleepStyle machines sometimes identified as Icon machines.</li> <li>[fix] Correct SleepStyle machines sometimes identified as Icon machines.</li>
<li>[fix] Improve event flag position in flow graph for DV6 machines.</li> <li>[fix] Improve event flag position in flow graph for DV6 machines.</li>
<li>[fix] --datadir option now allows fully qualified paths on Mac and Linux.</li> <li>[fix] --datadir option now allows fully qualified paths on Mac and Linux.</li>

13
oscar/daily.cpp
View File

@ -1377,7 +1377,7 @@ QString Daily::getStatisticsInfo(Day * day)
// QString oldtip = tooltip; // QString oldtip = tooltip;
tooltip.replace("'", "&apos;"); tooltip.replace("'", "&apos;");
// qDebug() << schema::channel[code].label() << "old tooltip" << oldtip << "tooltip" << tooltip ; // qDebug() << schema::channel[code].label() << "old tooltip" << oldtip << "; new tooltip" << tooltip ;
html+=QString("<tr><td align=left title='%6'>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td></tr>") html+=QString("<tr><td align=left title='%6'>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td></tr>")
.arg(schema::channel[code].label()) .arg(schema::channel[code].label())
@ -1753,9 +1753,16 @@ void Daily::Load(QDate date)
// percentage of patient-triggered breaths, which is much more useful // percentage of patient-triggered breaths, which is much more useful
// than the duration of timed breaths per hour. // than the duration of timed breaths per hour.
values[code] = val; values[code] = val;
QString tooltip=schema::channel[code].description();
tooltip.replace("'", "&apos;");
QColor altcolor = (brightness(chan.defaultColor()) < 0.3) ? Qt::white : Qt::black; // pick a contrasting color QColor altcolor = (brightness(chan.defaultColor()) < 0.3) ? Qt::white : Qt::black; // pick a contrasting color
htmlLeftIndices+=QString("<tr><td align='left' bgcolor='%1'><b><font color='%2'><a href='event=%5' style='text-decoration:none;color:%2'>%3</a></font></b></td><td width=20% bgcolor='%1'><b><font color='%2'>%4</font></b></td></tr>") htmlLeftIndices+=QString("<tr><td align='left' bgcolor='%1'><b><font color='%2'><a href='event=%5' style='text-decoration:none;color:%2' title='<p>%6</p>'>%3</a></font></b></td><td width=20% bgcolor='%1'><b><font color='%2'>%4</font></b></td></tr>")
.arg(chan.defaultColor().name()).arg(altcolor.name()).arg(chan.fullname()).arg(data).arg(code); .arg(chan.defaultColor().name())
.arg(altcolor.name())
.arg(chan.fullname())
.arg(data)
.arg(code)
.arg(tooltip);
} }
htmlLeftIndices+="</table><hr/>"; htmlLeftIndices+="</table><hr/>";