Format dates per national settings.

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()
 {

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);
 

oscar/docs/release_notes.html

@@ -13,8 +13,10 @@ Which was written and copyright 2011-2018 © 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/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..