From 44a38b27b21d70b1051020e27ccc66f643113e33 Mon Sep 17 00:00:00 2001
From: Jeff Norman <jeff8356@gmail.com>
Date: Fri, 29 May 2020 11:00:13 -0400
Subject: [PATCH 1/5] Fixed some typos in README

---
 README | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 999b4680..a3011b4b 100644
--- a/README
+++ b/README
@@ -19,10 +19,10 @@ All systems need a C++ compiler and linker and the QT platform download.
 Windows Building: See Building/Windows/BUILD-WIN.md
 -----------------
 
-MacOS Building: See Building/Windows/BUILD-mac.md
+MacOS Building: See Building/MacOS/BUILD-mac.md
 ---------------
 
-Linux Building: See Building/Windows/BUILD-Linux-md
+Linux Building: See Building/Linux/BUILD-Linux.md
 ---------------
 
 Software Licensing Information
@@ -30,9 +30,9 @@ Software Licensing Information
 OSCAR is released under the GNU GPL v3 License. Please see below for a note on giving correct attribution
 in redistribution of derivatives.
 
-It is built using Qt SDK (Open Source Edition), available from http://qt.io.
+It is built using Qt SDK (Open Source Edition), available from https://qt.io.
 
-Redistribution of derivatives ( a note added by Mark Watins )
+Redistribution of derivatives ( a note added by Mark Watkins )
 -----------------------------
 Mark Watkins created this software to help lessen the exploitation of others. Seeing his work being used to exploit others
 is incredibly un-motivational, and incredibly disrespectful of all the work he put into this project.

From 88289deec41ff615d3342b5c8779b9f1d16cc1c8 Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Wed, 10 Jun 2020 14:34:18 -0700
Subject: [PATCH 2/5] Clean up Statistics page HTML     Now passes HTML 4.01
 Transitional validator with no errors     Also fix table alignment regression
 introduced in last commit     Adjust column widths differently for Monthly vs
 Standard tables

---
 oscar/statistics.cpp | 218 ++++++++++++++++++++++---------------------
 1 file changed, 113 insertions(+), 105 deletions(-)

diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index a1c2b63b..aa6c0ea9 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -39,7 +39,7 @@ QString resizeHTMLPixmap(QPixmap &pixmap, int width, int height) {
     QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
     buffer.open(QIODevice::WriteOnly);
     pixmap.scaled(width, height, Qt::KeepAspectRatio, Qt::SmoothTransformation).save(&buffer, "PNG");
-    return QString("<img src=\"data:image/png;base64,"+byteArray.toBase64()+"\">");
+    return QString("<img src='data:image/png;base64,"+byteArray.toBase64()+"' ALT='logo'>");
 }
 
 QString formatTime(float time)
@@ -624,44 +624,46 @@ QString Statistics::getUserInfo () {
         return "";
 
     QString address = p_profile->user->address();
-    address.replace("\n", "<br/>");
+    address.replace("\n", "<br>");
 
     QString userinfo = "";
 
     if (!p_profile->user->firstName().isEmpty()) {
-        userinfo = tr("Name: %1, %2").arg(p_profile->user->lastName()).arg(p_profile->user->firstName()) + "<br/>";
+        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(MedDateFormat)) + "<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/>";
+            userinfo += tr("Phone: %1").arg(p_profile->user->phone()) + "<br>";
         }
         if (!p_profile->user->email().isEmpty()) {
-            userinfo += tr("Email: %1").arg(p_profile->user->email()) + "<br/><br/>";
+            userinfo += tr("Email: %1").arg(p_profile->user->email()) + "<br><br>";
         }
         if (!p_profile->user->address().isEmpty()) {
-            userinfo +=  tr("Address:")+"<br/>"+address;
+            userinfo +=  tr("Address:")+"<br>"+address;
         }
     }
 
-    while (userinfo.length() > 0 && userinfo.endsWith("<br/>"))  // Strip trailing newlines
+    while (userinfo.length() > 0 && userinfo.endsWith("<br>"))  // Strip trailing newlines
         userinfo = userinfo.mid(0, userinfo.length()-5);
 
     return userinfo;
 }
 
