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

Resource build error fix, also fix humidifier setting display

Browse Source
This commit is contained in:
Mark Watkins 2011-12-25 19:25:27 +10:00
parent 4dc3f845fa
commit 6f3ea4d39a
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Resources.qrc
View File

@ -34,6 +34,5 @@
<file>icons/sheep.png</file> <file>icons/sheep.png</file>
<file>icons/nodata.png</file> <file>icons/nodata.png</file>
<file>icons/cubeoximeter.png</file> <file>icons/cubeoximeter.png</file>
<file>icons/smileyface2.png</file>
</qresource> </qresource>
</RCC> </RCC>

2
daily.cpp
View File

@ -896,7 +896,7 @@ void Daily::Load(QDate date)
html+=QString("<tr><td>%1</td><td colspan=4>%2</td></tr>").arg(tr("Flex")) html+=QString("<tr><td>%1</td><td colspan=4>%2</td></tr>").arg(tr("Flex"))
.arg(flexstr); .arg(flexstr);
html+=QString("<tr><td>%1</td><td colspan=4>%2</td></tr>").arg(tr("Humidifier")) html+=QString("<tr><td>%1</td><td colspan=4>%2</td></tr>").arg(tr("Humidifier"))
.arg(cpap->settings_max(PRS1_HumidSetting) ? STR_GEN_Off : "x"+QString::number(i)); .arg(cpap->settings_max(PRS1_HumidSetting)==0 ? STR_GEN_Off : "x"+QString::number(i));
} else if (cpap->machine->GetClass()==STR_MACH_ResMed) { } else if (cpap->machine->GetClass()==STR_MACH_ResMed) {
int epr=cpap->settings_max(RMS9_EPR); int epr=cpap->settings_max(RMS9_EPR);
int epr2=cpap->settings_max(RMS9_EPRSet); int epr2=cpap->settings_max(RMS9_EPRSet);