SPO2 stat decimal rounding, use compliance hours threshold in best/worst ahi stats

daily.cpp

@@ -881,9 +881,9 @@ void Daily::Load(QDate date)
         html+="<tr><td colspan=5 align=center><hr/></td></tr>";
         html+="<tr><td colspan=5 align=center>"+oxi->machine->properties[STR_PROP_Brand]+" "+oxi->machine->properties[STR_PROP_Model]+"</td></tr>\n";
         html+="<tr><td colspan=5 align=center>&nbsp;</td></tr>";
-        html+=QString("<tr><td colspan=5 align=center>%1: %2 (%3)\%</td></tr>").arg(tr("SpO2 Desaturations")).arg(oxi->count(OXI_SPO2Drop)).arg((100.0/oxi->hours()) * (oxi->sum(OXI_SPO2Drop)/3600.0));
+        html+=QString("<tr><td colspan=5 align=center>%1: %2 (%3)\%</td></tr>").arg(tr("SpO2 Desaturations")).arg(oxi->count(OXI_SPO2Drop)).arg((100.0/oxi->hours()) * (oxi->sum(OXI_SPO2Drop)/3600.0),0,'f',2);
-        html+=QString("<tr><td colspan=5 align=center>%1: %2 (%3)\%</td></tr>").arg(tr("Pulse Change events")).arg(oxi->count(OXI_PulseChange)).arg((100.0/oxi->hours()) * (oxi->sum(OXI_PulseChange)/3600.0));
+        html+=QString("<tr><td colspan=5 align=center>%1: %2 (%3)\%</td></tr>").arg(tr("Pulse Change events")).arg(oxi->count(OXI_PulseChange)).arg((100.0/oxi->hours()) * (oxi->sum(OXI_PulseChange)/3600.0),0,'f',2);
-        html+=QString("<tr><td colspan=5 align=center>%1: %2\%</td></tr>").arg(tr("SpO2 Baseline Used")).arg(oxi->settings_wavg(OXI_SPO2Drop));
+        html+=QString("<tr><td colspan=5 align=center>%1: %2\%</td></tr>").arg(tr("SpO2 Baseline Used")).arg(oxi->settings_wavg(OXI_SPO2Drop),0,'f',2);
     }
 
     if (cpap) {

docs/index.html

@@ -12,23 +12,31 @@ a:hover { background-color: inherit; color: red; text-decoration:none; font-weig
 <tr><td bgcolor="#d0d0d0" colspan=2 cellpadding=0 valign=center align=center><font color="black" size=+1><b>Welcome to SleepyHead</b></font></td></tr>
 <tr>
 <td valign="top" leftmargin=0 cellpadding=6>
-<p>This software is currently being designed to assist you in reviewing data for your CPAP Machine, Oximeter, and Sleep Stage monitors, as well as help you <i>track</i> general issues related to sleep health.</p>
+<h3>About SleepyHead</h3>
-<p><i><b>This is STILL a developer preview, features are missing and bugs will be plentyful.</b></i></p>
+<p>This software has been created to assist you in reviewing the data produced by your CPAP Machine or Oximeter, and help you track your progress in your fight against Sleep Disorders.</p>
-<p>Currenly supports the following machines:</p>
+<p>SleepyHead has been designed by a software developer with personal experience with sleep disorders, and shaped by the feedback and testing of many others dealing with similar conditions.</p>
+<p></b>Please Note:</b><i><b>This is a beta release, some features may not yet behave as expected.</b></i><br/>Please report any bugs you find to SleepyHead's SourceForge page.</p>
+<h3>Currenly supported machines:</h3>
 <b>CPAP</b>
-<li>Philips Respironics System One</li>
+<li>Philips Respironics System One (CPAP, Auto, BiPAP & ASV models)</li>
-<li>ResMed S9 models</li>
+<li>ResMed S9 models (CPAP, Auto, VPAP)</li>
-<li>DeVilbiss Intellipap models (*new)</li>
+<li>DeVilbiss Intellipap (Auto)</li>
 <b>Oximetry</b>
-<li>Contec CMS50 Oximeters (*improved)</li>
+<li>Contec CMS50 Oximeters</li>
-<p>I don't recommend using this built in "web browser" to do any major surfing in, it will work, but it's mainly meant as a help browser.
+<p><h3>Online Help Resources</h3></p>
-(It doesn't support SSL encryption.)</p>
+SleepyHead's Online <a href="http://sourceforge.net/apps/mediawiki/sleepyhead/index.php?title=SleepyHead_Users_Guide">Users Guide</a><br/>
-
+<a href="http://sourceforge.net/apps/mediawiki/sleepyhead/index.php?title=Frequently_Asked_Questions">Frequently Asked Questions</a><br/>
+<a href="http://sourceforge.net/apps/mediawiki/sleepyhead/index.php?title=Glossary">Glossary of Sleep Disorder Terms</a><br/>
+<a href="http://sourceforge.net/apps/mediawiki/sleepyhead/index.php?title=Main_Page">SleepyHead Wiki</a><br/><br/>
+SleepyHead's <a href='http://www.sourceforge.net/projects/sleepyhead'>Project Website</a> on SourceForge</p><br/>
+<br/>
+<p>Got a neat idea on how to improve SleepyHead? Check out SleepyHeads <a href="http://sourceforge.net/apps/ideatorrent/sleepyhead/">Idea Torrent</a></p>
+<p><h3>Further Information</h3></p>
+<p><b>Note:</b>I don't recommend using this built in "web browser" to do any major surfing in, it will work, but it's mainly meant as a help browser.
+(It doesn't support SSL encryption, so it's not a good idea to type your passwords or personal details anywhere.)</p>
 <p>
-Here is the <a href="http://sourceforge.net/apps/mediawiki/sleepyhead/index.php?title=Main_Page">SleepyHead Wiki</a><br/>
 Here are the <a href='qrc:/docs/release_notes.html'>release notes</a> for this version.<br/>
 Plus a few <a href='qrc:/docs/usage.html'>usage notes</a>, and some important information for Mac users.<br/>
-SleepyHead's <a href='http://www.sourceforge.net/projects/sleepyhead'>Project Website</a> on SourceForge</p>
 <p>About <a href='http://en.wikipedia.org/wiki/Sleep_apnea'>Sleep Apnea</a> on Wikipedia</p>
 <p>Friendly forums to talk and learn about Sleep Apnea:<br/>
 <a href='http://www.cpaptalk.com'>CPAPTalk Forum</a>,

docs/release_notes.html

@@ -43,7 +43,7 @@ SourceForge is still the best place to report bugs, and this is especially impor
 Thanks to all of you for the wonderful support you've given, by testing the software, reporting bugs, sharing your data, giving kind words of encouragement, monetary donations, and all the cool suggestions on how to make this project even better. </p>
 <p>Special thanks to James M. (BreatheJimbo), who has been a huge help in getting things solid, espescially for Apple Mac users.</p>
 <p>I'm very glad I've had the opportunity to share this project with you all.</p>
-<p>Sleep Well, and have fun! Please be safe over these year end holidays.</p>
+<p>Sleep Well, and have fun!</p>
 <p>Mark Watkins (JediMark)</p>
 </body>
 </html>

mainwindow.cpp

@@ -11,6 +11,7 @@
 #include <QProgressBar>
 #include <QWebHistory>
 #include <QNetworkRequest>
+#include <QDesktopServices>
 #include <QNetworkReply>
 #include <QTimer>
 #include <QSettings>
@@ -144,6 +145,7 @@ MainWindow::MainWindow(QWidget *parent) :
     daily->graphView()->redraw();
 
     ui->recordsBox->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
+    ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
     ui->toolBox->setStyleSheet(
                                "QToolBox::tab {"
                                "background: #6789ab;"
@@ -748,18 +750,21 @@ void MainWindow::on_summaryButton_clicked()
 
             lastchanged=false;
             if (day) {
-                EventDataType ahi=day->count(CPAP_Obstructive)+day->count(CPAP_Hypopnea)+day->count(CPAP_Apnea)+day->count(CPAP_ClearAirway);
+                EventDataType hours=day->hours();
-                if (PROFILE.general->calculateRDI()) ahi+=day->count(CPAP_RERA);
-                ahi/=day->hours();
-                if (ahi > worstAHI) {
-                    worstAHI=ahi;
-                    worstAHIdate=date;
-                }
-                if (ahi < bestAHI) {
-                    bestAHI=ahi;
-                    bestAHIdate=date;
-                }
 
+                if (hours>PROFILE.cpap->complianceHours()) {
+                    EventDataType ahi=day->count(CPAP_Obstructive)+day->count(CPAP_Hypopnea)+day->count(CPAP_Apnea)+day->count(CPAP_ClearAirway);
+                    if (PROFILE.general->calculateRDI()) ahi+=day->count(CPAP_RERA);
+                    ahi/=day->hours();
+                    if (ahi > worstAHI) {
+                        worstAHI=ahi;
+                        worstAHIdate=date;
+                    }
+                    if (ahi < bestAHI) {
+                        bestAHI=ahi;
+                        bestAHIdate=date;
+                    }
+                }
                 mode=(CPAPMode)round(day->settings_wavg(CPAP_Mode));
                 min=day->settings_min(CPAP_PressureMin);
                 if (mode==MODE_CPAP) {
@@ -2025,3 +2030,15 @@ void MainWindow::on_actionView_S_ummary_triggered()
 {
     ui->tabWidget->setCurrentWidget(ui->summaryTab);
 }
+
+void MainWindow::on_webView_linkClicked(const QUrl &url)
+{
+    QString s=url.toString();
+    qDebug() << "Link Clicked" << url;
+    if (s.toLower().startsWith("https:")) {
+        QDesktopServices().openUrl(url);
+
+    } else {
+        ui->webView->setUrl(url);
+    }
+}

mainwindow.h

@@ -251,6 +251,8 @@ private slots:
 
     void on_actionView_S_ummary_triggered();
 
+    void on_webView_linkClicked(const QUrl &arg1);
+
 private:
 
     Ui::MainWindow *ui;

mainwindow.ui

@@ -78,7 +78,7 @@
          <enum>QTabWidget::North</enum>
         </property>
         <property name="currentIndex">
-         <number>0</number>
+         <number>1</number>
         </property>
         <property name="documentMode">
          <bool>false</bool>