-const QString table_width = "width=100%";
+const QString table_width = "width='100%'";
 
 // Create the page header in HTML.  Includes everything from <head> through <body>
 QString Statistics::generateHeader(bool onScreen)
 {
-    QString html = QString("<html><head>")+
-            "<style type='text/css'>";
+    QString html = QString("<html><head>");
+    html += "<title>Oscar Statistics Report</title>";
+    html += "<style type='text/css'>";
+
     if (onScreen) {
         html += "p,a,td,body { font-family: '" + QApplication::font().family() + "'; }"
                 "p,a,td,body { font-size: " + QString::number(QApplication::font().pointSize() + 2) + "px; }";
     } else {
-        html += "p,a,td,body { font-family: 'Helvetica'; }";
+        html += "p,a,td,body { font-family: 'Arial'; }";
 //                "p,a,td,body { font-size: 10px; }";
     }
 //    qDebug() << "generateHeader font" << html;
@@ -685,7 +687,7 @@ QString Statistics::generateHeader(bool onScreen)
 
             "</style>"
 
-            "<link rel='stylesheet' type='text/css' href='qrc:/docs/tooltips.css' />"
+            "<link rel='stylesheet' type='text/css' href='qrc:/docs/tooltips.css' >"
 
             "<script type='text/javascript'>"
             "function ChangeColor(tableRow, highLight)"
@@ -695,18 +697,19 @@ QString Statistics::generateHeader(bool onScreen)
 
     "</head>"
 
-    "<body leftmargin=0 topmargin=5 rightmargin=0>";
+    "<body>"; //leftmargin=0 topmargin=5 rightmargin=0>";
 
     QPixmap logoPixmap(":/icons/logo-lg.png");
 
-        html += "<div align=center><table class=curved width='100%'>"
+ //       html += "<div align=center><table class=curved width='100%'>"
+    html += "<div align=center><table class=curved " + table_width + ">"
             "<tr>"
                 "<td align='left' valign='middle'>" + getUserInfo() + "</td>"
                 "<td align='right' valign='middle' width='200'>"
-                    "<font size='+2'>" + STR_TR_OSCAR + "&nbsp;&nbsp;&nbsp;</font><br/>"
+                    "<font size='+2'>" + STR_TR_OSCAR + "&nbsp;&nbsp;&nbsp;</font><br>"
                     "<font size='+1'>" + QObject::tr("Usage Statistics") + "&nbsp;&nbsp;&nbsp;</font>"
                 "</td>"
-                "<td align='right' valign='middle' width='110'>" + resizeHTMLPixmap(logoPixmap,80,80)+"&nbsp;&nbsp;&nbsp;<br/>"
+                "<td align='right' valign='middle' width='110'>" + resizeHTMLPixmap(logoPixmap,80,80)+"&nbsp;&nbsp;&nbsp;<br>"
                 "</td>"
             "</tr>"
             "</table>"
@@ -725,7 +728,7 @@ QString Statistics::generateFooter(bool showinfo)
         QDateTime timestamp = QDateTime::currentDateTime();
         html += tr("This report was prepared on %1 by OSCAR %2").arg(timestamp.toString(MedDateFormat + " hh:mm"))
                                                                      .arg(getVersion())
-                + "<br/>"
+                + "<br>"
                 + tr("OSCAR is free open-source CPAP report software");
         html += "</i></font></div>";
     }
@@ -895,12 +898,12 @@ QString Statistics::GenerateMachineList()
 
     QString html;
     if (mach.size() > 0) {
-        html += "<div align=center><br/>";
+        html += "<div align=center><br>";
 
-        html += QString("<table class=curved style=\"page-break-before:auto;\" "+table_width+">");
+        html += QString("<table class=curved style='page-break-before:auto' "+table_width+">");
 
         html += "<thead>";
-        html += "<tr bgcolor='"+heading_color+"'><th colspan=7 align=center><font size=+2>" + tr("Machine Information") + "</font></th></tr>";
+        html += "<tr bgcolor='"+heading_color+"'><th colspan=7 align=center><font size='+2'>" + tr("Machine Information") + "</font></th></tr>";
 
         html += QString("<tr><td><b>%1</b></td><td><b>%2</b></td><td><b>%3</b></td><td><b>%4</b></td><td><b>%5</b></td></tr>")
                 .arg(STR_TR_Brand)
@@ -956,10 +959,10 @@ QString Statistics::GenerateRXChanges()
     }
 
 
-    QString html = "<div align=center><br/>";
-    html += QString("<table class=curved style=\"page-break-before:always;\" "+table_width+">");
+    QString html = "<div align=center><br>";
+    html += QString("<table class=curved style='page-break-before:always' " + table_width+">");
     html += "<thead>";
-    html += "<tr bgcolor='"+heading_color+"'><th colspan=9 align=center><font size=+2>" + tr("Changes to Machine Settings") + "</font></th></tr>";
+    html += "<tr bgcolor='"+heading_color+"'><th colspan=9 align=center><font size='+2'>" + tr("Changes to Machine Settings") + "</font></th></tr>";
 
 //    QString extratxt;
 
@@ -975,17 +978,17 @@ QString Statistics::GenerateRXChanges()
     hdrlist.push_back(STR_TR_Mode);
     hdrlist.push_back(tr("Pressure Settings"));
 
-    html+="<tr>\n";
+    html+="<tr>";
     for (int i=0; i < hdrlist.size(); ++i) {
-        html+=QString(" <th align=left><b>%1</b></th>\n").arg(hdrlist.at(i));
+        html+=QString(" <th align=left><b>%1</b></th>").arg(hdrlist.at(i));
     }
-    html+="</tr>\n";
+    html+="</tr>";
     html += "</thead>";
 //    html += "<tfoot>";
 //    html += "<tr><td colspan=10 align=center>";
 //    html += QString("<i>") +
 //            tr("Efficacy highlighting ignores prescription settings with less than %1 days of recorded data.").
-//            arg(rxthresh) + QString("</i><br/>");
+//            arg(rxthresh) + QString("</i><br>");
 //    html += "</td></tr>";
 //    html += "</tfoot>";
 
