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

Merge branch 'master' into prs1-500g110

Browse Source
This commit is contained in:
sawinglogz 2019-09-07 20:11:53 -04:00
commit 517e6f0d86
5 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
oscar/daily.cpp
View File

@ -64,6 +64,13 @@ inline QString channelInfo(ChannelID code) {
// + (schema::channel[code].units() != "0" ? "\n("+schema::channel[code].units()+")" : "");
}
// Charts displayed on the Daily page are defined in the Daily::Daily constructor. They consist of some hard-coded charts and a table
// of channel codes for which charts are generated. If the list of channel codes is changed, the graph order lists below will need to
// be changed correspondingly.
//
// Note that "graph codes" are strings used to identify graphs and are not the same as "channel codes." The mapping between channel codes
// and graph codes is found in schema.cpp. (What we here call 'graph cdoes' are called 'lookup codes' in schema.cpp.)
//
//
// List here the graph codes in the order they are to be displayed.
// Do NOT list a code twice, or Oscar will crash when the profile is closed!

4
oscar/docs/release_notes.html
View File

@ -10,8 +10,10 @@ Which was written and copyright 2011-2018 © Mark Watkins
<b>Changes and fixes in OSCAR <u>**AFTER**</u> v1.1.0-testing-4</b>
<ul>
<li>Portions of OSCAR are &copy; 2019 by The OSCAR Team</li>
<li>[new] Default graphs and View/reset graphs use a different order for advanced CPAP modes</li>
<li>[new] Default and View/reset graphs use a different order for AVS and AVAPS CPAP modes</li>
<li>[new] Add preference setting to include serial number on machine settings list</li>
<li>[fix] Place date, time, and Oscar version information in report footers</li>
<li>[fix] Update identification of ResMed S9 machines on Welcome page</li>
<li>[fix] Correct formatting of event number in Daily Events tab</li>
<li>[fix] Correct timezone offset for somnopose imports</li>
<li>[fix] Show a progress bar when setting Overview range to a large number of days</li>

5
oscar/reports.cpp
View File

@ -556,7 +556,10 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
}
if (first) {
QString footer = QObject::tr("OSCAR v%1").arg(VersionString);
QDateTime timestamp = QDateTime::currentDateTime();
QString footer = QObject::tr("%1 OSCAR v%2").arg(timestamp.toString(MedDateFormat+" hh:mm"))
.arg(ReleaseStatus == "r" ? ShortVersionString : VersionString+" (" + gitRevision() + ")");
QRectF bounds = painter.boundingRect(QRectF(0, virt_height, virt_width, normal_height), footer,
QTextOption(Qt::AlignHCenter));

7
oscar/statistics.cpp
View File

@ -706,8 +706,11 @@ QString Statistics::generateFooter(bool showinfo)
if (showinfo) {
html += "<hr><div align=center><font size='-1'><i>";
html += tr("This report was generated by OSCAR v%1").arg(ShortVersionString) + "<br/>"
+tr("OSCAR is free open-source CPAP report software");
QDateTime timestamp = QDateTime::currentDateTime();
html += tr("This report was generated on %1 by OSCAR v%2").arg(timestamp.toString(MedDateFormat + " hh:mm"))
.arg(ReleaseStatus == "r" ? ShortVersionString : VersionString + " (" + gitRevision() + ")")
+ "<br/>"
+ tr("OSCAR is free open-source CPAP report software");
html += "</i></font></div>";
}

4
oscar/welcome.cpp
View File

@ -44,11 +44,11 @@ void Welcome::refreshPage()
bool noMachines = mlist.isEmpty() && posmachines.isEmpty() && oximachines.isEmpty() && stgmachines.isEmpty();
bool showCardWarning = !noMachines;
bool showCardWarning = noMachines;
// The SDCard warning does not need to be seen anymore for people who DON'T use ResMed S9's.. show first import and only when S9 is present
for (auto & mach :mlist) {
if (mach->series().compare("S9") == 0) showCardWarning = true;
if (mach->brand().contains(STR_MACH_ResMed) && mach->series().contains("S9")) showCardWarning = true;
}
ui->S9Warning->setVisible(showCardWarning);