Merge branch 'master' into prs1-f0v6

Building/Windows/BuildInstall.iss

@@ -7,29 +7,45 @@
 
 #define MyAppVersion MyMajorVersion+"."+MyMinorVersion+"."+MyRevision+"-"+MyReleaseStatus
 #if MyReleaseStatus == "r"
-#define MyAppVersion MyAppVersion+MyBuildNumber
+  #define MyAppVersion MyAppVersion+MyBuildNumber
 #else
-#define MyAppVersion MyAppVersion+"-"+MyBuildNumber
+  #define MyAppVersion MyAppVersion+"-"+MyBuildNumber
 #endif
 
-#define MyAppName "OSCAR"
 #define MyAppPublisher "The OSCAR Team"
 #define MyAppExeName "OSCAR.exe"
+#define MyAppName "OSCAR"
 
 [Setup]
 SetupLogging=yes
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-; Now using separate AppID for Win32 and Win64 -- GTS 4/6/2019
+; Now using separate AppID for Win32 and Win64 and for test builds -- GTS 4/6/2019
 #if MyPlatform == "Win64"
     ArchitecturesAllowed=x64
     ArchitecturesInstallIn64BitMode=x64
-    AppId={{FC6F08E6-69BF-4469-ADE3-78199288D305}
+    #if MyReleaseStatus == "r" || MyReleaseStatus == "rc"
+      AppId={{FC6F08E6-69BF-4469-ADE3-78199288D305}
+      #define MyGroupName "OSCAR"
+      #define MyDirName "OSCAR"
+    #else
+      AppId={{C5E23210-4BC5-499D-A0E4-81192748D322}
+      #define MyGroupName "OSCAR (test)"
+      #define MyDirName "OSCAR-test"
+    #endif
 ;    DefaultDirName={%PROGRAMFILES|{pf}}\OSCAR
 ; above doesn't work.  Always returns x86 directory
 #else  // 32-bit
-    AppId={{4F3EB81B-1866-4124-B388-5FB5DA34FFDD}
+    #if MyReleaseStatus == "r" || MyReleaseStatus == "rc"
+      AppId={{4F3EB81B-1866-4124-B388-5FB5DA34FFDD}
+      #define MyGroupName "OSCAR 32-bit"
+      #define MyDirName "OSCAR"
+    #else
+      AppId={{B0382AB3-ECB4-4F9D-ABB1-F6EF73D4E3DB}
+      #define MyGroupName "OSCAR 32-bit (test)"
+      #define MyDirName "OSCAR-test"
+    #endif
 ;    DefaultDirName={%PROGRAMFILES(X86)|{pf}}\OSCAR
 #endif
 AppName={#MyAppName}
@@ -38,20 +54,20 @@ AppVerName={#MyAppName} {#MyAppVersion}-{#MyPlatform}-{#MyGitRevision}{#MySuffix
 AppPublisher={#MyAppPublisher}
 AppCopyright=Copyright 2019 {#MyAppPublisher}
 ; **** AppCopyright=Copyright {GetDateTimeString('yyyy', #0, #0)} {%MyAppPublisher}
-DefaultDirName={pf}\OSCAR
+DefaultDirName={pf}\{#MyDirName}
-DefaultGroupName={#MyAppName}
+DefaultGroupName={#MyGroupName}
 OutputDir=.\Installer
 #if MyReleaseStatus == "r"
-OutputBaseFilename={#MyAppName}-{#MyAppVersion}-{#MyPlatform}{#MySuffix}
+  OutputBaseFilename={#MyAppName}-{#MyAppVersion}-{#MyPlatform}{#MySuffix}
 #else
-OutputBaseFilename={#MyAppName}-{#MyAppVersion}-{#MyPlatform}-{#MyGitRevision}{#MySuffix}
+  OutputBaseFilename={#MyAppName}-{#MyAppVersion}-{#MyPlatform}-{#MyGitRevision}{#MySuffix}
 #endif
 SetupIconFile=setup.ico
 Compression=lzma
 SolidCompression=yes
 VersionInfoCompany={#MyAppPublisher}
 VersionInfoProductName={#MyAppName}
-UninstallDisplayName={#MyAppName}
+UninstallDisplayName={#MyGroupName}
 UninstallDisplayIcon={app}\{#MyAppExeName}
 
 [Languages]
@@ -89,9 +105,9 @@ Source: ".\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs cre
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{group}\{#MyGroupName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
+Name: "{group}\{cm:UninstallProgram,{#MyGroupName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+Name: "{commondesktop}\{#MyGroupName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 ; Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
 
 [Messages]

oscar/Graphs/MinutesAtPressure.h

@@ -22,18 +22,7 @@ struct PressureInfo
         peaktime = peakevents = 0;
         min_pressure = max_pressure = 0;
     }
-    PressureInfo(PressureInfo &copy) {
+    PressureInfo(PressureInfo &copy) = default;
-        code = copy.code;
-        minx = copy.minx;
-        maxx = copy.maxx;
-        peaktime = copy.peaktime;
-        peakevents = copy.peakevents;
-        min_pressure = copy.min_pressure;
-        max_pressure = copy.max_pressure;
-        times = copy.times;
-        events = copy.events;
-        chans = copy.chans;
-    }
 
     PressureInfo(ChannelID code, qint64 minx, qint64 maxx) : code(code), minx(minx), maxx(maxx)
     {

oscar/Graphs/gGraphView.cpp

@@ -1554,6 +1554,32 @@ void gGraphView::paintGL()
 
 QString gGraphView::getRangeString()
 {
+    QDateTime st = QDateTime::fromMSecsSinceEpoch(m_minx);
+    QDateTime et = QDateTime::fromMSecsSinceEpoch(m_maxx);
+
+    QDate std = st.date();
+    QDate etd = et.date();
+
+    // Format if Begin and End are on different days
+    if (std != etd) {
+        QString txt = st.toString(" d MMM [ HH:mm:ss") + " - " +  et.toString("HH:mm:ss ] d MMM yyyy");
+        return txt;
+    }
+
+    // Range is within one (local) day
+    qint64 diff = m_maxx - m_minx;
+    QString fmt;
+
+    if (diff > 60000) {
+            fmt = "HH:mm:ss";
+        } else {
+            fmt = "HH:mm:ss:zzz";
+        }
+    QString txt = st.toString(QObject::tr("d MMM yyyy [ %1 - %2 ]").arg(fmt).arg(et.toString(fmt))) ;
+
+    return txt;
+
+/***** WTF is this code trying to do?  Replaced by above 8/9/2019
     // a note about time zone usage here
     // even though this string will be displayed to the user
     // the graph is drawn using UTC times, so no conversion
@@ -1566,7 +1592,7 @@ QString gGraphView::getRangeString()
 
     qint64 diff = m_maxx - m_minx;
 
-    if (diff > 86400000) {
+    if (diff > 86400000) {                  // 86400000 is one day, in milliseconds
         int days = ceil(double(m_maxx-m_minx) / 86400000.0);
 
         qint64 minx = floor(double(m_minx)/86400000.0);
@@ -1584,12 +1610,11 @@ QString gGraphView::getRangeString()
     } else {
         fmt = "HH:mm:ss:zzz";
     }
-    QDateTime st = QDateTime::fromMSecsSinceEpoch(m_minx, Qt::UTC);
-    QDateTime et = QDateTime::fromMSecsSinceEpoch(m_maxx, Qt::UTC);
 
     QString txt = st.toString(QObject::tr("d MMM [ %1 - %2 ]").arg(fmt).arg(et.toString(fmt))) ;
 
     return txt;
+*/
 }
 
 void gGraphView::leaveEvent(QEvent * event)
@@ -3239,7 +3264,6 @@ void gGraphView::keyPressEvent(QKeyEvent *event)
     //qDebug() << "Keypress??";
 }
 
-
 void gGraphView::setDay(Day *day)
 {
 
@@ -3251,6 +3275,7 @@ void gGraphView::setDay(Day *day)
 
     ResetBounds(false);
 }
+
 bool gGraphView::isEmpty()
 {
     bool res = true;

oscar/Graphs/gXAxis.cpp

@@ -13,6 +13,7 @@
 
 #include "Graphs/gXAxis.h"
 #include "SleepLib/profiles.h"
+#include "SleepLib/common.h"
 #include "Graphs/glcommon.h"
 #include "Graphs/gGraph.h"
 #include "Graphs/gGraphView.h"
@@ -303,7 +304,8 @@ void gXAxis::paint(QPainter &painter, gGraph &w, const QRegion &region)
                 //dt.toString("MMM dd");
 
                 // Doing it this way instead because it's MUUUUUUCH faster
-                tmpstr = QString("%1 %2").arg(months[date.month() - 1]).arg(date.day());
+                tmpstr = QString(dayFirst?"%1 %2":"%2 %1").arg(date.day()).arg(months[date.month() - 1]);
+
                 //} else if (fitmode==0) {
                 //            tmpstr=QString("%1 %2:%3").arg(dow[d]).arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0'));
             } else if (fitmode == 1) { // minute
@@ -435,7 +437,7 @@ void gXAxisDay::paint(QPainter &painter, gGraph &graph, const QRegion &region)
         if ((lastx + barw) > (left + width + 1))
             break;
 
-        QString tmpstr = QString("%1 %2").arg(months[date.month() - 1]).arg(date.day(), 2, 10, QChar('0'));
+        QString tmpstr = QString(dayFirst?"%2 %1":"%1 %2").arg(months[date.month() - 1]).arg(date.day(), 2, 10, QChar('0'));
 
         float x1 = lastx + xpos;
         //lines.append(QLine(lastx, top, lastx, top+6));

oscar/SleepLib/common.cpp

@@ -37,8 +37,36 @@
 
 extern MainWindow * mainwin;
 
-// Used by internal settings
+QString MedDateFormat = "ddd MMM d yyyy";  // QT default value, which we override if we can
+bool dayFirst = false;
 
+// System locale and regional settings support only a "short" date (m/d/yyy) and a "long"
+// date (day of week, month, day, year -- all spelled out fully).  We get the formatting
+// for the long format, shorten day and month name, and remove excess commas.
+void SetDateFormat () {
+    QLocale sysLocale = QLocale::system();
+    QString dfmt = sysLocale.dateFormat();
+    qDebug() << "system locale date format" << dfmt;
+
+    QString s = dfmt.replace("dddd", "ddd");
+    if (!s.isEmpty()) s = s.replace("MMMM", "MMM");
+    if (!s.isEmpty()) s = s.replace(",", "");
+    if (!s.isEmpty()) {
+        QDate testDate (2018, 12, 31);
+        QString testresult = testDate.toString(s);
+        if (!testresult.isEmpty())  // make sure we can translate a date
+            MedDateFormat = s;     // If we can, save the format for future use
+    }
+
+    // Record whether month or day is first in the formatting
+    QString s2 = MedDateFormat;
+    s2 = s2.replace("ddd","");
+    int monthidx = s2.indexOf("MMM");
+    if (s2.indexOf("d") < monthidx)
+        dayFirst = true;
+
+    qDebug() << "shortened date format" << MedDateFormat << "dayFirst" << dayFirst;
+}
 
 const QString & gitRevision()
 {
@@ -62,23 +90,35 @@ const QString getDeveloperDomain()
 const QString getAppName()
 {
     QString name = STR_AppName;
-    if ((GIT_BRANCH != "master") || 
+
-           (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) || 
+    // Append branch if there is a branch specified
-              (ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) || 
+    if (GIT_BRANCH != "master") {
-              (ReleaseStatus.compare("beta", Qt::CaseInsensitive)==0)))) {
         name += "-"+GIT_BRANCH;
+//        qDebug() << "getAppName, not master, name is" << name << "branch is" << GIT_BRANCH;
     }
+
+    // Append "-test" if not release
+    else if (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) ||
+               (ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) )) {
+        name += "-test";
+//        qDebug() << "getAppName, not release, name is" << name << "release type is" << ReleaseStatus;
+    }
+
     return name;
 }
 
 const QString getModifiedAppData()
 {
     QString appdata = STR_AppData;
-    if ((GIT_BRANCH != "master") || 
+
-           (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) || 
+    // Append branch if there is a branch specified
-              (ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) || 
+    if (GIT_BRANCH != "master")
-              (ReleaseStatus.compare("beta", Qt::CaseInsensitive)==0)))) {
         appdata += "-"+GIT_BRANCH;
+
+    // Append "-test" if not release
+    else if (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) ||
+               (ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) )) {
+        appdata += "-test";
     }
     return appdata;
 }
@@ -202,7 +242,7 @@ QStringList makeBuildInfo (QString relinfo, QString forcedEngine){
         branch = QObject::tr("Branch:") + " " + GIT_BRANCH + ", ";
     }
     buildInfo << branch + (QObject::tr("Revision")) + " " + GIT_REVISION;
-    if (GIT_BRANCH != "master")
+    if (getAppName() != STR_AppName)        // Report any non-standard app key
         buildInfo << (QObject::tr("App key:") + " " + getAppName());
     buildInfo << QString("");
     buildInfo << (QObject::tr("Operating system:") + " " + QSysInfo::prettyProductName());

oscar/SleepLib/common.h

@@ -27,6 +27,8 @@ const QString CSTR_GFX_ANGLE = "ANGLE";
 const QString CSTR_GFX_OpenGL = "OpenGL";
 const QString CSTR_GFX_BrokenGL = "LegacyGFX";
 
+extern QString MedDateFormat;
+extern bool dayFirst;
 
 //! \brief Gets the first day of week from the system locale, to show in the calendars.
 Qt::DayOfWeek firstDayOfWeekFromLocale();
@@ -49,6 +51,8 @@ QStringList makeBuildInfo(QString relinfo, QString forcedEngine);
 QStringList getBuildInfo();
 QStringList addBuildInfo (QString value);
 
+void SetDateFormat ();
+
 QByteArray gCompress(const QByteArray& data);
 QByteArray gUncompress(const QByteArray &data);
 
@@ -65,11 +69,7 @@ struct ValueCount {
     ValueCount( EventDataType val, qint64 cnt, double pp)
         :value(val), count(cnt), p(pp) {}
 
-    ValueCount(const ValueCount &copy) {
+    ValueCount(const ValueCount &copy) = default;
-        value = copy.value;
-        count = copy.count;
-        p = copy.p;
-    }
     EventDataType value;
     qint64 count;
     double p;

oscar/SleepLib/loader_plugins/prs1_loader.cpp

@@ -6106,7 +6106,7 @@ PRS1DataChunk* PRS1DataChunk::ParseNext(QFile & f)
             int sessionid_base = (chunk->fileVersion == 2 ? 10 : 16);
             if (chunk->family == 3 && chunk->familyVersion >= 3) sessionid_base = 16;
             QString session_s = fi.fileName().section(".", 0, -2);
-            quint32 sid = session_s.toInt(&numeric, sessionid_base);
+            qint32 sid = session_s.toInt(&numeric, sessionid_base);
             if (!numeric || sid != chunk->sessionid) {
                 qDebug() << chunk->m_path << chunk->sessionid;
             }

oscar/SleepLib/loader_plugins/resmed_loader.h

@@ -125,82 +125,8 @@ struct STRRecord
 
         date=QDate();
     }
-    STRRecord(const STRRecord & copy) {
+    STRRecord(const STRRecord & copy) = default;
-        maskon = copy.maskon;
-        maskoff = copy.maskoff;
-        maskdur = copy.maskdur;
-        maskevents = copy.maskevents;
-        mode = copy.mode;
-        rms9_mode = copy.rms9_mode;
-        set_pressure = copy.set_pressure;
-        epap = copy.epap;
-        max_pressure = copy.max_pressure;
-        min_pressure = copy.min_pressure;
-        max_ps = copy.max_ps;
-        min_ps = copy.min_ps;
-        ps = copy.ps;
-        max_epap = copy.max_epap;
-        min_epap = copy.min_epap;
-        ipap = copy.ipap;
-        max_ipap = copy.max_ipap;
-        min_ipap = copy.min_ipap;
-        epr = copy.epr;
-        epr_level = copy.epr_level;
-        sessionid = copy.sessionid;
-        ahi = copy.ahi;
-        ai = copy.ai;
-        oai = copy.oai;
-        hi = copy.hi;
-        uai = copy.uai;
-        cai = copy.cai;
-        csr = copy.csr;
 
-        date = copy.date;
-        leak50 = copy.leak50;
-        leak95 = copy.leak95;
-        leakmax = copy.leakmax;
-        rr50 = copy.rr50;
-        rr95 = copy.rr95;
-        rrmax = copy.rrmax;
-        mv50 = copy.mv50;
-        mv95 = copy.mv95;
-        mvmax = copy.mvmax;
-        ie50 = copy.ie50;
-        ie95 = copy.ie95;
-        iemax = copy.iemax;
-        tv50 = copy.tv50;
-        tv95 = copy.tv95;
-        tvmax = copy.tvmax;
-        mp50 = copy.mp50;
-        mp95 = copy.mp95;
-        mpmax = copy.mpmax;
-
-
-        tgtepap50 = copy.tgtepap50;
-        tgtepap95 = copy.tgtepap95;
-        tgtepapmax = copy.tgtepapmax;
-        tgtipap50 = copy.tgtipap50;
-        tgtipap95 = copy.tgtipap95;
-        tgtipapmax = copy.tgtipapmax;
-
-        s_EPREnable = copy.s_EPREnable;
-        s_EPR_ClinEnable = copy.s_EPREnable;
-        s_RampEnable = copy.s_RampEnable;
-        s_RampTime = copy.s_RampTime;
-
-        s_SmartStart = copy.s_SmartStart;
-        s_PtAccess = copy.s_PtAccess;
-        s_ABFilter = copy.s_ABFilter;
-        s_Mask = copy.s_Mask;
-
-        s_Tube = copy.s_Tube;
-        s_ClimateControl = copy.s_ClimateControl;
-        s_HumEnable = copy.s_HumEnable;
-        s_HumLevel = copy.s_HumLevel;
-        s_TempEnable = copy.s_TempEnable;
-        s_Temp = copy.s_Temp;
-        ramp_pressure = copy.ramp_pressure;
-    }
     QVector<quint32> maskon;
     QVector<quint32> maskoff;
 
@@ -347,10 +273,7 @@ struct STRFile {
         filename(QString()), edf(nullptr) {}
     STRFile(QString name, ResMedEDFParser *str) :
         filename(name), edf(str) {}
-    STRFile(const STRFile & copy) {
+    STRFile(const STRFile & copy) = default;
-        filename = copy.filename;
-        edf = copy.edf;
-    }
     ~STRFile() {
     }
 

oscar/SleepLib/machine_common.h

@@ -52,6 +52,7 @@ enum SummaryType { ST_CNT, ST_SUM, ST_AVG, ST_WAVG, ST_PERC, ST_90P, ST_MIN, ST_
 enum MachineType { MT_UNKNOWN = 0, MT_CPAP, MT_OXIMETER, MT_SLEEPSTAGE, MT_JOURNAL, MT_POSITION, MT_UNCATEGORIZED = 99};
 //void InitMapsWithoutAwesomeInitializerLists();
 
+/***** NEVER USED ---
 // PAP Device Capabilities
 const quint32 CAP_Fixed               = 0x0000001;  // Constant PAP
 const quint32 CAP_Variable            = 0x0000002;  // Variable Base (EPAP) pressure
@@ -69,7 +70,7 @@ const quint32 PAP_BiLevelAutoVariable     = 0x0010;  // Auto BiLevel with full r
 const quint32 PAP_ASV_Fixed               = 0x0020;  // ASV with fixed EPAP
 const quint32 PAP_ASV_Variable            = 0x0040;  // ASV with full ranging capabilities
 const quint32 PAP_SplitNight              = 0x8000;  // Split night capabilities
-
+*****/
 
 
 /*! \enum CPAPMode
@@ -92,18 +93,7 @@ enum PRTimeModes { //:short
 
 struct MachineInfo {
     MachineInfo() { type = MT_UNKNOWN; version = 0; cap=0; }
-    MachineInfo(const MachineInfo & copy) {
+    MachineInfo(const MachineInfo & copy) = default;
-        type = copy.type;
-        loadername = copy.loadername;
-        brand = copy.brand;
-        model = copy.model;
-        modelnumber = copy.modelnumber;
-        serial = copy.serial;
-        series = copy.series;
-        version = copy.version;
-        lastimported = copy.lastimported;
-        cap = copy.cap;
-    }
 
     MachineInfo(MachineType type, quint32 cap, QString loadername, QString brand, QString model, QString modelnumber, QString serial, QString series, QDateTime lastimported, int version) :
         type(type), cap(cap), loadername(loadername), brand(brand), model(model), modelnumber(modelnumber), serial(serial), series(series), lastimported(lastimported), version(version) {}

oscar/SleepLib/schema.h

@@ -36,12 +36,7 @@ public:
         color = Qt::black;
         type = Calc_Zero;
     }
-    ChannelCalc(const ChannelCalc & copy) {
+    ChannelCalc(const ChannelCalc & copy) = default;
-        code = copy.code;
-        color = copy.color;
-        enabled = copy.enabled;
-        type = copy.type;
-    }
     ChannelCalc(ChannelID code, ChannelCalcType type, QColor color, bool enabled):
         code(code), type(type), color(color), enabled(enabled) {}
 

oscar/daily.cpp

@@ -583,7 +583,7 @@ void Daily::ReloadGraphs()
     ui->calendar->setSelectedDate(d);
     ui->calendar->blockSignals(false);
     Load(d);
-    ui->calButton->setText(ui->calendar->selectedDate().toString(Qt::TextDate));
+    ui->calButton->setText(ui->calendar->selectedDate().toString(MedDateFormat));
     graphView()->redraw();
 //    qDebug() << "Finished ReloadGraphs in Daily object";
 //    sleep(3);
@@ -826,7 +826,7 @@ void Daily::on_ReloadDay()
 
     //GraphView->fadeIn(fadedir);
     GraphView->redraw();
-    ui->calButton->setText(ui->calendar->selectedDate().toString(Qt::TextDate));
+    ui->calButton->setText(ui->calendar->selectedDate().toString(MedDateFormat));
     ui->calendar->setFocus(Qt::ActiveWindowFocusReason);
 
     if (p_profile->general->unitSystem()==US_English) {
@@ -852,6 +852,28 @@ void Daily::ResetGraphLayout()
 void Daily::ResetGraphOrder()
 {
     GraphView->resetGraphOrder(true);
+
+    // Enable all graphs (make them not hidden)
+    for (int i=0;i<ui->graphCombo->count();i++) {
+        // If disabled, emulate a click to enable the graph
+        if (!ui->graphCombo->itemData(i,Qt::UserRole).toBool()) {
+            qDebug() << "resetting graph" << i;
+            Daily::on_graphCombo_activated(i);
+        }
+    }
+
+    // Mark all events as active
+    for (int i=0;i<ui->eventsCombo->count();i++) {
+        // If disabled, emulate a click to enable the event
+        ChannelID code = ui->eventsCombo->itemData(i, Qt::UserRole).toUInt();
+        schema::Channel * chan = &schema::channel[code];
+        if (!chan->enabled()) {
+            qDebug() << "resetting event" << i;
+            Daily::on_eventsCombo_activated(i);
+        }
+    }
+
+    // Reset graph heights (and repaint)
     ResetGraphLayout();
 }
 
@@ -2416,6 +2438,7 @@ void Daily::on_graphCombo_activated(int index)
     GraphView->updateScale();
     GraphView->redraw();
 }
+
 void Daily::updateCube()
 {
     //brick..
@@ -2495,7 +2518,6 @@ void Daily::updateGraphCombo()
     }
     ui->graphCombo->setCurrentIndex(0);
 
-
     updateCube();
 }
 
@@ -2504,7 +2526,6 @@ void Daily::on_eventsCombo_activated(int index)
     if (index<0)
         return;
 
-
     ChannelID code = ui->eventsCombo->itemData(index, Qt::UserRole).toUInt();
     schema::Channel * chan = &schema::channel[code];
 

oscar/docs/release_notes.html

@@ -6,6 +6,18 @@
 Which was written and copyright 2011-2018 © Mark Watkins
 </p>
 
+<p>
+<b>Changes and fixes in OSCAR <u>AFTER</u> v1.1.0-testing-3</b>
+<ul>
+<li>Portions of OSCAR are &copy; 2019 by The OSCAR Team</li>
+<li>[new] Windows installers support Oscar, Oscar 32-bit, Oscar (test) and Oscar 32-bit (test)</li>
+<li>[fix] Release builds use a Settings key of OSCAR, Test builds use OSCAR-test, and Branch builds use OSCAR-branch.  Default data directories are similarly named.</li>
+<li>[fix] Date bar on bottom of Daily graph now in local time when no line cursor displayed, and formatting improved</li>
+<li>[fix] View/Reset Graphs now enables all graphs and all event flags</li>
+<li>[fix] Calendar date now formatted per national settings</li>
+</ul>
+</p>
+
 <p>
 <b>Changes and fixes in OSCAR v1.1.0-testing-3</b>
 <br/><b>NOTE: Translations have NOT yet been updated for these changes</b>
@@ -13,8 +25,10 @@ Which was written and copyright 2011-2018 &copy; Mark Watkins
 <li>Portions of OSCAR are &copy; 2019 by The OSCAR Team</li>
 <li>[new] DreamStation BiPAP S/T and AVAPS ventilators (1030X and 1130X) are now supported. The settings aren't yet displayed correctly, but therapy events and graphs should now display properly.</li>
 <li>[new] View/Reset Graphs organizes graphs in their original order</li>
+<li>[fix] Format dates for the national region as reported by the operating system</li>
 <li>[fix] Improve progress bar for statistics cache update</li>
-<li>[fix] Correct calculation of seven-day AHI in Records tab of right sidebar</li>
+<li>[fix] Correct calculations of seven-day AHI and leak rate on Welcome page</li>
+<li>[fix] Clarify AHI and hours labels on Records tab of right sidebar</li>
 <li>[fix] Correct import error resulting in invalid elapsed times and impossibly high AHI values</li>
 </ul>
 </p>

oscar/main.cpp

@@ -346,6 +346,8 @@ int main(int argc, char *argv[]) {
     qDebug() << "OSCAR starting" << QDateTime::currentDateTime();
     qDebug().noquote() << STR_AppName << VersionString << relinfo << "Built with Qt" << QT_VERSION_STR << __DATE__ << __TIME__;
 
+    SetDateFormat();
+
     ////////////////////////////////////////////////////////////////////////////////////////////
     // Language Selection
     ////////////////////////////////////////////////////////////////////////////////////////////

oscar/mainwindow.cpp

@@ -1221,7 +1221,7 @@ void MainWindow::updateFavourites()
                     if (notes.size() > 0) {
                         tmp += QString("<tr><td><b><a href='daily=%1'>%2</a></b><br/>")
                                .arg(date.toString(Qt::ISODate))
-                               .arg(date.toString());
+                               .arg(date.toString(MedDateFormat));
 
                         tmp += "<list>";
 

oscar/oscar.pro

@@ -455,6 +455,11 @@ DISTFILES += help/default.css \
 QMAKE_CFLAGS += -Werror
 QMAKE_CXXFLAGS += -Werror
 
+# Make deprecation warnings just warnings
+QMAKE_CFLAGS += -Wno-error=deprecated-declarations
+QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations
+
+
 # Create a debug GUI build by adding "CONFIG+=memdebug" to your qmake command
 memdebug {
     !win32 {  # add memory checking on Linux and macOS debug builds

oscar/overview.cpp

@@ -469,6 +469,7 @@ void Overview::on_rangeCombo_activated(int index)
 
     setRange(start, end);
 }
+
 void Overview::setRange(QDate start, QDate end)
 {
     ui->dateEnd->blockSignals(true);
@@ -481,7 +482,6 @@ void Overview::setRange(QDate start, QDate end)
     ui->dateStart->blockSignals(false);
     this->on_toolButton_clicked();
     updateGraphCombo();
-
 }
 
 void Overview::on_graphCombo_activated(int index)

oscar/statistics.cpp

@@ -20,6 +20,7 @@
 #include "mainwindow.h"
 #include "statistics.h"
 #include "cprogressbar.h"
+#include "SleepLib/common.h"
 
 extern MainWindow *mainwin;
 
@@ -613,7 +614,7 @@ QString Statistics::getUserInfo () {
     if (!p_profile->user->firstName().isEmpty()) {
         userinfo = tr("Name: %1, %2").arg(p_profile->user->lastName()).arg(p_profile->user->firstName()) + "<br/>";
         if (!p_profile->user->DOB().isNull()) {
-            userinfo += tr("DOB: %1").arg(p_profile->user->DOB().toString()) + "<br/>";
+            userinfo += tr("DOB: %1").arg(p_profile->user->DOB().toString(MedDateFormat)) + "<br/>";
         }
         if (!p_profile->user->phone().isEmpty()) {
             userinfo += tr("Phone: %1").arg(p_profile->user->phone()) + "<br/>";
@@ -897,8 +898,10 @@ QString Statistics::GenerateMachineList()
                     .arg(m->model() +
                          (mn.isEmpty() ? "" : QString(" (") + mn + QString(")")))
                     .arg(m->serial())
-                    .arg(d1.toString(Qt::SystemLocaleShortDate))
+                    .arg(d1.toString(MedDateFormat))
-                    .arg(d2.toString(Qt::SystemLocaleShortDate));
+                    .arg(d2.toString(MedDateFormat));
+//            .arg(d1.toString(Qt::SystemLocaleShortDate))
+//            .arg(d2.toString(Qt::SystemLocaleShortDate));
 
         }
 
@@ -984,8 +987,8 @@ QString Statistics::GenerateRXChanges()
         double ahi = rdi ? (double(rx.rdi) / rx.hours) : (double(rx.ahi) /rx.hours);
         double fli = double(rx.count(CPAP_FlowLimit)) / rx. hours;
 
-        html += QString("<td>%1</td>").arg(rx.start.toString())+
+        html += QString("<td>%1</td>").arg(rx.start.toString(MedDateFormat))+
-                QString("<td>%1</td>").arg(rx.end.toString())+
+                QString("<td>%1</td>").arg(rx.end.toString(MedDateFormat))+
                 QString("<td>%1</td>").arg(rx.days)+
                 QString("<td>%1</td>").arg(ahi, 0, 'f', 2)+
                 QString("<td>%1</td>").arg(fli, 0, 'f', 2)+
@@ -1174,14 +1177,14 @@ QString Statistics::GenerateCPAPUsage()
                         arg(tr("%1 day of %2 Data on %3")
                             .arg(value)
                             .arg(machine)
-                            .arg(last.toString()));
+                            .arg(last.toString(MedDateFormat)));
             } else {
                 html+=QString("<tr><td colspan=%1 align=center>%2</td></tr>\n").arg(periods.size()+1).
                         arg(tr("%1 days of %2 Data, between %3 and %4")
                             .arg(value)
                             .arg(machine)
-                            .arg(first.toString())
+                            .arg(first.toString(MedDateFormat))
-                            .arg(last.toString()));
+                            .arg(last.toString(MedDateFormat)));
             }
             continue;
         } else if (row.calc == SC_SUBHEADING) {  // subheading..

oscar/translation.cpp

@@ -50,7 +50,7 @@ void initTranslations()
     langNames["en_UK"] = "English (UK)";
     langNames["nl"] = "Nederlands";
     langNames["pt_BR"] = "Portugues (BR)";
-    langNames["ro"] = "Romanian";
+    langNames["ro"] = "Românește";
 
     langNames[DefaultLanguage]="English (US)";
 
@@ -176,7 +176,7 @@ void initTranslations()
         QString qtLang = language.left(2);
         if ( qtLang.compare("zh") == 0 )
             qtLang.append("_CN");
-        qDebug() << "Loading" << langname << "translation" << "qt_" + qtLang + ".qm" << "from" << qtLangPath.toLocal8Bit().data();
+        qDebug() << "Loading" << langname << "QT translation" << "qt_" + qtLang + ".qm" << "from" << qtLangPath.toLocal8Bit().data();
         QTranslator * qtranslator = new QTranslator();
 
         if (!langfile.isEmpty() && !qtranslator->load("qt_" + qtLang + ".qm", qtLangPath)) {
@@ -186,7 +186,7 @@ void initTranslations()
         qApp->installTranslator(qtranslator);
 
         // Install OSCAR translation files
-        qDebug() << "Loading" << langname << "translation" << langfile.toLocal8Bit().data() << "from" << langpath.toLocal8Bit().data();
+        qDebug() << "Loading" << langname << "OSCAR translation" << langfile.toLocal8Bit().data() << "from" << langpath.toLocal8Bit().data();
         QTranslator * translator = new QTranslator();
 
         if (!langfile.isEmpty() && !translator->load(langfile, langpath)) {

oscar/updateparser.h

@@ -43,14 +43,7 @@ class Update
   */
 struct Release {
     Release() {}
-    Release(const Release &copy) {
+    Release(const Release &copy) = default;
-        version = copy.version;
-        codename = copy.version;
-        notes = copy.notes;
-        info_url = copy.info_url;
-        status = copy.status;
-        updates = copy.updates;
-    }
 
     Release(QString ver, QString code, UpdateStatus stat) { version = ver; codename = code; status = stat; }
     QString version;
@@ -94,26 +87,7 @@ class UpdateParser: public QXmlDefaultHandler
 class PackageUpdate {
 public:
     PackageUpdate() {}
-    PackageUpdate(const PackageUpdate & copy) {
+    PackageUpdate(const PackageUpdate & copy) = default;
-        // Seriously, why do I still have to do this crud by hand
-        // Where is the shortcut to save time here in the latest C++ extensions?
-        name = copy.name;
-        displayName = copy.displayName;
-        description = copy.description;
-        versionString = copy.versionString;
-        releaseDate = copy.releaseDate;
-        defaultInstall = copy.defaultInstall;
-        installScript = copy.installScript;
-        dependencies = copy.dependencies;
-        script = copy.script;
-        forcedInstall = copy.forcedInstall;
-        downloadArchives = copy.downloadArchives;
-        license = copy.license;
-        sha1 = copy.sha1;
-        compressedSize = copy.compressedSize;
-        uncompressedSize = copy.uncompressedSize;
-        os = copy.os;
-    }
 
     QString name;
     QString displayName;