@@ -1045,8 +1048,8 @@ QString Statistics::GenerateRXChanges()
 QString Statistics::htmlNoData()
 {
             QString html = "<div align=center>";
-            html += QString( "<p><font size=\"+3\"><br />" + tr("No data found?!?") + "</font></p>"+
-                    "<p><img src='qrc:/icons/logo-lm.png' width=\"100\" height=\"100\"></p>"
+            html += QString( "<p><font size=\"+3\"><br>" + tr("No data found?!?") + "</font></p>"+
+                    "<p><img src='qrc:/icons/logo-lm.png' alt='logo' width='100' height='100'></p>"
                     "<p><i>"+tr("Oscar has no data to report :(")+"</i></p>");
             return html;
 }
@@ -1107,7 +1110,7 @@ QString Statistics::GenerateCPAPUsage()
 
     // Prepare top of table
     html += "<div align=center>";
-    html += "<table class=curved width="+table_width+">";
+    html += "<table class=curved "+table_width+">";
 
     // Compute number of monthly periods for a monthly rather than standard time distribution
     int number_periods = 0;
@@ -1179,7 +1182,7 @@ QString Statistics::GenerateCPAPUsage()
             int days = p_profile->countDays(row.type, first, last);
             skipsection = (days == 0);
             if (days > 0) {
-                html+=QString("<tr bgcolor='%1'><th colspan=%2 align=center><font size=+2>%3</font></th></tr>\n").
+                html+=QString("<tr bgcolor='%1'><th colspan=%2 align=center><font size='+2'>%3</font></th></tr>").
                         arg(heading_color).arg(periods.size()+1).arg(row.src);
             }
             continue;
@@ -1195,11 +1198,11 @@ QString Statistics::GenerateCPAPUsage()
         } else if (row.calc == SC_COMPLIANCE) {
             name = QString(row.src).arg(p_profile->cpap->m_complianceHours);
         } else if (row.calc == SC_COLUMNHEADERS) {
-            html += QString("<tr><td><b>%1</b></td>\n").arg(tr("Details"));
+            html += QString("<tr><td><b>%1</b></td>").arg(tr("Details"));
             for (int j=0; j < periods.size(); j++) {
-                html += QString("<td onmouseover='ChangeColor(this, \"#eeeeee\");' onmouseout='ChangeColor(this, \"#ffffff\");' onclick='alert(\"overview=%1,%2\");'><b>%3</b></td>\n").arg(periods.at(j).start.toString(Qt::ISODate)).arg(periods.at(j).end.toString(Qt::ISODate)).arg(periods.at(j).header);
+                html += QString("<td onmouseover='ChangeColor(this, \"#eeeeee\");' onmouseout='ChangeColor(this, \"#ffffff\");' onclick='alert(\"overview=%1,%2\");'><b>%3</b></td>").arg(periods.at(j).start.toString(Qt::ISODate)).arg(periods.at(j).end.toString(Qt::ISODate)).arg(periods.at(j).header);
             }
-            html += "</tr>\n";
+            html += "</tr>";
             continue;
         } else if (row.calc == SC_DAYS) {
             QDate first=p_profile->FirstGoodDay(row.type);
@@ -1208,16 +1211,16 @@ QString Statistics::GenerateCPAPUsage()
             int value=p_profile->countDays(row.type, first, last);
 
             if (value == 0) {
-                html+=QString("<tr><td colspan=%1 align=center>%2</td></tr>\n").arg(periods.size()+1).
+                html+=QString("<tr><td colspan=%1 align=center>%2</td></tr>").arg(periods.size()+1).
                         arg(tr("No %1 data available.").arg(machine));
             } else if (value == 1) {
-                html+=QString("<tr><td colspan=%1 align=center>%2</td></tr>\n").arg(periods.size()+1).
+                html+=QString("<tr><td colspan=%1 align=center>%2</td></tr>").arg(periods.size()+1).
                         arg(tr("%1 day of %2 Data on %3")
                             .arg(value)
                             .arg(machine)
                             .arg(last.toString(MedDateFormat)));
             } else {
-                html+=QString("<tr><td colspan=%1 align=center>%2</td></tr>\n").arg(periods.size()+1).
+                html+=QString("<tr><td colspan=%1 align=center>%2</td></tr>").arg(periods.size()+1).
                         arg(tr("%1 days of %2 Data, between %3 and %4")
                             .arg(value)
                             .arg(machine)
@@ -1226,7 +1229,7 @@ QString Statistics::GenerateCPAPUsage()
             }
             continue;
         } else if (row.calc == SC_SUBHEADING) {  // subheading..
-            html+=QString("<tr bgcolor='%1'><td colspan=%2 align=center><b>%3</b></td></tr>\n").
+            html+=QString("<tr bgcolor='%1'><td colspan=%2 align=center><b>%3</b></td></tr>").
                     arg(subheading_color).arg(periods.size()+1).arg(row.src);
             continue;
         } else if (row.calc == SC_UNDEFINED) {
@@ -1239,20 +1242,18 @@ QString Statistics::GenerateCPAPUsage()
             name = calcnames[row.calc].arg(schema::channel[id].fullname());
         }
         QString line;
-        line += QString("<tr class=datarow><td width=22%>%1</td>").arg(name);
         int np = periods.size();
         int width;
+        int dataWidth = 14;
+        int headerWidth = 30;
+        if (p_profile->general->statReportMode() == STAT_MODE_MONTHLY) {
+            dataWidth = 6;
+            headerWidth = 22;
+        }
+        line += QString("<tr class=datarow><td width='%1%'>%2</td>").arg(headerWidth).arg(name);
         for (int j=0; j < np; j++) {
-/***
-            if (p_profile->general->statReportMode() == STAT_MODE_MONTHLY) {
-                width = j < np-1 ? 6 : 100 - (22 + 6*(np-1));
-            } else {
-                width = 78/np;
-            }
-***/
-            width = 78/np;
-
-            line += QString("<td width=%1%>").arg(width);
+            width = j < np-1 ? dataWidth : 100 - (headerWidth + dataWidth*(np-1));
+            line += QString("<td width='%1%'>").arg(width);
             if (!periods.at(j).header.isEmpty()) {
                 line += row.value(periods.at(j).start, periods.at(j).end);
             } else {
@@ -1261,7 +1262,7 @@ QString Statistics::GenerateCPAPUsage()
             line += "</td>";
         }
         html += line;
-        html += "</tr>\n";
+        html += "</tr>";
     }
 
     html += "</table>";
@@ -1320,15 +1321,16 @@ void Statistics::printReport(QWidget * parent) {
 
         QTextDocument doc;
         QSizeF printArea = printer.pageRect(QPrinter::Point).size();
+        qDebug() << "Original print area (in points)" << printArea;
         printArea.setWidth(printArea.width()*2);  // scale up for better font appearance
         printArea.setHeight(printArea.height()*2);
         doc.setPageSize(printArea);  // Set document to print area, in pixels, removing default 2cm margins
 
-        qDebug() << "print area (in points)" << printArea;
-        qDebug() << "page area (in points)" << printer.paperRect(QPrinter::Point).size();
+        qDebug() << "working print area (in points)" << printArea;
+        qDebug() << "paper size (in points)" << printer.paperRect(QPrinter::Point).size();
 
         // Determine appropriate font and font size
-        QFont font = QFont("Helvetica");
+        QFont font = QFont("Arial");
         float fontScalar = 12;
         float printWidth = printArea.width();
         if (printWidth > 1000)
@@ -1341,6 +1343,10 @@ void Statistics::printReport(QWidget * parent) {
 
         doc.setHtml(htmlReportHeaderPrint + htmlUsage + htmlMachineSettings + htmlMachines + htmlReportFooter);
 
+        // Debug HTML
+        QString html = htmlReportHeaderPrint + htmlUsage + htmlMachineSettings + htmlMachines + htmlReportFooter;
+        qDebug() << "Html:" << html;
+
         doc.print(&printer);
     }
 }
@@ -1352,7 +1358,9 @@ QString Statistics::UpdateRecordsBox()
                      "p,a,td,body { font-size: " + QString::number(QApplication::font().pointSize() + 2) + "px; }"
                      "a:link,a:visited { color: inherit; text-decoration: none; }" //font-weight: normal;
                      "a:hover { background-color: inherit; color: white; text-decoration:none; font-weight: bold; }"
-                     "</style></head><body>";
+                     "</style>"
+                     "<title>Machine Statistics Panel</title>"
+                     "</head><body>";
 
     Machine * cpap = p_profile->GetMachine(MT_CPAP);
     if (cpap) {
@@ -1367,10 +1375,10 @@ QString Statistics::UpdateRecordsBox()
 
         float comperc = (100.0 / float(totaldays)) * float(compliant);
 
-        html += "<b>"+tr("CPAP Usage")+"</b><br/>";
-        html += tr("Days Used: %1").arg(totaldays) + "<br/>";
-        html += tr("Low Use Days: %1").arg(totaldays - compliant) + "<br/>";
-        html += tr("Compliance: %1%").arg(comperc, 0, 'f', 1)  + "<br/>";
+        html += "<b>"+tr("CPAP Usage")+"</b><br>";
+        html += tr("Days Used: %1").arg(totaldays) + "<br>";
+        html += tr("Low Use Days: %1").arg(totaldays - compliant) + "<br>";
+        html += tr("Compliance: %1%").arg(comperc, 0, 'f', 1)  + "<br>";
 
         /////////////////////////////////////////////////////////////////////////////////////
         /// AHI Records
@@ -1394,34 +1402,34 @@ QString Statistics::UpdateRecordsBox()
                 }
                 ahilist.insert(ahi, date);
             }
