Merge branch 'master' into translations

Building/Windows/BuildInstall.iss

@@ -95,6 +95,11 @@ Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
 Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
 Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"
 
+[InstallDelete]
+Type: files; Name: "{app}\Html\release_notes*.html"
+Type: files; Name: "{app}\Html\credits*.html"
+Type: files; Name: "{app}\Html\about*.html"
+
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1

Htmldocs/release_notes.html

@@ -11,6 +11,16 @@
     <b>For other languages, go to:</b>
     <br><a href=http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes>http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes</a></p>
     <p>
+    <b>Changes and fixes in OSCAR v1.X.Y</b>
+    <br>Portions of OSCAR are © 2019-2020 by
+    <i>The OSCAR Team</i></p>
+    <ul>
+      <li>[fix] Correct calculation of average leak rate on Welcome page.</li>
+      <li>[fix] Correct installation of non-English Release Notes on Windows.</li>
+      <li>[fix] User first and last name in Profile window may now have UTF-8 (non-ASCII) characters.</li>
+      <li>[fix] Fix rare problem of OSCAR crashing with unusual Journal file.</li>
+    </ul>
+    <p>
     <b>Changes and fixes in OSCAR v1.2.0</b>
     <br>Portions of OSCAR are © 2019-2020 by
     <i>The OSCAR Team</i></p>    <ul>

oscar/SleepLib/day.cpp

@@ -98,6 +98,16 @@ Session *Day::find(SessionID sessid)
     return nullptr;
 }
 
