New welcome page, and some unfinished work on a crash

sleepyhead/Graphs/gGraph.cpp

@@ -679,6 +679,7 @@ qint64 gGraph::currentTime() const
 void gGraph::mouseMoveEvent(QMouseEvent *event)
 {
     // qDebug() << m_title << "Move" << event->pos() << m_graphview->pointClicked();
+    if (m_rect.width() == 0) return;
     int y = event->y();
     int x = event->x();
 
@@ -698,6 +699,7 @@ void gGraph::mouseMoveEvent(QMouseEvent *event)
 
     int w = m_rect.width() - left - right;
 
+
     double xx = max_x - min_x;
     double xmult = xx / w;
 
@@ -713,6 +715,7 @@ void gGraph::mouseMoveEvent(QMouseEvent *event)
         a *= xmult;
         a += m_blockzoom ? rmin_x : min_x;
 
+        m_currentTime = a;
         m_graphview->setCurrentTime(a);
     }
 
@@ -850,6 +853,7 @@ void gGraph::mousePressEvent(QMouseEvent *event)
 
 void gGraph::mouseReleaseEvent(QMouseEvent *event)
 {
+
     int y = event->pos().y();
     int x = event->pos().x();
 

sleepyhead/Graphs/gGraph.h

@@ -349,6 +349,10 @@ class gGraph : public QObject
     QRect m_rect;
 
     qint64 m_selectedDuration;
+
+    qint64 m_currentTime;
+    qint64 m_clickTime;
+
     QString m_selDurString;
 
   protected slots:

sleepyhead/Graphs/gGraphView.cpp

@@ -1292,10 +1292,10 @@ void gGraphView::mouseMoveEvent(QMouseEvent *event)
                 m_horiz_travel += qAbs(x - m_lastxpos) + qAbs(y - m_lastypos);
                 m_lastxpos = x;
                 m_lastypos = y;
-                //           QPoint p(x,y);
-                //           QMouseEvent e(event->type(),p,event->button(),event->buttons(),event->modifiers());
-                m_graphs[i]->mouseMoveEvent(event);
-
+                gGraph *g = m_graphs[i];
+                if (g) {
+                    g->mouseMoveEvent(event);
+                }
 
             }
 