-            html += tr("Days AHI of 5 or greater: %1").arg(baddays) + "<br/><br/>";
+            html += tr("Days AHI of 5 or greater: %1").arg(baddays) + "<br><br>";
 
 
             if (ahilist.size() > (show_records * 2)) {
                 it = ahilist.begin();
                 it_end = ahilist.end();
 
-                html += "<b>"+tr("Best AHI")+"</b><br/>";
+                html += "<b>"+tr("Best AHI")+"</b><br>";
 
                 for (int i=0; (i<show_records) && (it != it_end); ++i, ++it) {
                     html += QString("<a href='daily=%1'>").arg(it.value().toString(Qt::ISODate))
-                            +tr("Date: %1 AHI: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "</a><br/>";
+                            +tr("Date: %1 AHI: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "</a><br>";
 
                 }
 
-                html += "<br/>";
+                html += "<br>";
 
-                html += "<b>"+tr("Worst AHI")+"</b><br/>";
+                html += "<b>"+tr("Worst AHI")+"</b><br>";
 
                 it = ahilist.end() - 1;
                 it_end = ahilist.begin();
                 for (int i=0; (i<show_records) && (it != it_end); ++i, --it) {
                     html += QString("<a href='daily=%1'>").arg(it.value().toString(Qt::ISODate))
-                        +tr("Date: %1 AHI: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "</a><br/>";
+                        +tr("Date: %1 AHI: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "</a><br>";
 
                 }
 
-                html += "<br/>";
+                html += "<br>";
             }
 
             /////////////////////////////////////////////////////////////////////////////////////
@@ -1448,32 +1456,32 @@ QString Statistics::UpdateRecordsBox()
                 it = ahilist.begin();
                 it_end = ahilist.end();
 
-                html += "<b>"+tr("Best Flow Limitation")+"</b><br/>";
+                html += "<b>"+tr("Best Flow Limitation")+"</b><br>";
 
                 for (int i=0; (i<show_records) && (it != it_end); ++i, ++it) {
                     html += QString("<a href='daily=%1'>").arg(it.value().toString(Qt::ISODate))
-                        +tr("Date: %1 FL: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "</a><br/>";
+                        +tr("Date: %1 FL: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "</a><br>";
 
                 }
 
-                html += "<br/>";
+                html += "<br>";
 
-                html += "<b>"+tr("Worst Flow Limtation")+"</b><br/>";
+                html += "<b>"+tr("Worst Flow Limtation")+"</b><br>";
 
                 it = ahilist.end() - 1;
                 it_end = ahilist.begin();
                 for (int i=0; (i<show_records) && (it != it_end); ++i, --it) {
                     if (it.key() > 0) {
                         html += QString("<a href='daily=%1'>").arg(it.value().toString(Qt::ISODate))
-                            +tr("Date: %1 FL: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "</a><br/>";
+                            +tr("Date: %1 FL: %2").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "</a><br>";
                         cnt++;
                     }
                 }
                 if (cnt == 0) {
-                    html+= "<i>"+tr("No Flow Limitation on record")+"</i><br/>";
+                    html+= "<i>"+tr("No Flow Limitation on record")+"</i><br>";
                 }
 
-                html += "<br/>";
+                html += "<br>";
             }
 
             /////////////////////////////////////////////////////////////////////////////////////
@@ -1491,7 +1499,7 @@ QString Statistics::UpdateRecordsBox()
 
             cnt = 0;
             if (ahilist.size() > (show_records * 2)) {
-                html += "<b>"+tr("Worst Large Leaks")+"</b><br/>";
+                html += "<b>"+tr("Worst Large Leaks")+"</b><br>";
 
                 it = ahilist.end() - 1;
                 it_end = ahilist.begin();
@@ -1499,16 +1507,16 @@ QString Statistics::UpdateRecordsBox()
                 for (int i=0; (i<show_records) && (it != it_end); ++i, --it) {
                     if (it.key() > 0) {
                         html += QString("<a href='daily=%1'>").arg(it.value().toString(Qt::ISODate))
-                            +tr("Date: %1 Leak: %2%").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "</a><br/>";
+                            +tr("Date: %1 Leak: %2%").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "</a><br>";
                         cnt++;
                     }
 
                 }
                 if (cnt == 0) {
-                    html+= "<i>"+tr("No Large Leaks on record")+"</i><br/>";
+                    html+= "<i>"+tr("No Large Leaks on record")+"</i><br>";
                 }
 
-                html += "<br/>";
+                html += "<br>";
             }
 
 
@@ -1528,7 +1536,7 @@ QString Statistics::UpdateRecordsBox()
                 }
 
                 if (ahilist.size() > (show_records * 2)) {
-                    html += "<b>"+tr("Worst CSR")+"</b><br/>";
+                    html += "<b>"+tr("Worst CSR")+"</b><br>";
 
                     it = ahilist.end() - 1;
                     it_end = ahilist.begin();
@@ -1536,15 +1544,15 @@ QString Statistics::UpdateRecordsBox()
 
                         if (it.key() > 0) {
                             html += QString("<a href='daily=%1'>").arg(it.value().toString(Qt::ISODate))
-                                +tr("Date: %1 CSR: %2%").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "</a><br/>";
+                                +tr("Date: %1 CSR: %2%").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "</a><br>";
                             cnt++;
                         }
                     }
                     if (cnt == 0) {
-                        html+= "<i>"+tr("No CSR on record")+"</i><br/>";
+                        html+= "<i>"+tr("No CSR on record")+"</i><br>";
                     }
 
-                    html += "<br/>";
+                    html += "<br>";
                 }
             }
             if (p_profile->hasChannel(CPAP_PB)) {
@@ -1558,7 +1566,7 @@ QString Statistics::UpdateRecordsBox()
                 }
 
                 if (ahilist.size() > (show_records * 2)) {
-                    html += "<b>"+tr("Worst PB")+"</b><br/>";
+                    html += "<b>"+tr("Worst PB")+"</b><br>";
 
                     it = ahilist.end() - 1;
                     it_end = ahilist.begin();
@@ -1566,22 +1574,22 @@ QString Statistics::UpdateRecordsBox()
 
                         if (it.key() > 0) {
                             html += QString("<a href='daily=%1'>").arg(it.value().toString(Qt::ISODate))
-                                +tr("Date: %1 PB: %2%").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "</a><br/>";
+                                +tr("Date: %1 PB: %2%").arg(it.value().toString(Qt::SystemLocaleShortDate)).arg(it.key(), 0, 'f', 2) + "</a><br>";
                             cnt++;
                         }
                     }
                     if (cnt == 0) {
-                        html+= "<i>"+tr("No PB on record")+"</i><br/>";
+                        html+= "<i>"+tr("No PB on record")+"</i><br>";
                     }
 
-                    html += "<br/>";
+                    html += "<br>";
                 }
             }
 
         } else {
-            html += "<br/><b>"+tr("Want more information?")+"</b><br/>";
-            html += "<i>"+tr("OSCAR needs all summary data loaded to calculate best/worst data for individual days.")+"</i><br/><br/>";
-            html += "<i>"+tr("Please enable Pre-Load Summaries checkbox in preferences to make sure this data is available.")+"</i><br/><br/>";
+            html += "<br><b>"+tr("Want more information?")+"</b><br>";
+            html += "<i>"+tr("OSCAR needs all summary data loaded to calculate best/worst data for individual days.")+"</i><br><br>";
+            html += "<i>"+tr("Please enable Pre-Load Summaries checkbox in preferences to make sure this data is available.")+"</i><br><br>";
         }
 
 
