diff --git a/oscar/daily.cpp b/oscar/daily.cpp
index b4b029b5..f320fff3 100644
--- a/oscar/daily.cpp
+++ b/oscar/daily.cpp
@@ -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!
diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html
index f4f87ed9..f78c2466 100644
--- a/oscar/docs/release_notes.html
+++ b/oscar/docs/release_notes.html
@@ -10,8 +10,10 @@ Which was written and copyright 2011-2018 © Mark Watkins
Changes and fixes in OSCAR **AFTER** v1.1.0-testing-4
- Portions of OSCAR are © 2019 by The OSCAR Team
-- [new] Default graphs and View/reset graphs use a different order for advanced CPAP modes
+- [new] Default and View/reset graphs use a different order for AVS and AVAPS CPAP modes
- [new] Add preference setting to include serial number on machine settings list
+- [fix] Place date, time, and Oscar version information in report footers
+- [fix] Update identification of ResMed S9 machines on Welcome page
- [fix] Correct formatting of event number in Daily Events tab
- [fix] Correct timezone offset for somnopose imports
- [fix] Show a progress bar when setting Overview range to a large number of days
diff --git a/oscar/reports.cpp b/oscar/reports.cpp
index 9f69c466..98d12eac 100644
--- a/oscar/reports.cpp
+++ b/oscar/reports.cpp
@@ -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));
diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index 08d1b14f..2bcf02cd 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -706,8 +706,11 @@ QString Statistics::generateFooter(bool showinfo)
if (showinfo) {
html += "
";
- html += tr("This report was generated by OSCAR v%1").arg(ShortVersionString) + "
"
- +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() + ")")
+ + "
"
+ + tr("OSCAR is free open-source CPAP report software");
html += "
";
}
diff --git a/oscar/welcome.cpp b/oscar/welcome.cpp
index ad1da694..29e4a2bc 100644
--- a/oscar/welcome.cpp
+++ b/oscar/welcome.cpp
@@ -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);