@@ -1371,13 +1371,13 @@ void gGraphView::mousePressEvent(QMouseEvent *event)
     // first handle pinned graphs.
     // Calculate total height of all pinned graphs
     for (int i = 0; i < m_graphs.size(); i++) {
-        if (m_graphs[i]->isEmpty()
-                || !m_graphs[i]->visible()
-                || !m_graphs[i]->isPinned()) {
+        gGraph *g = m_graphs[i];
+
+        if (!g || g->isEmpty() || !g->visible() || !g->isPinned()) {
             continue;
         }
 
-        h = m_graphs[i]->height() * m_scaleY;
+        h = g->height() * m_scaleY;
         pinned_height += h + graphSpacer;
 
         if (py > height()) {
@@ -1423,8 +1423,8 @@ void gGraphView::mousePressEvent(QMouseEvent *event)
                     m_metaselect = event->modifiers() && Qt::AltModifier;
                     m_horiz_travel = 0;
                     m_graph_index = i;
-                    m_selected_graph = m_graphs[i];
-                    m_graphs[i]->mousePressEvent(event);
+                    m_selected_graph = g;
+                    g->mousePressEvent(event);
                 }
 
                 done = true;
@@ -1443,10 +1443,12 @@ void gGraphView::mousePressEvent(QMouseEvent *event)
 
     if (!done)
         for (int i = 0; i < m_graphs.size(); i++) {
+            gGraph * g = m_graphs[i];
+            if (!g) continue;
 
-            if (m_graphs[i]->isEmpty() || !m_graphs[i]->visible() || m_graphs[i]->isPinned()) { continue; }
+            if (!g || g->isEmpty() || !g->visible() || g->isPinned()) { continue; }
 
-            h = m_graphs[i]->height() * m_scaleY;
+            h = g->height() * m_scaleY;
 
             if (py > height()) {
                 break;
@@ -1486,8 +1488,8 @@ void gGraphView::mousePressEvent(QMouseEvent *event)
 
                         m_horiz_travel = 0;
                         m_graph_index = i;
-                        m_selected_graph = m_graphs[i];
-                        m_graphs[i]->mousePressEvent(event);
+                        m_selected_graph = g;
+                        g->mousePressEvent(event);
                     }
                 }
 
@@ -1508,11 +1510,13 @@ void gGraphView::mouseReleaseEvent(QMouseEvent *event)
 
     // Handle pinned graphs first
     for (int i = 0; i < m_graphs.size(); i++) {
-        if (m_graphs[i]->isEmpty() || !m_graphs[i]->visible() || !m_graphs[i]->isPinned()) {
+        gGraph *g = m_graphs[i];
+
+        if (!g || g->isEmpty() || !g->visible() || !g->isPinned()) {
             continue;
         }
 
-        h = m_graphs[i]->height() * m_scaleY;
+        h = g->height() * m_scaleY;
         pinned_height += h + graphSpacer;
 
         if (py > height()) {
@@ -1525,7 +1529,7 @@ void gGraphView::mouseReleaseEvent(QMouseEvent *event)
         } else if ((y >= py + 1) && (y <= py + h)) {
 
             //            if (!m_sizer_dragging && !m_graph_dragging) {
-            //                m_graphs[i]->mouseReleaseEvent(event);
+            //               g->mouseReleaseEvent(event);
             //            }
 
             if (x >= titleWidth + 10) {
@@ -1546,12 +1550,13 @@ void gGraphView::mouseReleaseEvent(QMouseEvent *event)
 
     if (done)
         for (int i = 0; i < m_graphs.size(); i++) {
+            gGraph *g = m_graphs[i];
 
-            if (m_graphs[i]->isEmpty() || !m_graphs[i]->visible() || m_graphs[i]->isPinned()) {
+            if (!g || g->isEmpty() || !g->visible() || g->isPinned()) {
                 continue;
             }
 
-            h = m_graphs[i]->height() * m_scaleY;
+            h = g->height() * m_scaleY;
 
             if (py > height()) {
                 break;    // we are done.. can't draw anymore
@@ -1562,7 +1567,7 @@ void gGraphView::mouseReleaseEvent(QMouseEvent *event)
             } else if ((y >= py + 1) && (y <= py + h)) {
 
                 //            if (!m_sizer_dragging && !m_graph_dragging) {
-                //                m_graphs[i]->mouseReleaseEvent(event);
+                //                g->mouseReleaseEvent(event);
                 //            }
 
                 if (x >= titleWidth + 10) {
@@ -1602,7 +1607,9 @@ void gGraphView::mouseReleaseEvent(QMouseEvent *event)
         if (m_metaselect) {
             m_point_released = event->pos();
         } else {
-            m_graphs[m_graph_index]->mouseReleaseEvent(event);
+            if (m_graphs[m_graph_index]) {
+                m_graphs[m_graph_index]->mouseReleaseEvent(event);
+            }
         }
     }
 }
@@ -1651,11 +1658,12 @@ void gGraphView::mouseDoubleClickEvent(QMouseEvent *event)
 
     // Handle pinned graphs first
     for (int i = 0; i < m_graphs.size(); i++) {
-        if (m_graphs[i]->isEmpty() || !m_graphs[i]->visible() || !m_graphs[i]->isPinned()) {
+        gGraph *g = m_graphs[i];
+        if (!g || g->isEmpty() || !g->visible() || !g->isPinned()) {
             continue;
         }
 
-        h = m_graphs[i]->height() * m_scaleY;
+        h = g->height() * m_scaleY;
         pinned_height += h + graphSpacer;
 
         if (py > height()) {
@@ -1667,13 +1675,13 @@ void gGraphView::mouseDoubleClickEvent(QMouseEvent *event)
                 if (x < titleWidth) {
                     // What to do when double clicked on the graph title ??
 
-                    m_graphs[i]->mouseDoubleClickEvent(event);
+                    g->mouseDoubleClickEvent(event);
                     // pin the graph??
-                    m_graphs[i]->setPinned(false);
+                    g->setPinned(false);
                     redraw();
                 } else {
                     // send event to graph..
-                    m_graphs[i]->mouseDoubleClickEvent(event);
+                    g->mouseDoubleClickEvent(event);
                 }
 
                 done = true;
@@ -1693,12 +1701,12 @@ void gGraphView::mouseDoubleClickEvent(QMouseEvent *event)
 
     if (!done) // then handle unpinned graphs
         for (int i = 0; i < m_graphs.size(); i++) {
-
-            if (m_graphs[i]->isEmpty() || !m_graphs[i]->visible() || m_graphs[i]->isPinned()) {
+            gGraph *g = m_graphs[i];
+            if (!g || g->isEmpty() || !g->visible() || g->isPinned()) {
                 continue;
             }
 
-            h = m_graphs[i]->height() * m_scaleY;
+            h = g->height() * m_scaleY;
 
             if (py > height()) {
                 break;
@@ -1708,13 +1716,13 @@ void gGraphView::mouseDoubleClickEvent(QMouseEvent *event)
                 if ((y >= py) && (y <= py + h)) {
                     if (x < titleWidth) {
                         // What to do when double clicked on the graph title ??
-                        m_graphs[i]->mouseDoubleClickEvent(event);
+                        g->mouseDoubleClickEvent(event);
 
-                        m_graphs[i]->setPinned(true);
+                        g->setPinned(true);
                         redraw();
                     } else {
                         // send event to graph..
-                        m_graphs[i]->mouseDoubleClickEvent(event);
+                        g->mouseDoubleClickEvent(event);
                     }
                 } else if ((y >= py + h) && (y <= py + h + graphSpacer + 1)) {
                     // What to do when double clicked on the resize handle?
@@ -1726,6 +1734,7 @@ void gGraphView::mouseDoubleClickEvent(QMouseEvent *event)
             py += graphSpacer; // do we want the extra spacer down the bottom?
         }
 }
+
 void gGraphView::wheelEvent(QWheelEvent *event)
 {
     // Hmm.. I could optionalize this to change mousewheel behaviour without affecting the scrollbar now..
@@ -1739,10 +1748,10 @@ void gGraphView::wheelEvent(QWheelEvent *event)
         float h;
 
         for (int i = 0; i < m_graphs.size(); i++) {
+            gGraph *g = m_graphs[i];
+            if (!g || g->isEmpty() || !g->visible()) { continue; }
 
-            if (m_graphs[i]->isEmpty() || (!m_graphs[i]->visible())) { continue; }
-
-            h = m_graphs[i]->height() * m_scaleY;
+            h = g->height() * m_scaleY;
 
             if (py > height()) {
                 break;
@@ -1755,7 +1764,7 @@ void gGraphView::wheelEvent(QWheelEvent *event)
                     } else {
                         // send event to graph..
                         if (!m_button_down) {
-                            m_graphs[i]->wheelEvent(event);
+                            g->wheelEvent(event);
                         }
                     }
                 } else if ((y >= py + h) && (y <= py + h + graphSpacer + 1)) {
@@ -1792,6 +1801,7 @@ void gGraphView::wheelEvent(QWheelEvent *event)
 
             // Pick the first valid graph in the primary group
             for (int i = 0; i < m_graphs.size(); i++) {
+                if (!m_graphs[i]) continue;
                 if (m_graphs[i]->group() == group) {
                     if (!m_graphs[i]->isEmpty() && m_graphs[i]->visible()) {
                         g = m_graphs[i];
@@ -1803,6 +1813,7 @@ void gGraphView::wheelEvent(QWheelEvent *event)
             if (!g) {
                 // just pick any graph then
                 for (int i = 0; i < m_graphs.size(); i++) {
+                    if (!m_graphs[i]) continue;
                     if (!m_graphs[i]->isEmpty()) {
                         g = m_graphs[i];
                         group = g->group();
@@ -1847,9 +1858,12 @@ void gGraphView::keyPressEvent(QKeyEvent *event)
 //    bool meta = m_metaselect;
     m_metaselect = event->modifiers() & Qt::AltModifier;
 
-//    if (meta != m_metaselect) {
-//        timedRedraw(30);
-//    }
+    if ((m_metaselect) && (event->key() >= Qt::Key_0) && (event->key() <= Qt::Key_9)) {
+        int bk = (int)event->key()-Qt::Key_0;
+        m_metaselect = false;
+
+        timedRedraw(30);
+    }
 
     if (event->key() == Qt::Key_F3) {
         p_profile->appearance->setLineCursorMode(!p_profile->appearance->lineCursorMode());
@@ -1965,10 +1979,11 @@ void gGraphView::keyPressEvent(QKeyEvent *event)
 
 void gGraphView::setDay(Day *day)
 {
+
     m_day = day;
 
     for (int i = 0; i < m_graphs.size(); i++) {
-        m_graphs[i]->setDay(day);
+        if (m_graphs[i]) m_graphs[i]->setDay(day);
     }
 
     ResetBounds(false);
@@ -2010,7 +2025,7 @@ void gGraphView::resetLayout()
     int default_height = p_profile->appearance->graphHeight();
 
     for (int i = 0; i < m_graphs.size(); i++) {
-        m_graphs[i]->setHeight(default_height);
+        if (m_graphs[i]) m_graphs[i]->setHeight(default_height);
     }
 
     updateScale();
@@ -2019,7 +2034,7 @@ void gGraphView::resetLayout()
 void gGraphView::deselect()
 {
     for (int i = 0; i < m_graphs.size(); i++) {
-        m_graphs[i]->deselect();
+        if (m_graphs[i]) m_graphs[i]->deselect();
     }
 }
 
@@ -2041,6 +2056,8 @@ void gGraphView::SaveSettings(QString title)
     out << (qint16)size();
 
     for (qint16 i = 0; i < size(); i++) {
+        if (!m_graphs[i]) continue;
+
         out << m_graphs[i]->name();
         out << m_graphs[i]->height();
         out << m_graphs[i]->visible();

sleepyhead/Graphs/gLineChart.cpp

@@ -43,7 +43,7 @@ bool gLineChart::isEmpty()
         ChannelID code = m_codes[j];
 
         for (int i = 0; i < m_day->size(); i++) {
-            Session *sess = m_day->getSessions()[i];
+            Session *sess = m_day->sessions[i];
 
             if (sess->channelExists(code)) {
                 return false;
@@ -76,7 +76,7 @@ void gLineChart::SetDay(Day *d)
         ChannelID code = m_codes[j];
 
         for (int i = 0; i < d->size(); i++) {
-            Session *sess = d->getSessions()[i];
+            Session *sess = d->sessions[i];
 
             if (code == CPAP_MaskPressure) {
                 if (sess->channelExists(CPAP_MaskPressureHi)) {

sleepyhead/Graphs/gSummaryChart.cpp

@@ -83,7 +83,14 @@ void SummaryChart::SetDay(Day * nullday)
             addSlice(CPAP_IPAP, QColor("dark cyan"), ST_PERC, perc);
             //addSlice(CPAP_IPAP,QColor("light blue"),ST_PERC,0.95);
             addSlice(CPAP_IPAPHi, QColor("blue"), ST_SETMAX);
-        } else if (cpapmode >= MODE_BIPAP) {
+        } else if (cpapmode >= MODE_BILEVEL_AUTO_FIXED_PS) {
+            addSlice(CPAP_EPAP, QColor("green"), ST_SETMIN);
+            addSlice(CPAP_IPAP, QColor("light cyan"), mid, 0.5);
+            addSlice(CPAP_IPAP, QColor("light blue"), ST_PERC, perc);
+            addSlice(CPAP_PSMin, QColor("blue"), ST_SETMIN, perc);
+            addSlice(CPAP_PSMax, QColor("red"), ST_SETMAX, perc);
+
+        } else if (cpapmode >= MODE_BILEVEL_FIXED) {
             addSlice(CPAP_EPAP, QColor("green"), ST_SETMIN);
             addSlice(CPAP_EPAP, QColor("light green"), ST_PERC, perc);
             addSlice(CPAP_IPAP, QColor("light cyan"), mid, 0.5);

sleepyhead/Resources.qrc

@@ -43,5 +43,11 @@
         <file>icons/Bob Strikes Back.png</file>
         <file>icons/Jedimark.png</file>
         <file>COPYING</file>
+        <file>icons/sdcard-lock.png</file>
+        <file>icons/statistics.png</file>
+        <file>icons/prs1.png</file>
+        <file>icons/cms50f.png</file>
+        <file>icons/rms9.png</file>
+        <file>icons/intellipap.png</file>
     </qresource>
 </RCC>

sleepyhead/SleepLib/day.cpp

@@ -937,9 +937,48 @@ qint64 Day::last()
     return date;
 }
 
-void Day::removeSession(Session *sess)
+bool Day::removeSession(Session *sess)
 {
-    if (sessions.removeAll(sess) < 1) {
-        // something went wrong
-    }
+    return sessions.removeAll(sess) > 0;
+}
+
+QString Day::getCPAPMode()
+{
+    CPAPMode mode = (CPAPMode)(int)settings_max(CPAP_Mode);
+    if (mode == MODE_CPAP) {
+        return QObject::tr("Fixed");
+    } else if (mode == MODE_APAP) {
+        return QObject::tr("Auto");
+    } else if (mode == MODE_BILEVEL_FIXED ) {
+        return QObject::tr("Fixed Bi-Level");
+    } else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) {
+        return QObject::tr("Auto Bi-Level (Fixed PS)");
+    } else if (mode == MODE_ASV) {
+        return QObject::tr("ASV Fixed EPAP");
+    } else if (mode ==  MODE_ASV_VARIABLE_EPAP) {
+        return QObject::tr("ASV Variable EPAP");
+    }
+    return STR_TR_Unknown;
+}
+
+QString Day::getPressureSettings()
+{
+    CPAPMode mode = (CPAPMode)(int)settings_max(CPAP_Mode);
+    QString units = schema::channel[CPAP_Pressure].units();
+
+    if (mode == MODE_CPAP) {
+        return QObject::tr("%1 %2").arg(settings_min(CPAP_Pressure)).arg(units);
+    } else if (mode == MODE_APAP) {
+        return QObject::tr("%1-%2 %3").arg(settings_min(CPAP_PressureMin)).arg(settings_max(CPAP_PressureMax)).arg(units);
+    } else if (mode == MODE_BILEVEL_FIXED ) {
+        return QObject::tr("%1-%2 %3").arg(settings_min(CPAP_EPAP),0,'f',1).arg(settings_max(CPAP_IPAP),0,'f',1).arg(units);
+    } else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) {
+        return QObject::tr("PS %3 over %1-%2 %4 ").arg(settings_min(CPAP_EPAPLo),0,'f',1).arg(settings_max(CPAP_IPAPHi),0,'f',1).arg(settings_max(CPAP_PS),0,'f',1).arg(units);
+    } else if (mode == MODE_ASV) {
+        return QObject::tr("PS %4-%5 over %1-%3 %6").arg(settings_min(CPAP_EPAP),0,'f',1).arg(settings_max(CPAP_IPAP),0,'f',1).arg(settings_min(CPAP_PSMin),0,'f',1).arg(settings_max(CPAP_PSMax),0,'f',1).arg(units);
+    } else if (mode == MODE_ASV_VARIABLE_EPAP) {
+        return QObject::tr("PS %4-%5 over EPAP %1-%2 Max %3 %6").arg(settings_min(CPAP_EPAPLo),0,'f',1).arg(settings_max(CPAP_EPAPHi),0,'f',1).arg(settings_max(CPAP_IPAPHi),0,'f',1).arg(settings_min(CPAP_PSMin),0,'f',1).arg(settings_max(CPAP_PSMax),0,'f',1).arg(units);
+    }
+
+    return STR_TR_Unknown;
 }

sleepyhead/SleepLib/day.h

@@ -160,9 +160,6 @@ class Day
     //! \brief Closes all Events files for this Days Sessions
     void CloseEvents();
 
-    //! \brief Returns this days sessions list
-    QList<Session *> &getSessions() { return sessions; }
-
     //! \brief Returns true if this Day contains loaded Event Data for this channel.
     bool channelExists(ChannelID id);
 
@@ -175,11 +172,15 @@ class Day
     //! \brief Returns true if this day contains the supplied settings Channel id
     bool settingExists(ChannelID id);
 
-    void removeSession(Session *sess);
+    bool removeSession(Session *sess);
+
+
+    QString getCPAPMode();
+    QString getPressureSettings();
+    QList<Session *> sessions;
 
   protected:
     //! \brief A Vector containing all sessions for this day
-    QList<Session *> sessions;
     QHash<ChannelID, QHash<EventDataType, EventDataType> > perc_cache;
     //qint64 d_first,d_last;
   private:

sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp

@@ -1364,7 +1364,7 @@ bool PRS1SessionData::ParseEvents()
     if (res) {
         if (session->count(CPAP_IPAP) > 0) {
             if (session->settings[CPAP_Mode].toInt() != (int)MODE_ASV) {
-                session->settings[CPAP_Mode] = MODE_BIPAP;
+                session->settings[CPAP_Mode] = MODE_BILEVEL_FIXED;
             }
 
             if (session->settings[CPAP_PresReliefType].toInt() != PR_NONE) {

sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp

@@ -251,14 +251,18 @@ void ResmedLoader::ParseSTR(Machine *mach, QStringList strfiles)
                 if ((sig = str.lookupSignal(CPAP_EPAPLo))) {
                     R.min_epap = EventDataType(sig->data[rec]) * sig->gain + sig->offset;
                 }
+                bool haveipap = false;
                 if ((sig = str.lookupSignal(CPAP_IPAP))) {
                     R.ipap = EventDataType(sig->data[rec]) * sig->gain + sig->offset;
+                    haveipap = true;
                 }
                 if ((sig = str.lookupSignal(CPAP_IPAPHi))) {
                     R.max_ipap = EventDataType(sig->data[rec]) * sig->gain + sig->offset;
+                    haveipap = true;
                 }
                 if ((sig = str.lookupSignal(CPAP_IPAPLo))) {
                     R.min_ipap = EventDataType(sig->data[rec]) * sig->gain + sig->offset;
+                    haveipap = true;
                 }
                 if ((sig = str.lookupSignal(CPAP_PS))) {
                     R.ps = EventDataType(sig->data[rec]) * sig->gain + sig->offset;
@@ -275,14 +279,34 @@ void ResmedLoader::ParseSTR(Machine *mach, QStringList strfiles)
                 if ((sig = str.lookupSignal(RMS9_EPRLevel))) {
                     R.epr_level = EventDataType(sig->data[rec]) * sig->gain + sig->offset;
                 }
+
                 if ((sig = str.lookupSignal(CPAP_Mode))) {
                     int mod = EventDataType(sig->data[rec]) * sig->gain + sig->offset;
                     CPAPMode mode;
 
-                    if (mod >= 7) {       // mod 7 == vpap adapt
-                        mode = MODE_ASV;  // mod 6 == vpap auto (Min EPAP, Max IPAP, PS)
+//                    if (R.epap > 0) {
+//                        if (R.max_epap < 0) R.max_epap = R.epap;
+//                        if (R.min_epap < 0) R.min_epap = R.epap;
+//                    }
+//                    if (R.ipap > 0) {
+//                        if (R.max_ipap < 0) R.max_ipap = R.ipap;
+//                        if (R.min_ipap < 0) R.min_ipap = R.ipap;
+//                    }
+
+                    if (mod >= 8) {       // mod 8 == vpap adapt variable epap
+                        mode = MODE_ASV_VARIABLE_EPAP;
+                        if (!haveipap) {
+                            R.ipap = R.min_ipap = R.max_ipap = R.max_epap + R.max_ps;
+                        }
+                    } else if (mod >= 7) {       // mod 7 == vpap adapt
+                        mode = MODE_ASV;
+                        if (!haveipap) {
+                            R.ipap = R.min_ipap = R.max_ipap = R.max_epap + R.max_ps;
+                        }
+                    } else if (mod >= 6) { // mod 6 == vpap auto (Min EPAP, Max IPAP, PS)
+                        mode = MODE_BILEVEL_AUTO_FIXED_PS;
                     } else if (mod >= 3) {// mod 3 == vpap s fixed pressure (EPAP, IPAP, No PS)
-                        mode = MODE_BIPAP;
+                        mode = MODE_BILEVEL_FIXED;
                     } else if (mod >= 1) {
                         mode = MODE_APAP; // mod 1 == apap
                     } else {
@@ -577,6 +601,8 @@ badfile:
 
 void ResmedImport::run()
 {
+    loader->saveMutex.lock();
+
     Session * sess = mach->SessionExists(sessionid);
     if (sess) {
         if (sess->summaryOnly()) {
@@ -584,15 +610,19 @@ void ResmedImport::run()
             sess->wipeSummary();
         } else {
             // Already imported
+            loader->saveMutex.unlock();
             return;
         }
     } else {
         // Could be importing from an older backup.. if so, destroy the summary only records
         quint32 key = int(sessionid / 60) * 60;
+
         sess = mach->SessionExists(key);
         if (sess) {
             if (sess->summaryOnly()) {
+
                 sess->Destroy();
+                //mach->sessionlist.remove(sess->session());
                 delete sess;
             }
         }
@@ -600,6 +630,7 @@ void ResmedImport::run()
         // Create the session
         sess = new Session(mach, sessionid);
     }
+    loader->saveMutex.unlock();
 
     if (!group.EVE.isEmpty()) {
         loader->LoadEVE(sess, group.EVE);
@@ -614,7 +645,11 @@ void ResmedImport::run()
         loader->LoadSAD(sess, group.SAD);
     }
 
-    if (!sess->first()) {
+    if (sess->first() == 0) {
+        //if (mach->sessionlist.contains(sess->session())) {
+        sess->Destroy();
+            //mach->sessionlist.remove(sess->session());
+        //}
         delete sess;
         return;
     }
@@ -1917,7 +1952,7 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
             ToTimeDelta(sess, edf, es, code, recs, duration, 0, 0);
         } else if (matchSignal(CPAP_IPAP, es.label)) {
             code = CPAP_IPAP;
-            sess->settings[CPAP_Mode] = MODE_BIPAP;
+            sess->settings[CPAP_Mode] = MODE_BILEVEL_FIXED;
             es.physical_maximum = 25;
             es.physical_minimum = 4;
             ToTimeDelta(sess, edf, es, code, recs, duration, 0, 0);

sleepyhead/SleepLib/machine.cpp

@@ -199,23 +199,69 @@ bool Machine::AddSession(Session *s)
 
     if (combine_next_day) {
         for (QList<Session *>::iterator i = nextday.value()->begin(); i != nextday.value()->end(); i++) {
+            // i may need to do something here
+            unlinkSession(*i);
             dd->AddSession(*i);
         }
 
-        QMap<QDate, QList<Day *> >::iterator nd = p_profile->daylist.find(date.addDays(1));
+//        QMap<QDate, QList<Day *> >::iterator nd = p_profile->daylist.find(date.addDays(1));
+//        if (nd != p_profile->daylist.end()) {
+//            p_profile->unlinkDay(nd.key(), nd.value());
+//        }
 
-        for (QList<Day *>::iterator i = nd->begin(); i != nd->end(); i++) {
-            if (*i == nextday.value()) {
-                nd.value().erase(i);
-            }
-        }
+//        QList<Day *>::iterator iend = nd.value().end();
+//        for (QList<Day *>::iterator i = nd.value()->begin(); i != iend; ++i) {
+//            if (*i == nextday.value()) {
+//                nd.value().erase(i);
+//            }
+//        }
 
-        day.erase(nextday);
+//        day.erase(nextday);
     }
 
     return true;
 }
 
+bool Machine::unlinkDay(Day * d)
+{
+    return day.remove(day.key(d)) > 0;
+}
+
+bool Machine::unlinkSession(Session * sess)
+{
+    // Remove the object from the machine object's session list
+    bool b=sessionlist.remove(sess->session());
+
+    QList<QDate> dates;
+
+    QList<Day *> days;
+    QMap<QDate, Day *>::iterator it;
+
+    Day * d;
+
+    // Doing this in case of accidental double linkages
+    for (it = day.begin(); it != day.end(); ++it) {
+        d = it.value();
+        if (it.value()->sessions.contains(sess)) {
+            days.push_back(d);
+            dates.push_back(it.key());
+        }
+    }
+
+    for (int i=0; i < days.size(); ++i) {
+        d = days.at(i);
+        if (d->sessions.removeAll(sess)) {
+            b=true;
+            if (d->size() == 0) {
+                day.remove(dates[i]);
+                p_profile->unlinkDay(d);
+            }
+        }
+    }
+
+    return b;
+}
+
 // This functions purpose is murder and mayhem... It deletes all of a machines data.
 bool Machine::Purge(int secret)
 {
@@ -248,8 +294,9 @@ bool Machine::Purge(int secret)
             qDebug() << "Could not destroy "+ m_class+" ("+properties[STR_PROP_Serial]+") session" << sess->session();
             success = false;
         } else {
-            sessionlist.erase(sessionlist.find(sess->session()));
+//            sessionlist.remove(sess->session());
         }
+
         delete sess;
     }
 

sleepyhead/SleepLib/machine.h

@@ -96,6 +96,11 @@ class Machine
     //! \brief Deletes the crud out of all machine data in the SleepLib database
     bool Purge(int secret);
 
+    //! \brief Unlink a session from any Machine related indexes
+    bool unlinkSession(Session * sess);
+
+    bool unlinkDay(Day * day);
+
     //! \brief Contains a secondary index of day data, containing just this machines sessions
     QMap<QDate, Day *> day;
 

sleepyhead/SleepLib/machine_common.h

@@ -58,7 +58,7 @@ enum MachineType { MT_UNKNOWN = 0, MT_CPAP, MT_OXIMETER, MT_SLEEPSTAGE, MT_JOURN
     \brief CPAP Machines mode of operation
   */
 enum CPAPMode { //:short
-    MODE_UNKNOWN = 0, MODE_CPAP, MODE_APAP, MODE_BIPAP, MODE_ASV
+    MODE_UNKNOWN = 0, MODE_CPAP, MODE_APAP, MODE_BILEVEL_FIXED, MODE_BILEVEL_AUTO_FIXED_PS, MODE_ASV, MODE_ASV_VARIABLE_EPAP
 };
 
 /*! \enum PRTypes

sleepyhead/SleepLib/profiles.cpp

@@ -684,51 +684,67 @@ Machine *Profile::GetMachine(MachineType t)
     return vec[0];
 }
 
-void Profile::RemoveSession(Session *sess)
+//bool Profile::trashMachine(Machine * mach)
+//{
+//    QMap<QDate, QList<Day *> >::iterator it_end = daylist.end();
+//    QMap<QDate, QList<Day *> >::iterator it;
+
+//    QList<QDate> datelist;
+//    QList<Day *> days;
+
+//    for (it = daylist.begin(); it != it_end; ++it) {
+//        for (int i = 0; i< it.value().size(); ++i) {
+//            Day * day = it.value().at(i);
+//            if (day->machine() == mach) {
+//                days.push_back(day);
+//                datelist.push_back(it.key());
+//            }
+//        }
+//    }
+
+//    for (int i=0; i < datelist.size(); ++i) {
+//        Day * day = days.at(i);
+//        it = daylist.find(datelist.at(i));
+//        if (it != daylist.end()) {
+//            it.value().removeAll(day);
+//            if (it.value().size() == 0) {
+//                daylist.erase(it);
+//            }
+//        }
+//        mach->unlinkDay(days.at(i));
+//    }
+
+//}
+
+bool Profile::unlinkDay(Day * day)
 {
-    QMap<QDate, QList<Day *> >::iterator di;
-    QMap<QDate, QList<Day *> >::iterator daylist_end=daylist.end();
-    Machine * mach = sess->machine();
+    bool b=false;
 
-    for (di = daylist.begin(); di != daylist_end; di++) {
-        for (int d = 0; d < di.value().size(); d++) {
-            Day *day = di.value()[d];
+    QList<QDate> dates;
 
-            int i = day->getSessions().indexOf(sess);
-
-            if (i >= 0) {
-                for (; i < day->getSessions().size() - 1; i++) {
-                    day->getSessions()[i] = day->getSessions()[i + 1];
-                }
-
-                day->getSessions().pop_back();
-                qint64 first = 0, last = 0;
-
-                for (int i = 0; i < day->getSessions().size(); i++) {
-                    Session &sess = *day->getSessions()[i];
-
-                    if (!first || first > sess.first()) {
-                        first = sess.first();
-                    }
-
-                    if (!last || last < sess.last()) {
-                        last = sess.last();
-                    }
-                }
-
-                if (day->size() == 0) {
-                    di.value().removeAll(day);
-                    mach->day.erase(mach->day.find(di.key()));
-                    delete day;
-                }
-
-                // day->setFirst(first);
-                // day->setLast(last);
-                return;
-            }
+    QMap<QDate, QList<Day *> >::iterator it;
+    QMap<QDate, QList<Day *> >::iterator it_end = daylist.end();
 
+    for (it = daylist.begin(); it != it_end; ++it) {
+        if (it.value().contains(day)) {
+            dates.push_back(it.key());
         }
     }
+
+    for (int i=0; i < dates.size(); ++i) {
+        it = daylist.find(dates.at(i));
+
+        if (it != daylist.end()) {
+            it.value().removeAll(day);
+            // TODO: Check it doesn't change from the above...
+
+            if (it.value().size() == 0) {
+                daylist.erase(it);
+            }
+        }
+    }
+
+     return b;
 }
 
 

sleepyhead/SleepLib/profiles.h

@@ -80,8 +80,10 @@ class Profile : public Preferences
      */
     int Import(QString path);
 
-    //! \brief Remove a session from day object, without deleting the Session object
-    void RemoveSession(Session *sess);
+    //! \brief Removes a given day from the date, destroying the daylist date record if empty
+    bool unlinkDay(Day * day);
+
+//    bool trashMachine(Machine * mach);
 
     //! \brief Add Day record to Profile Day list
     void AddDay(QDate date, Day *day, MachineType mt);

sleepyhead/SleepLib/session.cpp

@@ -52,11 +52,14 @@ Session::Session(Machine *m, SessionID session)
     s_evchecksum_checked = false;
 
     s_summaryOnly = false;
+
+    destroyed = false;
 }
 
 Session::~Session()
 {
     TrashEvents();
+    destroyed = true;
 }
 
 void Session::TrashEvents()
@@ -114,8 +117,7 @@ bool Session::Destroy()
 {
     QString path = p_profile->Get(s_machine->properties[STR_PROP_Path]);
 
-    p_profile->RemoveSession(this);
-    s_machine->sessionlist.erase(s_machine->sessionlist.find(s_session));
+    s_machine->unlinkSession(this);
 
     QDir dir(path);
     QString base;
@@ -1697,6 +1699,7 @@ EventDataType Session::sph(ChannelID id) // sum per hour, assuming id is a time
 
 EventDataType Session::timeAboveThreshold(ChannelID id, EventDataType threshold)
 {
+    this->OpenEvents();
     QHash<ChannelID, QVector<EventList *> >::iterator j = eventlist.find(id);
     if (j == eventlist.end()) {
         return 0.0f;

sleepyhead/SleepLib/session.h

@@ -343,6 +343,9 @@ protected:
     char s_enabled;
     QString s_eventfile;
 
+    // for debugging
+    bool destroyed;
+
 
 };
 

sleepyhead/daily.cpp

@@ -739,6 +739,10 @@ void Daily::UpdateCalendarDay(QDate date)
 }
 void Daily::LoadDate(QDate date)
 {
+    if (!date.isValid()) {
+        qDebug() << "LoadDate called with invalid date";
+        return;
+    }
     ui->calendar->blockSignals(true);
     if (date.month()!=previous_date.month()) {
         on_calendar_currentPageChanged(date.year(),date.month());
@@ -1027,74 +1031,11 @@ QString Daily::getCPAPInformation(Day * cpap)
 
     html+=tooltip;
     html+="</span></td></tr>\n";
-    CPAPMode mode=(CPAPMode)(int)cpap->settings_max(CPAP_Mode);
+    //CPAPMode mode=(CPAPMode)(int)cpap->settings_max(CPAP_Mode);
     html+="<tr><td colspan=4 align=center>";
 
-
-    QString modestr;
-
-    if (mode==MODE_CPAP) modestr=STR_TR_CPAP;
-    else if (mode==MODE_APAP) modestr=STR_TR_APAP;
-    else if (mode==MODE_BIPAP) modestr=STR_TR_BiLevel;
-    else if (mode==MODE_ASV) modestr=STR_TR_ASV;
-    else modestr=STR_TR_Unknown;
-    html+=tr("PAP Mode: %1<br/>").arg(modestr);
-
-    if (mode==MODE_CPAP) {
-        EventDataType min=round(cpap->settings_wavg(CPAP_Pressure)*2)/2.0;
-        // eg: Pressure: 13cmH2O
-        html+=QString("%1: %2%3").arg(STR_TR_Pressure).arg(min).arg(STR_UNIT_CMH2O);
-    } else if (mode==MODE_APAP) {
-        EventDataType min=cpap->settings_min(CPAP_PressureMin);
-        EventDataType max=cpap->settings_max(CPAP_PressureMax);
-        // eg: Pressure: 7.0-10.0cmH2O
-        html+=QString("%1: %2-%3%4").arg(STR_TR_Pressure).arg(min,0,'f',1).arg(max,0,'f',1).arg(STR_UNIT_CMH2O);
-    } else if (mode>=MODE_BIPAP) {
-        if (cpap->settingExists(CPAP_EPAPLo)) {
-            html+=QString(STR_TR_EPAPLo+": %1")
-                    .arg(cpap->settings_min(CPAP_EPAPLo),0,'f',1);
-
-            if (cpap->settingExists(CPAP_EPAPHi)) {
-                    html+=QString("-%2")
-                    .arg(cpap->settings_max(CPAP_EPAPHi),0,'f',1);
-            }
-            html+=STR_UNIT_CMH2O+"</br>";
-        } else if (cpap->settingExists(CPAP_EPAP)) {
-            EventDataType epap=cpap->settings_min(CPAP_EPAP);
-
-            html+=QString("%1: %2%3<br/>").arg(STR_TR_EPAP)
-                    .arg(epap,0,'f',1)
-                    .arg(STR_UNIT_CMH2O);
-
-            if (!cpap->settingExists(CPAP_IPAPHi)) {
-                if (cpap->settingExists(CPAP_PSMax)) {
-                    html+=QString("%1: %2%3<br/>").arg(STR_TR_IPAPHi)
-                        .arg(epap+cpap->settings_max(CPAP_PSMax),0,'f',1)
-                        .arg(STR_UNIT_CMH2O);
-
-                }
-            }
-        }
-        if (cpap->settingExists(CPAP_IPAPHi)) {
-            html+=QString(STR_TR_IPAPHi+": %1"+STR_UNIT_CMH2O+"<br/>")
-                    .arg(cpap->settings_max(CPAP_IPAPHi),0,'f',1);
-        } else
-        if (cpap->settingExists(CPAP_IPAP)) {
-            html+=QString(STR_TR_IPAP+": %1"+STR_UNIT_CMH2O+"<br/>")
-                    .arg(cpap->settings_max(CPAP_IPAP),0,'f',1);
-        }
-
-        if (cpap->settingExists(CPAP_PSMin)) {
-                    EventDataType psl=cpap->settings_min(CPAP_PSMin);
-                    EventDataType psh=cpap->settings_max(CPAP_PSMax);
-                    html+=QString(STR_TR_PS+": %1-%2"+STR_UNIT_CMH2O+"<br/>")
-                        .arg(psl,0,'f',1)
-                        .arg(psh,0,'f',1);
-        } else if (cpap->settingExists(CPAP_PS)) {
-            html+=QString(STR_TR_PS+": %1"+STR_UNIT_CMH2O+"<br/>")
-                .arg(cpap->settings_max(CPAP_PS),0,'f',1);
-        }
-    }
+    html+=tr("PAP Mode: %1<br/>").arg(cpap->getCPAPMode());
+    html+= cpap->getPressureSettings();
     html+="</td></tr>\n";
     if ((cpap && cpap->settingExists(CPAP_BrokenSummary))) {
         html+="<tr><td colspan=4>&nbsp;</td></tr>\n";
@@ -1669,6 +1610,13 @@ void Daily::clearLastDay()
 
 void Daily::Unload(QDate date)
 {
+    if (!date.isValid()) {
+        date = getDate();
+        if (!date.isValid()) {
+            graphView()->setDay(nullptr);
+            return;
+        }
+    }
     webView->setHtml("");
     Session *journal=GetJournalSession(date);
 

sleepyhead/daily.h

@@ -137,7 +137,7 @@ public:
         \brief Saves any journal changes for the provided date.
         \param QDate date
         */
-    void Unload(QDate date);
+    void Unload(QDate date=QDate());
 
 private slots:
 

sleepyhead/docs/channels.xml

@@ -28,8 +28,10 @@ Important: One id code per item, DO NOT CHANGE ID NUMBERS!!!
   <channel id="0x1200" class="setting" scope="!session" name="PAPMode" details="PAP Mode" label="PAP Mode" type="integer">
    <option id="0" value="CPAP"/>
    <option id="1" value="Auto"/>
-   <option id="2" value="Bi-Level"/>
-   <option id="3" value="ASV"/>
+   <option id="2" value="Fixed Bi-Level"/>
+   <option id="3" value="Auto Bi-Level"/>
+   <option id="4" value="ASV"/>
+   <option id="5" value="ASV Auto EPAP"/>
   </channel>
   <channel id="0x1201" class="setting" scope="!session" name="PresRelType" details="Pressure Relief" label="Pres. Relief" type="integer">
     <Option id="0" value=""/>

sleepyhead/mainwindow.cpp

@@ -262,7 +262,7 @@ MainWindow::MainWindow(QWidget *parent) :
     restoreGeometry(settings.value("MainWindow/geometry").toByteArray());
 
     daily = new Daily(ui->tabWidget, nullptr);
-    ui->tabWidget->insertTab(1, daily, STR_TR_Daily);
+    ui->tabWidget->insertTab(2, daily, STR_TR_Daily);
 
 
     // Start with the Summary Tab
@@ -405,6 +405,29 @@ void MainWindow::Notify(QString s, QString title, int ms)
     }
 }
 
+class MyStatsPage: public QWebPage
+{
+  public:
+    MyStatsPage(QObject *parent);
+    virtual ~MyStatsPage();
+  protected:
+    //virtual void javaScriptConsoleMessage(const QString & message, int lineNumber, const QString & sourceID);
+    virtual void javaScriptAlert(QWebFrame *frame, const QString &msg);
+};
+MyStatsPage::MyStatsPage(QObject *parent)
+    : QWebPage(parent)
+{
+}
+MyStatsPage::~MyStatsPage()
+{
+}
+
+void MyStatsPage::javaScriptAlert(QWebFrame *frame, const QString &msg)
+{
+    Q_UNUSED(frame);
+    mainwin->sendStatsUrl(msg);
+}
+
 void MainWindow::PopulatePurgeMenu()
 {
     QList<QAction *> actions = ui->menu_Purge_CPAP_Data->actions();
@@ -426,6 +449,7 @@ void MainWindow::PopulatePurgeMenu()
     }
     ui->menu_Purge_CPAP_Data->connect(ui->menu_Purge_CPAP_Data, SIGNAL(triggered(QAction*)), this, SLOT(on_actionPurgeMachine(QAction*)));
 }
+QString GenerateWelcomeHTML();
 
 void MainWindow::Startup()
 {
@@ -449,10 +473,9 @@ void MainWindow::Startup()
     SnapshotGraph->hide();
 
     overview = new Overview(ui->tabWidget, daily->graphView());
-    ui->tabWidget->insertTab(2, overview, STR_TR_Overview);
+    ui->tabWidget->insertTab(3, overview, STR_TR_Overview);
 
-    GenerateStatistics();
-    ui->tabWidget->setCurrentWidget(ui->statisticsTab);
+//    GenerateStatistics();
 
     ui->statStartDate->setDate(p_profile->FirstDay());
     ui->statEndDate->setDate(p_profile->LastDay());
@@ -468,6 +491,10 @@ void MainWindow::Startup()
         importCPAPBackups();
         p_profile->p_preferences[STR_PREF_ReimportBackup]=false;
     }
+
+    ui->tabWidget->setCurrentWidget(ui->welcomeTab);
+
+
 }
 
 int MainWindow::importCPAP(const QString &path, const QString &message)
@@ -619,7 +646,7 @@ QStringList MainWindow::detectCPAPCards()
 
     // Create dialog
     QDialog popup(this, Qt::SplashScreen);
-    QLabel waitmsg(tr("Please wait, scanning for CPAP data cards..."));
+    QLabel waitmsg(tr("Please insert your CPAP data card..."));
     QProgressBar progress;
     QVBoxLayout waitlayout;
     popup.setLayout(&waitlayout);
@@ -854,29 +881,6 @@ void MainWindow::setRecBoxHTML(QString html)
     ui->recordsBox->setHtml(html);
 }
 
-class MyStatsPage: public QWebPage
-{
-  public:
-    MyStatsPage(QObject *parent);
-    virtual ~MyStatsPage();
-  protected:
-    //virtual void javaScriptConsoleMessage(const QString & message, int lineNumber, const QString & sourceID);
-    virtual void javaScriptAlert(QWebFrame *frame, const QString &msg);
-};
-MyStatsPage::MyStatsPage(QObject *parent)
-    : QWebPage(parent)
-{
-}
-MyStatsPage::~MyStatsPage()
-{
-}
-
-void MyStatsPage::javaScriptAlert(QWebFrame *frame, const QString &msg)
-{
-    Q_UNUSED(frame);
-    mainwin->sendStatsUrl(msg);
-}
-
 QString MainWindow::getWelcomeHTML()
 {
     // This is messy, but allows it to be translated easier
@@ -1775,7 +1779,8 @@ void MainWindow::on_actionPurge_Current_Day_triggered()
 
         for (int i = 0; i < list.size(); i++) {
             Session *sess = list.at(i);
-            day->removeSession(sess);
+            sess->machine()->unlinkSession(sess);
+            //day->removeSession(sess);
             delete sess;
         }
 
@@ -1892,23 +1897,28 @@ void MainWindow::on_action_Sidebar_Toggle_toggled(bool visible)
 void MainWindow::on_recordsBox_linkClicked(const QUrl &linkurl)
 {
     QString link = linkurl.toString().section("=", 0, 0).toLower();
-    QString datestr = linkurl.toString().section("=", 1).toLower();
-    qDebug() << linkurl.toString() << link << datestr;
+    QString data = linkurl.toString().section("=", 1).toLower();
+    qDebug() << linkurl.toString() << link << data;
 
     if (link == "daily") {
-        QDate date = QDate::fromString(datestr, Qt::ISODate);
-        daily->LoadDate(date);
+        QDate date = QDate::fromString(data, Qt::ISODate);
         ui->tabWidget->setCurrentWidget(daily);
+        QApplication::processEvents();
+        daily->LoadDate(date);
     } else if (link == "overview") {
-        QString date1 = datestr.section(",", 0, 0);
-        QString date2 = datestr.section(",", 1);
+        QString date1 = data.section(",", 0, 0);
+        QString date2 = data.section(",", 1);
 
         QDate d1 = QDate::fromString(date1, Qt::ISODate);
         QDate d2 = QDate::fromString(date2, Qt::ISODate);
         overview->setRange(d1, d2);
         ui->tabWidget->setCurrentWidget(overview);
+    } else if (link == "import") {
+        if (data == "cpap") on_importButton_clicked();
+        if (data == "oximeter") on_oximetryButton_clicked();
+    } else if (link == "statistics") {
+        ui->tabWidget->setCurrentWidget(ui->statisticsTab);
     }
-
 }
 
 void MainWindow::on_helpButton_clicked()
@@ -2254,6 +2264,13 @@ void MainWindow::GenerateStatistics()
     MyStatsPage *page = new MyStatsPage(this);
     page->currentFrame()->setHtml(html);
     ui->statisticsView->setPage(page);
+
+
+
+    MyStatsPage *page2 = new MyStatsPage(this);
+    page2->currentFrame()->setHtml(GenerateWelcomeHTML());
+    ui->welcomeView->setPage(page2);
+
     //    connect(ui->statisticsView->page()->currentFrame(),SIGNAL(javaScriptWindowObjectCleared())
     //    QString file="qrc:/docs/index.html";
     //    QUrl url(file);
@@ -2318,11 +2335,13 @@ void MainWindow::on_actionPurgeCurrentDaysOximetry_triggered()
             return;
         }
 
-        QList<Session *> sessions;
-        sessions.append(day->getSessions());
+        QList<Session *> sessionlist;
+        sessionlist.append(day->sessions);
 
-        for (int i=0; i < sessions.size(); ++i) {
-            sessions.at(i)->Destroy();
+        for (int i=0; i < sessionlist.size(); ++i) {
+            Session * sess = sessionlist.at(i);
+            sess->Destroy();
+            delete sess;
         }
 
 

sleepyhead/mainwindow.ui

@@ -923,7 +923,7 @@
          <enum>QTabWidget::Triangular</enum>
         </property>
         <property name="currentIndex">
-         <number>0</number>
+         <number>1</number>
         </property>
         <property name="documentMode">
          <bool>false</bool>
@@ -934,11 +934,11 @@
         <property name="movable">
          <bool>false</bool>
         </property>
-        <widget class="QWidget" name="statisticsTab">
+        <widget class="QWidget" name="welcomeTab">
          <attribute name="title">
-          <string>&amp;Statistics</string>
+          <string>Welcome</string>
          </attribute>
-         <layout class="QVBoxLayout" name="verticalLayout_7">
+         <layout class="QVBoxLayout" name="verticalLayout_8">
           <property name="spacing">
            <number>0</number>
           </property>
@@ -956,6 +956,12 @@
           </property>
           <item>
            <widget class="QLabel" name="warningLabel">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <property name="font">
              <font>
               <pointsize>14</pointsize>
@@ -976,6 +982,43 @@ color: yellow;</string>
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QWebView" name="welcomeView">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="url">
+             <url>
+              <string>about:blank</string>
+             </url>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="statisticsTab">
+         <attribute name="title">
+          <string>&amp;Statistics</string>
+         </attribute>
+         <layout class="QVBoxLayout" name="verticalLayout_7">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
           <item>
            <widget class="QWebView" name="statisticsView">
             <property name="sizePolicy">

sleepyhead/newprofile.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>614</width>
-    <height>395</height>
+    <width>667</width>
+    <height>450</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -40,7 +40,7 @@
        <item>
         <widget class="QStackedWidget" name="stackedWidget">
          <property name="currentIndex">
-          <number>3</number>
+          <number>0</number>
          </property>
          <widget class="QWidget" name="welcomePage">
           <layout class="QVBoxLayout" name="verticalLayout_8">
@@ -51,7 +51,7 @@
              </property>
              <property name="source">
               <url>
-               <string>qrc:/docs/update_notes.html</string>
+               <string>about:blank</string>
               </url>
              </property>
              <property name="openExternalLinks">

sleepyhead/oximeterimport.ui

@@ -620,8 +620,11 @@ border-radius: 0px;</string>
           <property name="pixmap">
            <pixmap resource="Resources.qrc">:/icons/oximeter.png</pixmap>
           </property>
+          <property name="scaledContents">
+           <bool>false</bool>
+          </property>
           <property name="alignment">
-           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+           <set>Qt::AlignHCenter|Qt::AlignTop</set>
           </property>
          </widget>
         </item>
@@ -644,7 +647,7 @@ border-radius: 0px;</string>
      <item>
       <widget class="QStackedWidget" name="stackedWidget">
        <property name="currentIndex">
-        <number>5</number>
+        <number>1</number>
        </property>
        <widget class="QWidget" name="welcomePage">
         <layout class="QVBoxLayout" name="verticalLayout">
@@ -876,7 +879,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
            </property>
            <property name="icon">
             <iconset resource="Resources.qrc">
-             <normaloff>:/icons/oximeter.png</normaloff>:/icons/oximeter.png</iconset>
+             <normaloff>:/icons/cms50f.png</normaloff>:/icons/cms50f.png</iconset>
            </property>
            <property name="iconSize">
             <size>

sleepyhead/reports.cpp

@@ -201,14 +201,29 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
                 EventDataType min = cpap->settings_min(CPAP_PressureMin);
                 EventDataType max = cpap->settings_max(CPAP_PressureMax);
                 cpapinfo += STR_TR_APAP + " " + QString::number(min) + "-" + QString::number(max) + STR_UNIT_CMH2O;
-            } else if (mode == MODE_BIPAP) {
+            } else if (mode == MODE_BILEVEL_FIXED) {
                 EventDataType epap = cpap->settings_min(CPAP_EPAP);
                 EventDataType ipap = cpap->settings_max(CPAP_IPAP);
                 EventDataType ps = cpap->settings_max(CPAP_PS);
-                cpapinfo += STR_TR_BiLevel + QString("\n" + STR_TR_EPAP + ": %1 " + STR_TR_IPAP + ": %2 %3\n" +
-                                                     STR_TR_PS + ": %4")
+                cpapinfo += STR_TR_BiLevel +
+                        QString("\n" + STR_TR_EPAP + ": %1 " + STR_TR_IPAP + ": %2 %3\n" + STR_TR_PS + ": %4")
                             .arg(epap, 0, 'f', 1).arg(ipap, 0, 'f', 1).arg(STR_UNIT_CMH2O).arg(ps, 0, 'f', 1);
-            } else if (mode == MODE_ASV) {
+            } else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) {
+                EventDataType epap = cpap->settings_min(CPAP_EPAP);
+                EventDataType ipap = cpap->settings_max(CPAP_IPAP);
+                EventDataType ps = cpap->settings_max(CPAP_PS);
+                cpapinfo += STR_TR_BiLevel +
+                        QString("\n" + QObject::tr("Range")+ ": %1-%2 %3 " + QObject::tr("Fixed %1").arg(STR_TR_PS) + ": %4")
+                            .arg(epap, 0, 'f', 1).arg(ipap, 0, 'f', 1).arg(STR_UNIT_CMH2O).arg(ps, 0, 'f', 1);
+            } /*else if (mode == MODE_BILEVEL_AUTO_FIXED_EPAP_VARIABLE_PS) {
+                EventDataType epap = cpap->settings_min(CPAP_EPAP);
+                EventDataType ipap = cpap->settings_max(CPAP_IPAPHi);
+                EventDataType psl = cpap->settings_max(CPAP_PSMin);
+                EventDataType psh = cpap->settings_max(CPAP_PSMax);
+                cpapinfo += STR_TR_BiLevel +
+                        QString("\n" + QObject::tr("Fixed %1").arg(STR_TR_EPAP) + ": %1 %3" + QObject::tr("Max %1").arg(STR_TR_IPAP) + ": %2 %3\n" + QObject::tr("Variable %1").arg(STR_TR_PS) + ": %4-%5")
+                            .arg(epap, 0, 'f', 1).arg(ipap, 0, 'f', 1).arg(STR_UNIT_CMH2O).arg(psl,0,'f',1).arg(psh,0,'f',1);
+            } */else if (mode == MODE_ASV) {
                 EventDataType epap = cpap->settings_min(CPAP_EPAP);
                 EventDataType low = cpap->settings_min(CPAP_IPAPLo);
                 EventDataType high = cpap->settings_max(CPAP_IPAPHi);

sleepyhead/sleepyhead.pro

@@ -176,7 +176,8 @@ SOURCES += \
     SleepLib/serialoximeter.cpp \
     SleepLib/loader_plugins/md300w1_loader.cpp \
     Graphs/gSessionTimesChart.cpp \
-    logger.cpp
+    logger.cpp \
+    welcome.cpp
 
 HEADERS  += \
     common_gui.h \

sleepyhead/statistics.cpp

@@ -102,14 +102,12 @@ Statistics::Statistics(QObject *parent) :
 
 }
 
-
-QString htmlHeader()
+const QString table_width = "width=99%";
+QString htmlHeader(bool showheader)
 {
 
     QString address = p_profile->user->address();
     address.replace("\n", "<br/>");
-    //   "a:link,a:visited { color: '#000020'; text-decoration: none; font-weight: bold;}"
-    //   "a:hover { background-color: inherit; color: red; text-decoration:none; font-weight: bold; }"
 
     QString userinfo;
 
@@ -130,62 +128,65 @@ QString htmlHeader()
     }
 
 
-    return QString("<html><head>"
-                   "</head>"
-                   "<style type='text/css'>"
-                   "p,a,td,body { font-family: '"+QApplication::font().family()+"'; }"
-                   "p,a,td,body { font-size: "+QString::number(QApplication::font().pointSize() + 2)+"px; }"
+    QString html = QString("<html><head>")+
+    "</head>"
+    "<style type='text/css'>"
+    "p,a,td,body { font-family: '"+QApplication::font().family()+"'; }"
+    "p,a,td,body { font-size: "+QString::number(QApplication::font().pointSize() + 2)+"px; }"
 
-//                   "h1,p,a,td,body { font-family: '"+PREF["Fonts_Application_Name"].toString()+"' }"
-//                   "p,a,td,body { font-size: '"+PREF["Fonts_Application_Size"].toString()+"pts' }"
-"table.curved {"
+    "table.curved {"
     "border: 1px solid gray;"
     "border-radius:10px;"
     "-moz-border-radius:10px;"
     "-webkit-border-radius:10px;"
-    "width: 99%;"
     "page-break-after:auto;"
     "-fs-table-paginate: paginate;"
-"}"
-"tr.datarow:nth-child(even) {"
+    "}"
+    "tr.datarow:nth-child(even) {"
     "background-color: #f8f8f8;"
-"}"
-  "table { page-break-after:auto; -fs-table-paginate: paginate; }"
-  "tr    { page-break-inside:avoid; page-break-after:auto }"
-  "td    { page-break-inside:avoid; page-break-after:auto }"
-  "thead { display:table-header-group; }"
-  "tfoot { display:table-footer-group; }"
+    "}"
+    "table { page-break-after:auto; -fs-table-paginate: paginate; }"
+    "tr    { page-break-inside:avoid; page-break-after:auto }"
+    "td    { page-break-inside:avoid; page-break-after:auto }"
+    "thead { display:table-header-group; }"
+    "tfoot { display:table-footer-group; }"
 
-
-                   "</style>"
-                   "<link rel='stylesheet' type='text/css' href='qrc:/docs/tooltips.css' />"
-                   "<script type='text/javascript'>"
-                   "function ChangeColor(tableRow, highLight)"
-                   "{ tableRow.style.backgroundColor = highLight; }"
-                   "function Go(url) { throw(url); }"
-                   "</script>"
-                   "</head>"
-                   "<body leftmargin=0 topmargin=5 rightmargin=0>"
-                   "<div align=center><table class=curved>" // cellpadding=3 cellspacing=0 border=0
-                   "<td>"+userinfo+"</td>"
-                   "<td align='right'>"
-                   "<font size='+2'>" + STR_TR_SleepyHead + "</font><br/>"
-                   "<font size='+1'>" + QObject::tr("Usage Statistics") + "</font>"
-                   "</td>"
-                   "<td align='right' width=170px><img src='qrc:/icons/bob-v3.0.png' height=140px><br/>"
-                   "</td></tr></table>"
-                   "</div>"
-                   "<br/>");
+    "</style>"
+    "<link rel='stylesheet' type='text/css' href='qrc:/docs/tooltips.css' />"
+    "<script type='text/javascript'>"
+    "function ChangeColor(tableRow, highLight)"
+    "{ tableRow.style.backgroundColor = highLight; }"
+    "function Go(url) { throw(url); }"
+    "</script>"
+    "</head>"
+    "<body leftmargin=0 topmargin=5 rightmargin=0>";
+    if (showheader) {
+        html += "<div align=center><table class=curved "+table_width+">"
+        "<td>"+userinfo+"</td>"
+        "<td align='right'>"
+        "<font size='+2'>" + STR_TR_SleepyHead + "</font><br/>"
+        "<font size='+1'>" + QObject::tr("Usage Statistics") + "</font>"
+        "</td>"
+        "<td align='right' width=170px><img src='qrc:/icons/bob-v3.0.png' height=140px><br/>"
+        "</td></tr></table>"
+        "</div><br/>";
+    }
+    return html;
 }
-QString htmlFooter()
+QString htmlFooter(bool showinfo=true)
 {
-    return "<hr/><div align=center><font size='-1'><i>" +
-           QString(QObject::tr("This report was generated by a pre-release version of SleepyHead (%1), <b>and has not been approved in any way for compliance or medical diagnostic purposes</b>.")).arg(
-               FullVersionString) + "<br/><br/>" +
-           QObject::tr("SleepyHead is free open-source software available from http://sourceforge.net/projects/SleepyHead")
-           +
-           "</i></i></div>"
-           "</body></html>";
+    QString html;
+
+    if (showinfo) {
+        html += "<hr/><div align=center><font size='-1'><i>";
+        html += QString(QObject::tr("This report was generated by a pre-release version of SleepyHead (%1), <b>and has not been approved in any way for compliance or medical diagnostic purposes</b>.")).
+                arg(FullVersionString) + "<br/><br/>" +
+           QObject::tr("SleepyHead is free open-source software available from http://sourceforge.net/projects/SleepyHead");
+        html += "</i></font></div>";
+    }
+
+    html += "</body></html>";
+    return html;
 }
 
 
@@ -511,7 +512,6 @@ QString Statistics::GenerateHTML()
     QString heading_color="#ffffff";
     QString subheading_color="#e0e0e0";
 
-    QString html = htmlHeader();
 
     // Find first and last days with valid CPAP data
     QDate lastcpap = p_profile->LastGoodDay(MT_CPAP);
@@ -531,24 +531,36 @@ QString Statistics::GenerateHTML()
     QList<Machine *> cpap_machines = p_profile->GetMachines(MT_CPAP);
     QList<Machine *> oximeters = p_profile->GetMachines(MT_OXIMETER);
     QList<Machine *> mach;
+
     mach.append(cpap_machines);
     mach.append(oximeters);
 
+    bool havedata = false;
+    for (int i=0; i < mach.size(); ++i) {
+        int daysize = mach[i]->day.size();
+        if (daysize > 0) {
+            havedata = true;
+            break;
+        }
+    }
 
-    if (mach.size() == 0) {
-        html += "<div align=center><table class=curved height=60%>"; //cellpadding=2 cellspacing=0 border=0
-        html += "<tr><td align=center><h1>" + tr("Please Import Some Data") + "</h1><i>" +
-                tr("SleepyHead is pretty much useless without it.") + "</i><br/><p>" +
-                tr("It might be a good idea to check preferences first,</br>as there are some options that affect import.")
-                + "</p><p>" + tr("First import can take a few minutes.") + "</p></td></tr></table></div>";
-        html += htmlFooter();
+    QString html = htmlHeader(havedata);
+
+    if (!havedata) {
+        html += "<div align=center><table class=curved height=100% "+table_width+">";
+        html += QString("<tr><td colspan=2 align=center>") +
+                "<img src='qrc:/icons/bob-v3.0.png' height=100px>"
+                "<p><font size=+3>" + tr("I can haz data?!?") + "</font></p>"+
+                "<p><i>"+tr("This lonely sleepy sheep has no data :(")+"</i></p>"
+
+        "</table></div>";
+        html += htmlFooter(havedata);
         return html;
     }
 
     int cpapdays = p_profile->countDays(MT_CPAP, firstcpap, lastcpap);
 
-    CPAPMode cpapmode = (CPAPMode)(int)p_profile->calcSettingsMax(CPAP_Mode, MT_CPAP, firstcpap,
-                        lastcpap);
+//    CPAPMode cpapmode = (CPAPMode)(int)p_profile->calcSettingsMax(CPAP_Mode, MT_CPAP, firstcpap, lastcpap);
 
     float percentile = p_profile->general->prefCalcPercentile() / 100.0;
 
@@ -568,7 +580,7 @@ QString Statistics::GenerateHTML()
 
     int decimals = 2;
     html += "<div align=center>";
-    html += QString("<table class=curved>"); //cellpadding=2 cellspacing=0 border=0
+    html += QString("<table class=curved "+table_width+">");
 
     int number_periods = 0;
     if (p_profile->general->statReportMode() == 1) {
@@ -771,38 +783,28 @@ QString Statistics::GenerateHTML()
 
                 if (mode == MODE_CPAP) {
                     min = day->settings_min(CPAP_Pressure);
-                } else if (mode < MODE_BIPAP) {
+                } else if (mode == MODE_APAP) {
                     min = day->settings_min(CPAP_PressureMin);
                     max = day->settings_max(CPAP_PressureMax);
-                } else {
-                    // BIPAP or ASV machines
-                    // min & max hold EPAP
-                    if (day->settingExists(CPAP_EPAPLo)) {
-                        min = day->settings_min(CPAP_EPAPLo);
-                    } else if (day->settingExists(CPAP_EPAP)) {
-                        max = min = day->settings_min(CPAP_EPAP);
-                    }
-
-                    if (day->settingExists(CPAP_EPAPHi)) {
-                        max = day->settings_min(CPAP_EPAPHi);
-                    }
-
-                    if (day->settingExists(CPAP_PSMin)) {
-                        ps = day->settings_min(CPAP_PSMin);
-                    } else if (day->settingExists(CPAP_PS)) {
-                        pshi = ps = day->settings_min(CPAP_PS);
-                    }
-
-                    if (day->settingExists(CPAP_PSMax)) {
-                        pshi = day->settings_max(CPAP_PSMax);
-                    }
-
-                    if (day->settingExists(CPAP_IPAPHi)) {
-                        maxipap = day->settings_max(CPAP_IPAPHi);
-                    } else if (day->settingExists(CPAP_IPAP)) {
-                        maxipap = day->settings_max(CPAP_IPAP);
-                    }
-
+                } else if (mode ==  MODE_BILEVEL_FIXED) {
+                    min = day->settings_min(CPAP_EPAP);
+                    max = day->settings_max(CPAP_IPAP);
+                    ps = max-min;
+                } else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) {
+                    min = day->settings_min(CPAP_EPAPLo);
+                    maxipap = max = day->settings_max(CPAP_IPAPHi);
+                    ps = day->settings_min(CPAP_PS);
+                } else if (mode ==  MODE_ASV) {
+                    min = day->settings_min(CPAP_EPAPLo);
+                    ps = day->settings_min(CPAP_PSMin);
+                    pshi = day->settings_max(CPAP_PSMax);
+                    maxipap = min+pshi;
+                } else if (mode == MODE_ASV_VARIABLE_EPAP) {
+                    min = day->settings_min(CPAP_EPAPLo);
+                    max = day->settings_max(CPAP_EPAPHi);
+                    ps = day->settings_min(CPAP_PSMin);
+                    pshi = day->settings_max(CPAP_PSMax);
+                    maxipap = max + pshi;
                 }
 
                 if ((mode != cmode) || (min != cmin) || (max != cmax) || (ps != cps) || (pshi != cpshi)
@@ -825,16 +827,21 @@ QString Statistics::GenerateHTML()
                         rx.prelief = lastpr;
                         rx.prelset = lastprelset;
                         rx.machine = lastmach;
+                        rx.per1 = 0;
+                        rx.per2 = 0;
 
-                        if (mode < MODE_BIPAP) {
+                        if (mode == MODE_APAP) {
                             rx.per1 = p_profile->calcPercentile(CPAP_Pressure, percentile, MT_CPAP, first, last);
                             rx.per2 = 0;
-                        } else if (mode < MODE_ASV) {
+                        } else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) {
                             rx.per1 = p_profile->calcPercentile(CPAP_EPAP, percentile, MT_CPAP, first, last);
                             rx.per2 = p_profile->calcPercentile(CPAP_IPAP, percentile, MT_CPAP, first, last);
-                        } else {
+                        } else if (mode == MODE_ASV) {
+                            rx.per1 = p_profile->calcPercentile(CPAP_PS, percentile, MT_CPAP, first, last);
+                            rx.per2 = p_profile->calcPercentile(CPAP_PS, percentile, MT_CPAP, first, last);
+                        } else if (mode == MODE_ASV_VARIABLE_EPAP) {
                             rx.per1 = p_profile->calcPercentile(CPAP_EPAP, percentile, MT_CPAP, first, last);
-                            rx.per2 = p_profile->calcPercentile(CPAP_IPAP, percentile, MT_CPAP, first, last);
+                            rx.per2 = p_profile->calcPercentile(CPAP_PS, percentile, MT_CPAP, first, last);
                         }
 
                         rx.weighted = float(rx.days) / float(cpapdays) * rx.ahi;
@@ -883,15 +890,19 @@ QString Statistics::GenerateHTML()
             rx.prelief = prelief;
             rx.prelset = prelset;
             rx.machine = mach;
-            if (mode < MODE_BIPAP) {
+
+            if (mode == MODE_APAP) {
                 rx.per1 = p_profile->calcPercentile(CPAP_Pressure, percentile, MT_CPAP, first, last);
                 rx.per2 = 0;
-            } else if (mode < MODE_ASV) {
+            } else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) {
                 rx.per1 = p_profile->calcPercentile(CPAP_EPAP, percentile, MT_CPAP, first, last);
                 rx.per2 = p_profile->calcPercentile(CPAP_IPAP, percentile, MT_CPAP, first, last);
-            } else {
+            } else if (mode == MODE_ASV) {
+                rx.per1 = p_profile->calcPercentile(CPAP_PS, percentile, MT_CPAP, first, last);
+                rx.per2 = p_profile->calcPercentile(CPAP_PS, percentile, MT_CPAP, first, last);
+            } else if (mode == MODE_ASV_VARIABLE_EPAP) {
                 rx.per1 = p_profile->calcPercentile(CPAP_EPAP, percentile, MT_CPAP, first, last);
-                rx.per2 = p_profile->calcPercentile(CPAP_IPAPHi, percentile, MT_CPAP, first, last);
+                rx.per2 = p_profile->calcPercentile(CPAP_PS, percentile, MT_CPAP, first, last);
             }
 
             rx.weighted = float(rx.days) / float(cpapdays);
@@ -976,101 +987,71 @@ QString Statistics::GenerateHTML()
 
         if (tmpRX.size() > 0) {
             RXsort = RX_ahi;
-            QString minstr, maxstr, modestr, maxhistr;
             qSort(tmpRX.begin(), tmpRX.end(), RXSort);
             tmpRX[0]->highlight = 4; // worst
             int ls = tmpRX.size() - 1;
             tmpRX[ls]->highlight = 1; //best
-            CPAPMode mode = (CPAPMode)(int)p_profile->calcSettingsMax(CPAP_Mode, MT_CPAP, tmpRX[ls]->first,
-                            tmpRX[ls]->last);
+            QString modestr;
 
+            QString idxstr[2];
+            int idx[2];
+            idx[0]=ls;
+            idx[1]=0;
+            idxstr[0]=tr("Best RX Setting");
+            idxstr[1]=tr("Worst RX Setting");
 
-            if (mode < MODE_APAP) { // is CPAP?
-                minstr = STR_TR_Pressure;
-                maxstr = "";
-                modestr = STR_TR_CPAP;
-            } else if (mode < MODE_BIPAP) { // is AUTO?
-                minstr = STR_TR_Min;
-                maxstr = STR_TR_Max;
-                modestr = STR_TR_APAP;
-            } else {
+            for (int i=0; i<2; ++i ) {
+                int i2 = idx[i];
+                if ((i==1) && (ls == 0)) break;
+                CPAPMode mode = (CPAPMode)(int)p_profile->calcSettingsMax(CPAP_Mode, MT_CPAP, tmpRX[i2]->first, tmpRX[i2]->last);
 
-                if (mode < MODE_ASV) { // BIPAP
-                    minstr = STR_TR_EPAP;
-                    maxstr = STR_TR_IPAP;
+                if (mode == MODE_CPAP) {
+                    modestr = STR_TR_CPAP;
+                } else if (mode ==  MODE_APAP) { // is AUTO?
+                    modestr = STR_TR_APAP;
+                } else if (mode == MODE_BILEVEL_FIXED) {
                     modestr = STR_TR_BiLevel;
-                } else {
-                    minstr = STR_TR_EPAP;
-                    maxstr = STR_TR_IPAPLo;
-                    maxhistr = STR_TR_IPAPHi;
-                    modestr = STR_TR_STASV;
+                } else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) {
+                    modestr = QObject::tr("Auto Bi-Level");
+                } else if (mode == MODE_ASV) {
+                    modestr = QObject::tr("ASV");
+                } else if (mode == MODE_ASV_VARIABLE_EPAP) {
+                    modestr = QObject::tr("ASV AutoEPAP");
+                } else modestr = STR_TR_Unknown;
 
+                recbox += QString("<tr><td colspan=2><table width=100% border=0 cellpadding=1 cellspacing=0><tr><td colspan=2 align=center><b>%3</b></td></tr>")
+                          .arg(idxstr[i]);
+                recbox += QString("<tr><td valign=top>") + STR_TR_Start + "<br/>" + STR_TR_End +
+                          QString("</td><td align=right><a href='overview=%1,%2'>%3<br/>%4</a></td></tr>")
+                          .arg(tmpRX[i2]->first.toString(Qt::ISODate))
+                          .arg(tmpRX[i2]->last.toString(Qt::ISODate))
+                          .arg(tmpRX[i2]->first.toString(Qt::SystemLocaleShortDate))
+                          .arg(tmpRX[i2]->last.toString(Qt::SystemLocaleShortDate));
+                recbox += QString("<tr><td><b>%1</b></td><td align=right><b>%2</b></td></tr>").arg(ahitxt).arg(tmpRX[i2]->ahi, 0, 'f', decimals);
+                recbox += QString("<tr><td>%1</td><td align=right>%2</td></tr>").arg(STR_TR_Mode).arg(modestr);
+                if (mode == MODE_CPAP) {
+                    recbox += QString("<tr><td>")+QObject::tr("Fixed")+QString("</td><td align=right>%1%2</td></tr>").arg(tmpRX[i2]->min, 0, 'f', 1).arg(STR_UNIT_CMH2O);
+                } else if (mode == MODE_APAP) {
+                    recbox += QString("<tr><td>")+QObject::tr("Min")+QString("</td><td align=right>%1%2</td></tr>").arg(tmpRX[i2]->min, 0, 'f', 1).arg(STR_UNIT_CMH2O);
+                    recbox += QString("<tr><td>")+QObject::tr("Max")+QString("</td><td align=right>%1%2</td></tr>").arg(tmpRX[i2]->max, 0, 'f', 1).arg(STR_UNIT_CMH2O);
+                } else if (mode == MODE_BILEVEL_FIXED) {
+                    recbox += QString("<tr><td>")+QObject::tr("EPAP")+QString("</td><td align=right>%1%2</td></tr>").arg(tmpRX[i2]->min, 0, 'f', 1).arg(STR_UNIT_CMH2O);
+                    recbox += QString("<tr><td>")+QObject::tr("IPAP")+QString("</td><td align=right>%1%2</td></tr>").arg(tmpRX[i2]->max, 0, 'f', 1).arg(STR_UNIT_CMH2O);
+                } else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) {
+                    recbox += QString("<tr><td>")+QObject::tr("Min EPAP")+QString("</td><td align=right>%1%2</td></tr>").arg(tmpRX[i2]->min, 0, 'f', 1).arg(STR_UNIT_CMH2O);
+                    recbox += QString("<tr><td>")+QObject::tr("Max IPAP")+QString("</td><td align=right>%1%2</td></tr>").arg(tmpRX[i2]->max, 0, 'f', 1).arg(STR_UNIT_CMH2O);
+                    recbox += QString("<tr><td>")+QObject::tr("PS")+QString("</td><td align=right>%1%2</td></tr>").arg(tmpRX[i2]->ps, 0, 'f', 1).arg(STR_UNIT_CMH2O);
+                } else if (mode == MODE_ASV) {
+                    recbox += QString("<tr><td>")+QObject::tr("EPAP")+QString("</td><td align=right>%1%2</td></tr>").arg(tmpRX[i2]->min, 0, 'f', 1).arg(STR_UNIT_CMH2O);
+                    recbox += QString("<tr><td>")+QObject::tr("PS")+QString("</td><td align=right>%1-%2%3</td></tr>").arg(tmpRX[i2]->ps, 0, 'f', 1).arg(tmpRX[i2]->pshi, 0, 'f', 1).arg(STR_UNIT_CMH2O);
+//                    recbox += QString("<tr><td>")+QObject::tr("Max&nbsp;IPAP")+QString("</td><td align=right>%1%2</td></tr>").arg(tmpRX[i2]->maxipap, 0, 'f', 1).arg(STR_UNIT_CMH2O);
+                } else if (mode == MODE_ASV_VARIABLE_EPAP) {
+                    recbox += QString("<tr><td>")+QObject::tr("EPAP")+QString("</td><td align=right>%1-%2%3</td></tr>").arg(tmpRX[i2]->min, 0, 'f', 1).arg(tmpRX[i2]->max, 0, 'f', 1).arg(STR_UNIT_CMH2O);
+                    recbox += QString("<tr><td>")+QObject::tr("PS")+QString("</td><td align=right>%1-%2%3</td></tr>").arg(tmpRX[i2]->ps, 0, 'f', 1).arg(tmpRX[i2]->pshi, 0, 'f', 1).arg(STR_UNIT_CMH2O);
+//                    recbox += QString("<tr><td>")+QObject::tr("Max&nbsp;IPAP")+QString("</td><td align=right>%1%2</td></tr>").arg(tmpRX[i2]->maxipap, 0, 'f', 1).arg(STR_UNIT_CMH2O);
                 }
+                recbox += "</table><br/></td></tr>";
             }
-
-            recbox += QString("<tr><td colspan=2><table width=100% border=0 cellpadding=1 cellspacing=0><tr><td colspan=2 align=center><b>%3</b></td></tr>")
-                      .arg(tr("Best RX Setting"));
-            recbox += QString("<tr><td valign=top>") + STR_TR_Start + "<br/>" + STR_TR_End +
-                      QString("</td><td align=right><a href='overview=%1,%2'>%3<br/>%4</a></td></tr>")
-                      .arg(tmpRX[ls]->first.toString(Qt::ISODate))
-                      .arg(tmpRX[ls]->last.toString(Qt::ISODate))
-                      .arg(tmpRX[ls]->first.toString(Qt::SystemLocaleShortDate))
-                      .arg(tmpRX[ls]->last.toString(Qt::SystemLocaleShortDate));
-            recbox += QString("<tr><td><b>%1</b></td><td align=right><b>%2</b></td></tr>").arg(ahitxt).arg(
-                          tmpRX[ls]->ahi, 0, 'f', decimals);
-            recbox += QString("<tr><td>%1</td><td align=right>%2</td></tr>").arg(STR_TR_Mode).arg(modestr);
-            recbox += QString("<tr><td>%1</td><td align=right>%2%3</td></tr>").arg(minstr).arg(tmpRX[ls]->min,
-                      0, 'f', 1).arg(STR_UNIT_CMH2O);
-
-            if (!maxstr.isEmpty()) { recbox += QString("<tr><td>%1</td><td align=right>%2%3</td></tr>").arg(maxstr).arg(tmpRX[ls]->max, 0, 'f', 1).arg(STR_UNIT_CMH2O); }
-
-            if (!maxhistr.isEmpty()) { recbox += QString("<tr><td>%1</td><td align=right>%2%3</td></tr>").arg(maxhistr).arg(tmpRX[ls]->maxipap, 0, 'f', 1).arg(STR_UNIT_CMH2O); }
-
-            recbox += "</table></td></tr>";
-
-            recbox += QString("<tr><td colspan=2>&nbsp;</td></tr>");
-
-            mode = (CPAPMode)(int)p_profile->calcSettingsMax(CPAP_Mode, MT_CPAP, tmpRX[0]->first, tmpRX[0]->last);
-
-            if (mode < MODE_APAP) { // is CPAP?
-                minstr = STR_TR_Pressure;
-                maxstr = "";
-                modestr = STR_TR_CPAP;
-            } else if (mode < MODE_BIPAP) { // is AUTO?
-                minstr = STR_TR_Min;
-                maxstr = STR_TR_Max;
-                modestr = STR_TR_APAP;
-            } else if (mode < MODE_ASV) { // BIPAP or greater
-                minstr = STR_TR_EPAP;
-                maxstr = STR_TR_IPAP;
-                modestr = STR_TR_BiLevel;
-            } else {
-                minstr = STR_TR_EPAP;
-                maxstr = STR_TR_IPAPLo;
-                maxhistr = STR_TR_IPAPHi;
-                modestr = STR_TR_STASV;
-            }
-
-            recbox += QString("<tr><td colspan=2><table width=100% border=0 cellpadding=1 cellspacing=0><tr><td colspan=2 align=center><b>%3</b></td></tr>")
-                      .arg(tr("Worst RX Setting"));
-            recbox += QString("<tr><td valign=top>") + STR_TR_Start + "<br/>" + STR_TR_End +
-                      QString("</td><td align=right><a href='overview=%1,%2'>%3<br/>%4</a></td></tr>")
-                      .arg(tmpRX[0]->first.toString(Qt::ISODate))
-                      .arg(tmpRX[0]->last.toString(Qt::ISODate))
-                      .arg(tmpRX[0]->first.toString(Qt::SystemLocaleShortDate))
-                      .arg(tmpRX[0]->last.toString(Qt::SystemLocaleShortDate));
-            recbox += QString("<tr><td><b>%1</b></td><td align=right><b>%2</b></td></tr>").arg(ahitxt).arg(
-                          tmpRX[0]->ahi, 0, 'f', decimals);
-            recbox += QString("<tr><td>%1</td><td align=right>%2</td></tr>").arg(STR_TR_Mode).arg(modestr);
-            recbox += QString("<tr><td>%1</td><td align=right>%2%3</td></tr>").arg(minstr).arg(tmpRX[0]->min,
-                      0, 'f', 1).arg(STR_UNIT_CMH2O);
-
-            if (!maxstr.isEmpty()) { recbox += QString("<tr><td>%1</td><td align=right>%2%3</td></tr>").arg(maxstr).arg(tmpRX[0]->max, 0, 'f', 1).arg(STR_UNIT_CMH2O); }
-
-            if (!maxhistr.isEmpty()) { recbox += QString("<tr><td>%1</td><td align=right>%2%3</td></tr>").arg(maxhistr).arg(tmpRX[0]->maxipap, 0, 'f', 1).arg(STR_UNIT_CMH2O); }
-
-            recbox += "</table></td></tr>";
-
         }
 
         recbox += "</table>";
@@ -1082,7 +1063,7 @@ QString Statistics::GenerateHTML()
         qSort(rxchange.begin(),rxchange.end());*/
 
         html += "<div align=center><br/>";
-        html += QString("<table class=curved style=\"page-break-before:always;\">");
+        html += QString("<table class=curved style=\"page-break-before:always;\" "+table_width+">");
         html += "<thead>";
         html += "<tr bgcolor='"+heading_color+"'><th colspan=10 align=center><font size=+2>" + tr("Changes to Prescription Settings") + "</font></th></tr>";
 
@@ -1153,54 +1134,32 @@ QString Statistics::GenerateHTML()
             //            tooltip=QString("%1 %2% ").arg(machstr).arg(percentile*100.0)+STR_TR_EPAP+
             //                    QString("=%1<br/>%2% ").arg(rx.per1,0,'f',decimals).arg(percentile*100.0)+
             //                    STR_TR_IPAP+QString("=%1").arg(rx.per2,0,'f',decimals);
-            if (mode >= MODE_BIPAP) {
-                if (rx.min > 0) {
-                    extratxt += "<td>"+QString(tr("EPAP %1"))
-                                .arg(rx.min, 4, 'f', 1);
-                }
-
-                if ((rx.max > 0) && (rx.min != rx.max)) {
-                    extratxt += QString(" - %2")
-                                .arg(rx.max, 4, 'f', 1);
-                }
-
-                extratxt += "</td><td>";
-
-                if (rx.ps > 0) {
-                    extratxt += "<td>"+QString(tr("PS %1")).arg(rx.ps, 4, 'f', 1);
-                }
-
-                if ((rx.pshi > 0) && (rx.ps != rx.pshi)) {
-                    extratxt += QString(" - %2").arg(rx.pshi, 4, 'f', 1);
-                }
-
-                extratxt += "</td>";
-
-                if (rx.maxipap > 0) {
-                    extratxt += "<td>"+QString(tr("IPAP %1")+"</td>")
-                                .arg(rx.maxipap, 4, 'f', 1);
-                }
-
+            tooltip = QString("%1").arg(machstr);
+            if (mode == MODE_CPAP) {
+                extratxt += "<td colspan=2>"+QString(tr("Fixed %1 %2")+"</td>").arg(rx.min, 4, 'f', 1).arg(schema::channel[CPAP_Pressure].units());
+            } else if (mode == MODE_APAP) {
+                extratxt += "<td colspan=2>"+QString(tr("%1 - %2 %3")+"</td>").arg(rx.min, 4, 'f', 1).arg(rx.max, 4, 'f', 1).arg(schema::channel[CPAP_Pressure].units());
+            } else if (mode == MODE_BILEVEL_FIXED) {
+                extratxt += "<td colspan=2>"+QString(tr("EPAP %1 %3 IPAP %2 %3")+"</td>").arg(rx.min, 4, 'f', 1).arg(rx.max, 4, 'f', 1).arg(schema::channel[CPAP_Pressure].units());
+            } else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) {
+                extratxt += "<td colspan=2>"+QString(tr("PS %4 over %1 - %2 %3")+"</td>").arg(rx.min, 4, 'f', 1).arg(rx.max, 4, 'f', 1).arg(schema::channel[CPAP_Pressure].units()).arg(rx.ps, 4, 'f', 1);
+            } else if (mode == MODE_ASV) {
+                extratxt += "<td colspan=2>"+QString(tr("EPAP %1, PS %2-%3 %4")+"</td>").arg(rx.min, 4, 'f', 1).arg(rx.ps, 4, 'f', 1).arg(rx.pshi, 4, 'f', 1).arg(schema::channel[CPAP_Pressure].units());
+                tooltip = QString("%1 %2% ").arg(machstr).arg(percentile * 100.0) +
+                          STR_TR_EPAP +
+                          QString("=%1<br/>%2% ").arg(rx.per1, 0, 'f', decimals)
+                          .arg(percentile * 100.0)
+                          + STR_TR_IPAP + QString("=%1").arg(rx.per2, 0, 'f', decimals);
+            } else if (mode == MODE_ASV_VARIABLE_EPAP) {
+                extratxt += "<td colspan=2>"+QString(tr("EPAP %1-%2, PS %3-%4 %5")+"</td>").arg(rx.min, 4, 'f', 1).arg(rx.max, 4, 'f', 1).arg(rx.ps, 4, 'f', 1).arg(rx.pshi, 4, 'f', 1).arg(schema::channel[CPAP_Pressure].units());
                 tooltip = QString("%1 %2% ").arg(machstr).arg(percentile * 100.0) +
                           STR_TR_EPAP +
                           QString("=%1<br/>%2% ").arg(rx.per1, 0, 'f', decimals)
                           .arg(percentile * 100.0)
                           + STR_TR_IPAP + QString("=%1").arg(rx.per2, 0, 'f', decimals);
-            } else if (mode > MODE_CPAP) {
-                extratxt += "<td align=left>"+QString(tr("APAP %1 - %2")+"</td><td align=left></td>")
-                            .arg(rx.min, 4, 'f', 1)
-                            .arg(rx.max, 4, 'f', 1);
-                tooltip = QString("%1 %2% ").arg(machstr).arg(percentile * 100.0) + STR_TR_Pressure +
-                          QString("=%2").arg(rx.per1, 0, 'f', decimals);
             } else {
-
-                if (cpapmode >= MODE_CPAP) {
-                    extratxt += "<td colspan=2>"+QString(tr("Fixed %1")+"</td>").arg(rx.min, 4, 'f', 1);
-                    tooltip = QString("%1").arg(machstr);
-                } else {
                     extratxt += "";
                     tooltip = "";
-                }
             }
 
             extratxt += "</tr></table>";
@@ -1253,7 +1212,7 @@ QString Statistics::GenerateHTML()
     if (mach.size() > 0) {
         html += "<div align=center><br/>";
 
-        html += QString("<table class=curved style=\"page-break-before:auto;\">");
+        html += QString("<table class=curved style=\"page-break-before:auto;\" "+table_width+">");
 
         html += "<thead>";
         html += "<tr bgcolor='"+heading_color+"'><td colspan=5 align=center><font size=+2>" + tr("Machine Information") + "</font></td></tr>";
@@ -1275,8 +1234,7 @@ QString Statistics::GenerateHTML()
             if (m->GetType() == MT_JOURNAL) { continue; }
 
             QString mn = m->properties[STR_PROP_ModelNumber];
-            //if (mn.isEmpty())
-            html += QString("<tr class=datarow><td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td></tr>")
+            html += QString("<tr><td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td></tr>")
                     .arg(m->properties[STR_PROP_Brand])
                     .arg(m->properties[STR_PROP_Model] + " " + m->properties[STR_PROP_SubModel] +
                          (mn.isEmpty() ? "" : QString(" (") + mn + QString(")")))

sleepyhead/welcome.cpp

@@ -0,0 +1,242 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
+ * Welcome Page
+ *
+ * Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of the Linux
+ * distribution for more details. */
+
+
+#include <QString>
+#include <QApplication>
+#include <QFont>
+#include "SleepLib/profiles.h"
+
+
+QString GenerateWelcomeHTML()
+{
+    QList<Machine *> cpap_machines = p_profile->GetMachines(MT_CPAP);
+    QList<Machine *> oximeters = p_profile->GetMachines(MT_OXIMETER);
+    QList<Machine *> mach;
+
+    mach.append(cpap_machines);
+    mach.append(oximeters);
+
+    bool havecpapdata = false;
+    bool haveoximeterdata = false;
+    for (int i=0; i < cpap_machines.size(); ++i) {
+        int daysize = cpap_machines[i]->day.size();
+        if (daysize > 0) {
+            havecpapdata = true;
+            break;
+        }
+    }
+    for (int i=0; i < oximeters.size(); ++i) {
+        int daysize = oximeters[i]->day.size();
+        if (daysize > 0) {
+            haveoximeterdata = true;
+            break;
+        }
+    }
+
+
+    QString html = QString("<html><head>")+
+    "</head>"
+    "<style type='text/css'>"
+    "p,a,td,body { font-family: '"+QApplication::font().family()+"'; }"
+    "p,a,td,body { font-size: "+QString::number(QApplication::font().pointSize() + 2)+"px; }"
+
+    "table.curved {"
+        "border: 1px solid gray;"
+        "border-radius:10px;"
+        "-moz-border-radius:10px;"
+        "-webkit-border-radius:10px;"
+        "page-break-after:auto;"
+        "-fs-table-paginate: paginate;"
+    "}"
+            "table.curved2 {"
+                "border: 1px solid gray;"
+                "border-radius:10px;"
+                "background:#ffffc0;"
+                "-moz-border-radius:10px;"
+                "-webkit-border-radius:10px;"
+                "page-break-after:auto;"
+                "-fs-table-paginate: paginate;"
+            "}"
+    "tr.datarow:nth-child(even) {"
+        "background-color: #f8f8f8;"
+    "}"
+    "table { page-break-after:auto; -fs-table-paginate: paginate; }"
+    "tr    { page-break-inside:avoid; page-break-after:auto }"
+    "td    { page-break-inside:avoid; page-break-after:auto }"
+    "thead { display:table-header-group; }"
+    "tfoot { display:table-footer-group; }"
+
+
+    "</style>"
+    "<link rel='stylesheet' type='text/css' href='qrc:/docs/tooltips.css' />"
+    "<script type='text/javascript'>"
+    "function ChangeColor(tableRow, highLight)"
+    "{ tableRow.style.backgroundColor = highLight; }"
+    "function Go(url) { throw(url); }"
+    "</script>"
+    "</head>"
+    "<body leftmargin=0 topmargin=5 rightmargin=0>";
+
+    html += "<div align=center><table border=0 height=100% width=99%>";
+    html += QString("<tr><td colspan=2 align=center>") +
+    "<img src='qrc:/icons/bob-v3.0.png' height=100px>"
+
+    "<h1>" + QObject::tr("Welcome to SleepyHead") + "</h1>" +
+
+    "<table cellpadding=4 border=0>";
+
+    int cols=2;
+    if (havecpapdata || haveoximeterdata) cols=4;
+
+
+     html+=QString("<tr><td colspan=%1 align=center>").arg(cols)+
+     "<font size=+1>"+((havecpapdata || haveoximeterdata) ? QObject::tr("Would you like to import more data?") : QObject::tr("Please Import Some Data")) +"</font></td>"
+     "</tr>"
+     "<tr>"
+      "<td align=center>"
+        "<table class=curved cellpadding=4>"
+         "<tr><td align=center onmouseover='ChangeColor(this, \"#eeeeee\");' onmouseout='ChangeColor(this, \"#ffffff\");' onclick='alert(\"import=cpap\");'><font size=+1><img src='qrc:/icons/sdcard.png' width=128px><br/>" + QObject::tr("CPAP<br/>Importer")+"</font></td></tr>"
+        "</table>"
+      "</td>"
+      "<td align=center>"
+       "<table class=curved cellpadding=4>"
+         "<tr><td align=center onmouseover='ChangeColor(this, \"#eeeeee\");' onmouseout='ChangeColor(this, \"#ffffff\");' onclick='alert(\"import=oximeter\");'><font size=+1><img src='qrc:/icons/cms50f.png' width=128px><br/>" + QObject::tr("Oximetery<br/>Wizard")+"</font></td></tr>"
+       "</table>"
+      "</td>";
+      if (havecpapdata || haveoximeterdata) {
+          html += "<td align=center><font size=+2>or</font></td>"
+          "<td align=center>"
+          "<table class=curved cellpadding=4>"
+          "<tr><td align=center onmouseover='ChangeColor(this, \"#eeeeee\");' onmouseout='ChangeColor(this, \"#ffffff\");' onclick='alert(\"statistics=1\");'><font size=+1><img src='qrc:/icons/statistics.png' width=128px><br/>" + QObject::tr("View<br/>Statistics")+"</font></td></tr>"
+          "</table>"
+          "</td>";
+      }
+     html += "</tr></table>";
+    if (!havecpapdata && !haveoximeterdata) {
+        html += "<p>" + QObject::tr("It might be a good idea to check preferences first,</br>as there are some options that affect import.")+"</p>"
+        "<p>" + QObject::tr("First import can take a few minutes.") + "</p>";
+    } else {
+        if (havecpapdata) {
+            QString cpapimage = "";
+            QDate date = p_profile->LastDay(MT_CPAP);
+            Day *day = p_profile->GetDay(date, MT_CPAP);
+            if (day) {
+                if (day->machine->GetClass() == STR_MACH_ResMed) cpapimage = "qrc:/icons/rms9.png";
+                else if (day->machine->GetClass() == STR_MACH_PRS1) cpapimage = "qrc:/icons/prs1.png";
+                else if (day->machine->GetClass() == STR_MACH_Intellipap) cpapimage = "qrc:/icons/intellipap.png";
+            }
+            html += "<table cellpadding=4><tr><td><img src='"+cpapimage+"' width=128px><br/>";
+
+            html+="</td><td><table cellpadding=4 class=curved2><tr>"+
+                    QString("<td align=center  onmouseover='ChangeColor(this, \"#efefa0\");' onmouseout='ChangeColor(this, \"#ffffc0\");' onclick='alert(\"daily=%1\");'>").arg(date.toString(Qt::ISODate))+"<b>"+
+                    QObject::tr("The last time you used your %1...").arg(day->machine->properties[STR_PROP_Brand]+" "+day->machine->properties[STR_PROP_Model])+"</b><br/>";
+
+            int daysto = date.daysTo(QDate::currentDate());
+            QString daystring;
+            if (daysto == 1) daystring += QObject::tr("last night");
+            else if (daysto == 2) daystring += QObject::tr("yesterday");
+            else daystring += QObject::tr("%2 days ago").arg(date.daysTo(QDate::currentDate()));
+
+            html += QObject::tr("was %1 (on %2)").arg(daystring).arg(date.toString(Qt::SystemLocaleLongDate)) + "<br/>";
+
+
+            EventDataType hours = day->hours();
+
+            EventDataType ahi=(day->count(CPAP_Obstructive) + day->count(CPAP_Hypopnea) + day->count(CPAP_ClearAirway) + day->count(CPAP_Apnea)) / hours;
+
+            QString ahitext;
+            if (ahi < 0.000001) ahitext =  QString("<font color=green>")+QObject::tr("perfect :)")+"</font>";
+            else if (ahi < 1) ahitext = QObject::tr("pretty darn good");
+            else if (ahi < 3) ahitext = QObject::tr("reasonably good");
+            else if (ahi < 5) ahitext = QObject::tr("technically \"treated\"");
+            else if (ahi < 10) ahitext = QString("<font color=red>")+QObject::tr("not very good")+"</font>";
+            else ahitext = QString("<font color=red>")+QObject::tr("horrible, please consult your doctor")+"</font>";
+
+            html += QObject::tr("Your had an AHI of %1, which is considered %2.").arg(ahi,0,'f',2).arg(ahitext)+"<br/>";
+
+            int seconds = int(hours * 3600.0) % 60;
+            int minutes = int(hours * 60) % 60;
+            int hour = hours;
+            QString timestr = QObject::tr("%1 hours, %2 minutes and %3 seconds").arg(hour).arg(minutes).arg(seconds);
+
+            if (hours > 4) html += QObject::tr("You slept for %1.").arg(timestr)+"<br/>";
+            else html += QObject::tr("<font color = red>You only had the mask on for %1.</font>").arg(timestr)+"<br/>";
+
+
+            EventDataType lat = day->timeAboveThreshold(CPAP_Leak, p_profile->cpap->leakRedline())/ 60.0;
+            EventDataType leaks = 1.0/hours * lat;
+            EventDataType leakmax = day->Max(CPAP_Leak);
+            QString leaktext;
+            if (leaks < 0.000001) leaktext=QObject::tr("You had no <i>major</i> mask leaks (maximum was %1 %2).").arg(leakmax,0,'f',2).arg(schema::channel[CPAP_Leak].units());
+            else if (leaks < 0.01) leaktext=QObject::tr("You had a small but acceptable amount of <i>major</i> mask leakage.");
+            else if (leaks < 0.10) leaktext=QObject::tr("You had significant periods of <i>major</i> mask leakage.");
+            else leaktext=QObject::tr("Your mask is leaking way too much.. Talk to your CPAP advisor.");
+            html += leaktext + "<br/>";
+
+            CPAPMode cpapmode = (CPAPMode)(int)day->settings_max(CPAP_Mode);
+            double perc= p_profile->general->prefCalcPercentile();
+
+            if (cpapmode == MODE_CPAP) {
+                EventDataType pressure = day->settings_max(CPAP_Pressure);
+                html += QObject::tr("Your CPAP machine blasted you with a constant %1%2 of air").arg(pressure).arg(schema::channel[CPAP_Pressure].units());
+            } else if (cpapmode == MODE_APAP) {
+                EventDataType pressure = day->percentile(CPAP_Pressure, perc/100.0);
+                html += QObject::tr("Your pressure was under %1%2 for %3% of the time.").arg(pressure).arg(schema::channel[CPAP_Pressure].units()).arg(perc);
+            } else if (cpapmode == MODE_BILEVEL_FIXED) {
+                EventDataType ipap = day->settings_max(CPAP_IPAP);
+                EventDataType epap = day->settings_min(CPAP_EPAP);
+                html += QObject::tr("Your machine blasted you with a constant %1-%2 %3 of air.").arg(epap).arg(ipap).arg(schema::channel[CPAP_Pressure].units());
+            } else if (cpapmode == MODE_BILEVEL_AUTO_FIXED_PS) {
+                EventDataType ipap = day->percentile(CPAP_IPAP, perc/100.0);
+                EventDataType epap = day->percentile(CPAP_EPAP, perc/100.0);
+                html += QObject::tr("Your machine was under %1-%2 %3 for %4% of the time.").arg(epap).arg(ipap).arg(schema::channel[CPAP_Pressure].units()).arg(perc);
+            } else {
+                EventDataType pressure = day->percentile(CPAP_Pressure, perc/100.0);
+                html += QObject::tr("Your EPAP pressure was under %1%2 for %3% of the time.").arg(pressure).arg(schema::channel[CPAP_EPAP].units()).arg(perc);
+                html += QObject::tr("Your IPAP pressure was under %1%2 for %3% of the time.").arg(pressure).arg(schema::channel[CPAP_EPAP].units()).arg(perc);
+            }
+
+
+            html+="</td></tr></table></td></tr></table>";
+
+        } else {
+            html += "<p>"+QObject::tr("No CPAP data has been imported yet.")+"</p>";
+        }
+        if (haveoximeterdata) {
+            QDate oxidate=p_profile->LastDay(MT_OXIMETER);
+            int daysto = oxidate.daysTo(QDate::currentDate());
+
+            html += "<p>"+QObject::tr("Most recent Oximetery data: <a onclick='alert(\"daily=%2\");'>%1</a> ").arg(oxidate.toString(Qt::SystemLocaleLongDate)).arg(oxidate.toString(Qt::ISODate));
+            if (daysto == 1) html += QObject::tr("(last night)");
+            else if (daysto == 2) html += QObject::tr("(yesterday)");
+            else html += QObject::tr("(%2 day ago)").arg(oxidate.daysTo(QDate::currentDate()));
+            html+="</p>";
+        } else {
+            html += "<p>"+QObject::tr("No oximetery data has been imported yet.")+"</p>";
+        }
+
+    }
+    html += QString("<div align=center><table class=curved cellpadding=3 width=45%>")+
+    "<tr>"
+    "<td align=center colspan=2><b>"+QObject::tr("Very Important Warning")+"</b></td></tr>"
+    "<tr><td align=left>"+
+    QObject::tr("<p>ALWAYS <font size=+1 color=red><b>write protect</b></font> CPAP SDCards before inserting them into your computer.")+"</p>"+
+    QObject::tr("<span title=\"Mac OSX and Win8.1\"  onmouseover='ChangeColor(this, \"#eeeeee\");' onmouseout='ChangeColor(this, \"#ffffff\");'><font color=blue>Certain operating systems</font></span> write index files to the card without asking, which can render your card unreadable by your cpap machine.")+"</td>"
+    "<td><img src=\"qrc:/icons/sdcard-lock.png\"></td>"
+    "</tr>"
+    "</table>"
+    "</td></tr></table></div>"
+    "<script type='text/javascript' language='javascript' src='qrc:/docs/script.js'></script>"
+    "</body></html>";
+    return html;
+}
+