@@ -1601,29 +1609,29 @@ QString Statistics::UpdateRecordsBox()
 
 
         if (list.size() >= 2) {
-            html += "<b>"+tr("Best RX Setting")+"</b><br/>";
+            html += "<b>"+tr("Best RX Setting")+"</b><br>";
             const RXItem & rxbest = *list.at(0);
             html += QString("<a href='overview=%1,%2'>").arg(rxbest.start.toString(Qt::ISODate)).arg(rxbest.end.toString(Qt::ISODate)) +
-                tr("Date: %1 - %2").arg(rxbest.start.toString(Qt::SystemLocaleShortDate)).arg(rxbest.end.toString(Qt::SystemLocaleShortDate)) + "</a><br/>";
-            html += QString("%1").arg(rxbest.machine->model()) + "<br/>";
-            html += QString("Serial: %1").arg(rxbest.machine->serial()) + "<br/>";
-            html += tr("AHI: %1").arg(double(rxbest.ahi) / rxbest.hours, 0, 'f', 2) + "<br/>";
-            html += tr("Total Hours: %1").arg(rxbest.hours, 0, 'f', 2) + "<br/>";
-            html += QString("%1").arg(rxbest.pressure) + "<br/>";
-            html += QString("%1").arg(formatRelief(rxbest.relief)) + "<br/>";
-            html += "<br/>";
+                tr("Date: %1 - %2").arg(rxbest.start.toString(Qt::SystemLocaleShortDate)).arg(rxbest.end.toString(Qt::SystemLocaleShortDate)) + "</a><br>";
+            html += QString("%1").arg(rxbest.machine->model()) + "<br>";
+            html += QString("Serial: %1").arg(rxbest.machine->serial()) + "<br>";
+            html += tr("AHI: %1").arg(double(rxbest.ahi) / rxbest.hours, 0, 'f', 2) + "<br>";
+            html += tr("Total Hours: %1").arg(rxbest.hours, 0, 'f', 2) + "<br>";
+            html += QString("%1").arg(rxbest.pressure) + "<br>";
+            html += QString("%1").arg(formatRelief(rxbest.relief)) + "<br>";
+            html += "<br>";
 
-            html += "<b>"+tr("Worst RX Setting")+"</b><br/>";
+            html += "<b>"+tr("Worst RX Setting")+"</b><br>";
             const RXItem & rxworst = *list.at(list.size() -1);
             html += QString("<a href='overview=%1,%2'>").arg(rxworst.start.toString(Qt::ISODate)).arg(rxworst.end.toString(Qt::ISODate)) +
-                    tr("Date: %1 - %2").arg(rxworst.start.toString(Qt::SystemLocaleShortDate)).arg(rxworst.end.toString(Qt::SystemLocaleShortDate)) + "</a><br/>";
-            html += QString("%1").arg(rxworst.machine->model()) + "<br/>";
-            html += QString("Serial: %1").arg(rxworst.machine->serial()) + "<br/>";
-            html += tr("AHI: %1").arg(double(rxworst.ahi) / rxworst.hours, 0, 'f', 2) + "<br/>";
-            html += tr("Total Hours: %1").arg(rxworst.hours, 0, 'f', 2) + "<br/>";
+                    tr("Date: %1 - %2").arg(rxworst.start.toString(Qt::SystemLocaleShortDate)).arg(rxworst.end.toString(Qt::SystemLocaleShortDate)) + "</a><br>";
+            html += QString("%1").arg(rxworst.machine->model()) + "<br>";
+            html += QString("Serial: %1").arg(rxworst.machine->serial()) + "<br>";
+            html += tr("AHI: %1").arg(double(rxworst.ahi) / rxworst.hours, 0, 'f', 2) + "<br>";
+            html += tr("Total Hours: %1").arg(rxworst.hours, 0, 'f', 2) + "<br>";
 
-            html += QString("%1").arg(rxworst.pressure) + "<br/>";
-            html += QString("%1").arg(formatRelief(rxworst.relief)) + "<br/>";
+            html += QString("%1").arg(rxworst.pressure) + "<br>";
+            html += QString("%1").arg(formatRelief(rxworst.relief)) + "<br>";
         }
     }
 