+Session *Day::find(SessionID sessid, MachineType mt)
+{
+    for (auto & sess : sessions) {
+        if ((sess->session() == sessid) && (sess->s_machtype == mt)) {
+            return sess;
+        }
+    }
+    return nullptr;
+}
+
 void Day::addSession(Session *s)
 {
     if (s == nullptr) {

oscar/SleepLib/day.h

@@ -202,6 +202,8 @@ class Day
 
     Session *find(SessionID sessid);
 
+    Session *find(SessionID sessid, MachineType mt);
+
     //! \brief Returns the number of Sessions in this day record
     int size() { return sessions.size(); }
 

oscar/SleepLib/loader_plugins/resmed_loader.cpp

@@ -2142,7 +2142,7 @@ void ResDayTask::run()
             quint32 maskoff = resday->str.maskoff[i];
             if ( (maskon > QDateTime::currentDateTime().toTime_t()) ||
                  (maskoff > QDateTime::currentDateTime().toTime_t()) ) {
-                qWarning() << "mask time in future" << resday->date;
+                qWarning() << "mask time in future" << resday->date << "now" << QDateTime::currentDateTime().toTime_t() << "maskon" << maskon << "maskoff" << maskoff;
                 continue;
             }
             if (((maskon>0) && (maskoff>0)) && (maskon != maskoff)) {   //ignore very short sessions
@@ -2184,7 +2184,7 @@ void ResDayTask::run()
         for (int i=0; i < maskOnSize; ++i) {
             if ( (resday->str.maskon[i] > QDateTime::currentDateTime().toTime_t()) ||
                  (resday->str.maskoff[i] > QDateTime::currentDateTime().toTime_t()) ) {
-                qWarning() << "mask time in future" << resday->date;
+                qWarning() << "mask time in future" << resday->date << "now" << QDateTime::currentDateTime().toTime_t() << "maskon" << resday->str.maskon[i] << "maskoff" << resday->str.maskoff[i];
                 continue;
             }
             if (((resday->str.maskon[i]>0) || (resday->str.maskoff[i]>0)) 
@@ -2235,7 +2235,7 @@ void ResDayTask::run()
             EDFduration dur = getEDFDuration(fullpath);
             if ((dur.start > (QDateTime::currentDateTime().toMSecsSinceEpoch()/1000L)) ||
                 (dur.end > (QDateTime::currentDateTime().toMSecsSinceEpoch()/1000L)) ) {
-                qWarning() << "Future Date in" << fullpath;
+                qWarning() << "Future Date in" << fullpath << "now" << QDateTime::currentDateTime().toSecsSinceEpoch() << "maskon" << dur.start << "maskoff" << dur.end;
                 continue;           // skip this file
             }
             for (int i=overlaps.size()-1; i>=0; --i) {

oscar/SleepLib/preferences.cpp

@@ -335,6 +335,9 @@ bool Preferences::Save(QString filename)
 
     QDomDocument doc(p_name);
 
+    QDomProcessingInstruction pi = doc.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"UTF-8\"");
+    doc.appendChild(pi);
+
     QDomElement droot = doc.createElement(STR_AppName);
     doc.appendChild(droot);
 
@@ -368,6 +371,8 @@ bool Preferences::Save(QString filename)
     }
 
     QTextStream ts(&file);
+    ts.setCodec("UTF-8");
+    ts.setGenerateByteOrderMark(true);
     ts << doc.toString();
     file.close();
 

oscar/VERSION

@@ -1,5 +1,4 @@
 // Update the string below to set OSCAR's version and release status.
 // See https://semver.org/spec/v2.0.0.html for details on format.
 
-#define VERSION "1.2.0"
+#define VERSION "1.2.1-alpha.0"
-

oscar/daily.cpp

@@ -560,7 +560,7 @@ void Daily::Link_clicked(const QUrl &url)
     if (code=="togglecpapsession") { // Enable/Disable CPAP session
         day=p_profile->GetDay(previous_date,MT_CPAP);
         if (!day) return;
-        Session *sess=day->find(sid);
+        Session *sess=day->find(sid, MT_CPAP);
         if (!sess)
             return;
 //        int i=webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-webView->page()->mainFrame()->scrollBarValue(Qt::Vertical);
@@ -571,7 +571,7 @@ void Daily::Link_clicked(const QUrl &url)
   //      webView->page()->mainFrame()->setScrollBarValue(Qt::Vertical, webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-i);
     } else  if (code=="toggleoxisession") { // Enable/Disable Oximetry session
         day=p_profile->GetDay(previous_date,MT_OXIMETER);
-        Session *sess=day->find(sid);
+        Session *sess=day->find(sid, MT_OXIMETER);
         if (!sess)
             return;
 //        int i=webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-webView->page()->mainFrame()->scrollBarValue(Qt::Vertical);

oscar/mainwindow.cpp

@@ -1197,38 +1197,42 @@ void MainWindow::updateFavourites()
         if (journal) {
             if (journal->size() > 0) {
                 Session *sess = journal->firstSession(MT_JOURNAL);
-                QString tmp;
+                if (!sess) {
-                bool filtered = !bookmarkFilter.isEmpty();
+                    qWarning() << "null session for MT_JOURNAL first session";
-                bool found = !filtered;
+                } else {
+                    QString tmp;
+                    bool filtered = !bookmarkFilter.isEmpty();
+                    bool found = !filtered;
 
-                if (sess->settings.contains(Bookmark_Start)) {
+                    if (sess->settings.contains(Bookmark_Start)) {
-                    //QVariantList start=sess->settings[Bookmark_Start].toList();
+                        //QVariantList start=sess->settings[Bookmark_Start].toList();
-                    //QVariantList end=sess->settings[Bookmark_End].toList();
+                        //QVariantList end=sess->settings[Bookmark_End].toList();
-                    QStringList notes = sess->settings[Bookmark_Notes].toStringList();
+                        QStringList notes = sess->settings[Bookmark_Notes].toStringList();
 
-                    if (notes.size() > 0) {
+                        if (notes.size() > 0) {
-                        tmp += QString("<tr><td><b><a href='daily=%1'>%2</a></b><br/>")
+                            tmp += QString("<tr><td><b><a href='daily=%1'>%2</a></b><br/>")
-                               .arg(date.toString(Qt::ISODate))
+                                    .arg(date.toString(Qt::ISODate))
-                               .arg(date.toString(MedDateFormat));
+                                    .arg(date.toString(MedDateFormat));
 
-                        tmp += "<list>";
+                            tmp += "<list>";
 
-                        for (int i = 0; i < notes.size(); i++) {
+                            for (int i = 0; i < notes.size(); i++) {
-                            //QDate d=start[i].toDate();
+                                //QDate d=start[i].toDate();
-                            QString note = notes[i];
+                                QString note = notes[i];
 
-                            if (filtered && note.contains(bookmarkFilter, Qt::CaseInsensitive)) {
+                                if (filtered && note.contains(bookmarkFilter, Qt::CaseInsensitive)) {
-                                found = true;
+                                    found = true;
+                                }
+
+                                tmp += "<li>" + note + "</li>";
                             }
 
-                            tmp += "<li>" + note + "</li>";
+                            tmp += "</list></td>";
                         }
-
-                        tmp += "</list></td>";
                     }
-                }
 
-                if (found) { html += tmp; }
+                    if (found) { html += tmp; }
+                }
             }
         }
 

oscar/welcome.cpp

@@ -300,8 +300,8 @@ QString Welcome::GenerateCPAPHTML()
             //EventDataType lat = day->timeAboveThreshold(CPAP_Leak, p_profile->cpap->leakRedline())/ 60.0;
             //EventDataType leaks = 1.0/hours * lat;
 
-            EventDataType leak = day->avg(CPAP_Leak);
+            EventDataType leak = day->wavg(CPAP_Leak);
-            EventDataType leakdays = p_profile->calcAvg(CPAP_Leak, MT_CPAP, starttime, endtime);
+            EventDataType leakdays = p_profile->calcWavg(CPAP_Leak, MT_CPAP, starttime, endtime);
 
             if ((leak < leakdays) && ((leakdays - leak) >= 0.1)) {
                 comp = under;