From b7223560bd6e8495e477737482ad54d4a4da8aea Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Wed, 10 Jun 2020 14:46:55 -0700
Subject: [PATCH 3/5] Remove excess diagnostics from statistics.cpp

---
 oscar/statistics.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index aa6c0ea9..c99788a5 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -1344,8 +1344,8 @@ void Statistics::printReport(QWidget * parent) {
         doc.setHtml(htmlReportHeaderPrint + htmlUsage + htmlMachineSettings + htmlMachines + htmlReportFooter);
 
         // Debug HTML
-        QString html = htmlReportHeaderPrint + htmlUsage + htmlMachineSettings + htmlMachines + htmlReportFooter;
-        qDebug() << "Html:" << html;
+//        QString html = htmlReportHeaderPrint + htmlUsage + htmlMachineSettings + htmlMachines + htmlReportFooter;
+//        qDebug() << "Html:" << html;
 
         doc.print(&printer);
     }

From 059437b40cc6f412941b69a12a83fdd42e3fc96d Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Thu, 11 Jun 2020 11:01:28 -0700
Subject: [PATCH 4/5] Fix margins problem when printing statistics page on
 MacOS     Despite havine a 3.3 mm margin on Windows, Linux and MacOS use a 12
 mm bottom margin for an HP printer     Set margins to 10,10,10,12 unless
 printer reports a larger margin; then use larger margin     Reduce debug
 messages     Fix regression that trimmed last character from user information
 lines     Continue use of Helvetica font for printing Statistics     Adjust
 column sizes for Standard vs Monthly reports

---
 oscar/statistics.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index c99788a5..df4b00a3 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -645,7 +645,7 @@ QString Statistics::getUserInfo () {
     }
 
     while (userinfo.length() > 0 && userinfo.endsWith("<br>"))  // Strip trailing newlines
-        userinfo = userinfo.mid(0, userinfo.length()-5);
+        userinfo = userinfo.mid(0, userinfo.length()-4);
 
     return userinfo;
 }
@@ -663,7 +663,7 @@ QString Statistics::generateHeader(bool onScreen)
         html += "p,a,td,body { font-family: '" + QApplication::font().family() + "'; }"
                 "p,a,td,body { font-size: " + QString::number(QApplication::font().pointSize() + 2) + "px; }";
     } else {
-        html += "p,a,td,body { font-family: 'Arial'; }";
+        html += "p,a,td,body { font-family: 'Helvetica'; }";
 //                "p,a,td,body { font-size: 10px; }";
     }
 //    qDebug() << "generateHeader font" << html;
@@ -1312,7 +1312,11 @@ void Statistics::printReport(QWidget * parent) {
     printer.setOrientation(QPrinter::Portrait);
     printer.setFullPage(false);     // Print only on printable area of page and not in non-printable margins
     printer.setNumCopies(1);
-    printer.setPageMargins(10, 10, 10, 10, QPrinter::Millimeter);
+
+    QMarginsF minMargins = printer.pageLayout().margins(QPageLayout::Millimeter);
+    printer.setPageMargins(fmax(10,minMargins.left()), fmax(10,minMargins.top()), fmax(10,minMargins.right()), fmax(12,minMargins.bottom()), QPrinter::Millimeter);
+    QMarginsF setMargins = printer.pageLayout().margins(QPageLayout::Millimeter);
+    qDebug () << "Min margins" << minMargins << "Set margins" << setMargins << "millimeters";
 
     // Show print dialog to user and allow them to change settings as desired
     QPrintDialog pdlg(&printer, parent);
@@ -1321,16 +1325,15 @@ void Statistics::printReport(QWidget * parent) {
 
         QTextDocument doc;
         QSizeF printArea = printer.pageRect(QPrinter::Point).size();
-        qDebug() << "Original print area (in points)" << printArea;
+        QSizeF originalPrintArea = printArea;
         printArea.setWidth(printArea.width()*2);  // scale up for better font appearance
         printArea.setHeight(printArea.height()*2);
         doc.setPageSize(printArea);  // Set document to print area, in pixels, removing default 2cm margins
 
-        qDebug() << "working print area (in points)" << printArea;
-        qDebug() << "paper size (in points)" << printer.paperRect(QPrinter::Point).size();
+        qDebug() << "print area (points)" << originalPrintArea << "Enlarged print area" << printArea << "paper size" << printer.paperRect(QPrinter::Point).size();
 
         // Determine appropriate font and font size
-        QFont font = QFont("Arial");
+        QFont font = QFont("Helvetica");
         float fontScalar = 12;
         float printWidth = printArea.width();
         if (printWidth > 1000)
@@ -1339,11 +1342,11 @@ void Statistics::printReport(QWidget * parent) {
         font.setPointSize(round(pointSize)); // Scale the font
         doc.setDefaultFont(font);
 
-        qDebug() << "Printer font set to" << font << "and printer default font is now" << doc.defaultFont();
+        qDebug() << "Enlarged printer font" << font << "printer default font set" << doc.defaultFont();
 
         doc.setHtml(htmlReportHeaderPrint + htmlUsage + htmlMachineSettings + htmlMachines + htmlReportFooter);
 
-        // Debug HTML
+        // Dump HTML for use with HTML4 validator
 //        QString html = htmlReportHeaderPrint + htmlUsage + htmlMachineSettings + htmlMachines + htmlReportFooter;
 //        qDebug() << "Html:" << html;
 

From 11dfa09c7b089ebfb29c60bea4010244f6fc7794 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Fri, 26 Jun 2020 12:53:52 -0400
Subject: [PATCH 5/5] Add preliminary support for rare time-adjustment event
 observed on PRS1 550P.

Also add 900X150 to the list of tested machines, and update other warnings
based on new test data.
---
 Htmldocs/release_notes.html                   | 11 +++++
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 40 ++++++++++++-------
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index d7a6f4c4..3171480c 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -7,6 +7,17 @@
     <meta content="The OSCAR Team" name="author" >
   </head>
   <body>
+    <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>[new] Additional Philips Respironics devices tested and fully supported:
+        <ul>
+          <li>DreamStation BiPAP autoSV (900X150)</li>
+        </ul>
+      <li>[fix] Improve support for rare events in 50-series Philips Respironics devices.</li>
+    </ul>
     <p>
     <b>Changes and fixes in OSCAR v1.1.1</b>
     <br>Portions of OSCAR are © 2019-2020 by
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 57845487..a7f84e7b 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -295,6 +295,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
     { "960T",    5, 2, "BiPAP autoSV Advanced 30 (System One 60 Series)" },  // omits "(System One 60 Series)" on official reports
     { "900X110", 5, 3, "DreamStation BiPAP autoSV" },
     { "900X120", 5, 3, "DreamStation BiPAP autoSV" },
+    { "900X150", 5, 3, "DreamStation BiPAP autoSV" },
     
     { "1061401",  3, 0, "BiPAP S/T (C Series)" },
     { "1061T",    3, 3, "BiPAP S/T 30 (System One 60 Series)" },
@@ -3602,23 +3603,33 @@ bool PRS1DataChunk::ParseEventsF0V23()
             break;
         }
         startpos = pos;
-        if (code != 0x12) {  // This one event has no timestamp in F0V6
-            t += data[pos] | (data[pos+1] << 8);
+        if (code != 0x12 && code != 0x01) {  // This one event has no timestamp in F0V6
+            elapsed = data[pos] | (data[pos+1] << 8);
+            if (elapsed > 0x7FFF) UNEXPECTED_VALUE(elapsed, "<32768s");  // check whether this is generally unsigned, since 0x01 isn't
+            t += elapsed;
             pos += 2;
         }
 
         switch (code) {
-            case 0x00:  // ??? So far only seen on 451P and 551P occasionally, usually no more than once per session
-                // A nonzero delta corresponds to an N-second gap in data (value was 0x85, only seen once). Look for more.
-                if (sessionid != 122) CHECK_VALUE(data[startpos], 0);  // skip the onc occurrence already seen
-                CHECK_VALUE(data[startpos+1], 0);
-                if (data[pos] < 0x80 || data[pos] > 0x85) {
-                    UNEXPECTED_VALUE(data[pos], "0x80-0x85");
-                    DUMP_EVENT();
-                }
+            case 0x00:  // Humidifier setting change (logged in summary in 60 series)
+                ParseHumidifierSetting50Series(data[pos]);
                 if (this->familyVersion == 3) DUMP_EVENT();
                 break;
-            //case 0x01:  // never seen
+            case 0x01:  // Time elapsed?
+                // Only seen once, on a 550P.
+                // It looks almost like a time-elapsed event 4 found in F0V4 summaries, but
+                // 0xFFCC looks like it represents a time adjustment of -52 seconds,
+                // since the subsequent 0x11 statistics event has a time offset of 172 seconds,
+                // and counting this as -52 seconds results in a total session time that
+                // matches the summary and waveform data. Very weird.
+                CHECK_VALUE(data[pos], 0xCC);
+                CHECK_VALUE(data[pos+1], 0xFF);
+                elapsed = data[pos] | (data[pos+1] << 8);
+                if (elapsed & 0x8000) {
+                    elapsed = (~0xFFFF | elapsed);  // sign extend 16-bit number to native int
+                }
+                t += elapsed;
+                break;
             case 0x02:  // Pressure adjustment
                 // See notes in ParseEventsF0V6.
                 this->AddEvent(new PRS1PressureSetEvent(t, data[pos]));
@@ -5083,7 +5094,7 @@ bool PRS1DataChunk::ParseSummaryF0V4(void)
                 CHECK_VALUE(chunk_size, 1);  // and the only record in the session.
                 if (this->sessionid == 1) UNEXPECTED_VALUE(this->sessionid, ">1");
                 break;
-            case 7:  // Humidifier setting change
+            case 7:  // Humidifier setting change (logged in events in 50 series)
                 tt += data[pos] | (data[pos+1] << 8);  // This adds to the total duration (otherwise it won't match report)
                 this->ParseHumidifierSetting60Series(data[pos+2], data[pos+3]);
                 break;
@@ -6783,8 +6794,7 @@ void PRS1DataChunk::ParseHumidifierSettingV3(unsigned char byte1, unsigned char
         // All variations seen.
     } else if (family == 5) {
         if (tubepresent) {
-            if (tubetemp != 0 && tubetemp > 4) UNEXPECTED_VALUE(tubetemp, "<= 4");
-            // All humidity levels seen.
+            // All tube temperature and humidity levels seen.
         } else if (humidadaptive) {
             // All humidity levels seen.
         } else if (humidfixed) {
@@ -8689,7 +8699,7 @@ bool PRS1DataChunk::ReadHeader(QFile & f)
 
         // Do a few early sanity checks before any variable-length header data.
         if (this->blockSize == 0) {
-            qWarning() << this->m_path << "blocksize 0?";
+            qWarning() << this->m_path << "@" << hex << this->m_filepos << "blocksize 0, skipping remainder of file";
             break;
         }
         if (this->fileVersion < 2 || this->fileVersion > 3) {