From 9f5373ed91ad0a047ae0581c29dcb23f9158c499 Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Sat, 24 Jul 2021 21:12:15 -0700
Subject: [PATCH] Refactor functions that act on all AHI-contributing channels.
 Add new AllAhiChannels ChannelID to refer to all channels that contribute to
 AHI. List of AHI-contributing channels is in "ahiChannels" QVector.

---
 Htmldocs/release_notes.html         |  4 ++
 oscar/Graphs/gLineChart.cpp         | 13 +++--
 oscar/Graphs/gSessionTimesChart.cpp |  5 +-
 oscar/Graphs/gSessionTimesChart.h   | 12 +++--
 oscar/Graphs/gdailysummary.cpp      | 12 +++--
 oscar/SleepLib/calcs.cpp            | 84 ++++++++++++++++++-----------
 oscar/SleepLib/common.cpp           |  4 +-
 oscar/SleepLib/common.h             |  1 +
 oscar/SleepLib/day.cpp              | 12 +++++
 oscar/SleepLib/day.h                |  8 +--
 oscar/SleepLib/machine_common.cpp   |  4 +-
 oscar/SleepLib/machine_common.h     |  4 +-
 oscar/SleepLib/machine_loader.cpp   | 11 ++--
 oscar/SleepLib/schema.cpp           | 15 ++++++
 oscar/SleepLib/session.cpp          | 17 +++++-
 oscar/daily.cpp                     | 31 ++++++++---
 oscar/exportcsv.cpp                 | 17 +++---
 oscar/reports.cpp                   |  6 ++-
 oscar/statistics.cpp                | 27 ++++++----
 oscar/tests/sessiontests.cpp        |  1 +
 oscar/welcome.cpp                   |  3 +-
 21 files changed, 207 insertions(+), 84 deletions(-)

diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index b246c8fd..f619610a 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -15,6 +15,8 @@
     <br>Portions of OSCAR are © 2019-2021 by
     <i>The OSCAR Team</i></p>
     <ul>
+      <li>[new] Add support for ResMed AirSense 11 CPAP machines.</li>
+      <li>[new] Add support for Fisher & Paykel SleepStyle CPAP machines.</li>
       <li>[new] Add support for DeVilbiss BLUE (DV6x) CPAP machines.</li>
       <li>[new] Additional Philips Respironics devices tested and fully supported:
         <ul>
@@ -51,6 +53,8 @@
       <li>[fix] Correct Total Time and AHI in CSV Export when non-CPAP devices are used.</li>
       <li>[fix] Fix value display and bookmark behavior with clock drift.</li>
       <li>[fix] Ignore old sessions should not impact existing data.</li>
+      <li>[fix] Fix ocasional misordering of indexes on the Daily page.</li>
+      <li>[fix] Add Unclassified Apneas to the Statistics page.</li>
     </ul>
     <p>
     <b>Changes and fixes in OSCAR v1.2.0</b>
diff --git a/oscar/Graphs/gLineChart.cpp b/oscar/Graphs/gLineChart.cpp
index 96405842..54aee5dd 100644
--- a/oscar/Graphs/gLineChart.cpp
+++ b/oscar/Graphs/gLineChart.cpp
@@ -1084,10 +1084,15 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
     time /= 1000;
 
     QList<ChannelID> ahilist;
-    ahilist.push_back(CPAP_Hypopnea);
-    ahilist.push_back(CPAP_Obstructive);
-    ahilist.push_back(CPAP_Apnea);
-    ahilist.push_back(CPAP_ClearAirway);
+
+    for (int i = 0; i < ahiChannels.size(); i++)
+        ahilist.push_back(ahiChannels.at(i));
+
+//    ahilist.push_back(CPAP_Hypopnea);
+//    ahilist.push_back(CPAP_AllApnea);
+//    ahilist.push_back(CPAP_Obstructive);
+//    ahilist.push_back(CPAP_Apnea);
+//    ahilist.push_back(CPAP_ClearAirway);
 
     QList<ChannelID> extras;
     extras.push_back(CPAP_NRI);
diff --git a/oscar/Graphs/gSessionTimesChart.cpp b/oscar/Graphs/gSessionTimesChart.cpp
index b2d314f0..94ccc71c 100644
--- a/oscar/Graphs/gSessionTimesChart.cpp
+++ b/oscar/Graphs/gSessionTimesChart.cpp
@@ -13,6 +13,7 @@
 
 #include "mainwindow.h"
 #include "SleepLib/profiles.h"
+#include "SleepLib/machine_common.h"
 #include "gSessionTimesChart.h"
 
 #include "gYAxis.h"
@@ -1134,7 +1135,9 @@ void gTTIAChart::afterDraw(QPainter &, gGraph &graph, QRectF rect)
 void gTTIAChart::populate(Day *day, int idx)
 {
     QVector<SummaryChartSlice> & slices = cache[idx];
-    float ttia = day->sum(CPAP_Obstructive) + day->sum(CPAP_ClearAirway) + day->sum(CPAP_Apnea) + day->sum(CPAP_Hypopnea);
+//    float ttia = day->sum(CPAP_AllApnea) + day->sum(CPAP_Obstructive) + day->sum(CPAP_ClearAirway) + day->sum(CPAP_Apnea) + day->sum(CPAP_Hypopnea);
+    float ttia = day->sum(AllAhiChannels);
+
     int h = ttia / 3600;
     int m = int(ttia) / 60 % 60;
     int s = int(ttia) % 60;
diff --git a/oscar/Graphs/gSessionTimesChart.h b/oscar/Graphs/gSessionTimesChart.h
index bdd8bcc8..a4562016 100644
--- a/oscar/Graphs/gSessionTimesChart.h
+++ b/oscar/Graphs/gSessionTimesChart.h
@@ -377,10 +377,14 @@ class gAHIChart : public gSummaryChart
 public:
     gAHIChart()
         :gSummaryChart("AHIChart", MT_CPAP) {
-        addCalc(CPAP_ClearAirway, ST_CPH);
-        addCalc(CPAP_Obstructive, ST_CPH);
-        addCalc(CPAP_Apnea, ST_CPH);
-        addCalc(CPAP_Hypopnea, ST_CPH);
+        for (int i = 0; i < ahiChannels.size(); i++)
+            addCalc(ahiChannels.at(i), ST_CPH);
+
+//        addCalc(CPAP_ClearAirway, ST_CPH);
+//        addCalc(CPAP_AllApnea, ST_CPH);
+//        addCalc(CPAP_Obstructive, ST_CPH);
+//        addCalc(CPAP_Apnea, ST_CPH);
+//        addCalc(CPAP_Hypopnea, ST_CPH);
         if (p_profile->general->calculateRDI())
             addCalc(CPAP_RERA, ST_CPH);
     }
diff --git a/oscar/Graphs/gdailysummary.cpp b/oscar/Graphs/gdailysummary.cpp
index 6d10eeb1..114fdd8b 100644
--- a/oscar/Graphs/gdailysummary.cpp
+++ b/oscar/Graphs/gdailysummary.cpp
@@ -22,10 +22,14 @@ void gDailySummary::SetDay(Day *day)
 {
     QList<ChannelID> piechans;
 
-    piechans.append(CPAP_ClearAirway);
-    piechans.append(CPAP_Obstructive);
-    piechans.append(CPAP_Apnea);
-    piechans.append(CPAP_Hypopnea);
+    for (int i = 0; i < ahiChannels.size(); i++)
+        piechans.append(ahiChannels.at(i));
+
+//    piechans.append(CPAP_ClearAirway);
+//    piechans.append(CPAP_AllApnea);
+//    piechans.append(CPAP_Obstructive);
+//    piechans.append(CPAP_Apnea);
+//    piechans.append(CPAP_Hypopnea);
     piechans.append(CPAP_RERA);
     piechans.append(CPAP_FlowLimit);
 
diff --git a/oscar/SleepLib/calcs.cpp b/oscar/SleepLib/calcs.cpp
index dec607f1..bf4a08cc 100644
--- a/oscar/SleepLib/calcs.cpp
+++ b/oscar/SleepLib/calcs.cpp
@@ -82,17 +82,25 @@ bool SearchEvent(Session * session, ChannelID code, qint64 time, int dur, bool u
 
 bool SearchApnea(Session *session, qint64 time, double dur)
 {
-    if (SearchEvent(session, CPAP_Obstructive, time, dur))
-        return true;
 
-    if (SearchEvent(session, CPAP_Apnea, time, dur))
-        return true;
+    for (int i = 0; i < ahiChannels.size(); i++)
+        if (SearchEvent(session, ahiChannels.at(i), time, dur))
+            return true;
 
-    if (SearchEvent(session, CPAP_ClearAirway, time, dur))
-        return true;
-
-    if (SearchEvent(session, CPAP_Hypopnea, time, dur))
-        return true;
+//    if (SearchEvent(session, CPAP_AllApnea, time, dur))
+//        return true;
+//
+//    if (SearchEvent(session, CPAP_Obstructive, time, dur))
+//        return true;
+//
+//    if (SearchEvent(session, CPAP_Apnea, time, dur))
+//        return true;
+//
+//    if (SearchEvent(session, CPAP_ClearAirway, time, dur))
+//        return true;
+//
+//    if (SearchEvent(session, CPAP_Hypopnea, time, dur))
+//        return true;
 
     if (SearchEvent(session, CPAP_UserFlag1, time, dur, false))
         return true;
@@ -965,10 +973,11 @@ EventDataType calcAHI(Session *session, qint64 start, qint64 end)
     if (start < 0) {
         // much faster..
         hours = session->hours();
-        cnt = session->count(CPAP_Obstructive)
-              + session->count(CPAP_Hypopnea)
-              + session->count(CPAP_ClearAirway)
-              + session->count(CPAP_Apnea);
+        cnt = session->count(AllAhiChannels);
+//              + session->count(CPAP_AllApnea)
+//              + session->count(CPAP_Hypopnea)
+//              + session->count(CPAP_ClearAirway)
+//              + session->count(CPAP_Apnea);
 
         if (rdi) {
             cnt += session->count(CPAP_RERA);
@@ -980,10 +989,12 @@ EventDataType calcAHI(Session *session, qint64 start, qint64 end)
 
         if (hours == 0) { return 0; }
 
-        cnt = session->rangeCount(CPAP_Obstructive, start, end)
-              + session->rangeCount(CPAP_Hypopnea, start, end)
-              + session->rangeCount(CPAP_ClearAirway, start, end)
-              + session->rangeCount(CPAP_Apnea, start, end);
+        cnt = session->rangeCount(AllAhiChannels, start, end);
+//        cnt = session->rangeCount(CPAP_Obstructive, start, end)
+//              + session->rangeCount(CPAP_AllApnea, start, end)
+//              + session->rangeCount(CPAP_Hypopnea, start, end)
+//              + session->rangeCount(CPAP_ClearAirway, start, end)
+//              + session->rangeCount(CPAP_Apnea, start, end);
 
         if (rdi) {
             cnt += session->rangeCount(CPAP_RERA, start, end);
@@ -1019,12 +1030,18 @@ int calcAHIGraph(Session *session)
         session->destroyEvent(CPAP_RDI);
     }
 
-    if (!session->channelExists(CPAP_Obstructive) &&
-            !session->channelExists(CPAP_Hypopnea) &&
-            !session->channelExists(CPAP_Apnea) &&
-            !session->channelExists(CPAP_ClearAirway) &&
-            !session->channelExists(CPAP_RERA)
-       ) { return 0; }
+    bool gotsome = false;
+    for (int i = 0; i < ahiChannels.size(); i++)
+        gotsome = gotsome || session->channelExists(ahiChannels.at(i));
+
+//    if (!session->channelExists(CPAP_Obstructive) &&
+//            !session->channelExists(CPAP_AllApnea) &&
+//            !session->channelExists(CPAP_Hypopnea) &&
+//            !session->channelExists(CPAP_Apnea) &&
+//            !session->channelExists(CPAP_ClearAirway) &&
+//            !session->channelExists(CPAP_RERA)
+    if (!gotsome)
+       return 0;
 
     qint64 first = session->first(),
            last = session->last(),
@@ -1062,10 +1079,12 @@ int calcAHIGraph(Session *session)
                     break;
                 }
 
-                events = session->rangeCount(CPAP_Obstructive, ti, t)
-                         + session->rangeCount(CPAP_Hypopnea, ti, t)
-                         + session->rangeCount(CPAP_ClearAirway, ti, t)
-                         + session->rangeCount(CPAP_Apnea, ti, t);
+                events = session->rangeCount(AllAhiChannels, ti, t);
+//                events = session->rangeCount(CPAP_Obstructive, ti, t)
+//                         + session->rangeCount(CPAP_Hypopnea, ti, t)
+//                         + session->rangeCount(CPAP_Hypopnea, ti, t)
+//                         + session->rangeCount(CPAP_ClearAirway, ti, t)
+//                         + session->rangeCount(CPAP_Apnea, ti, t);
 
                 ahi = events / hours;
 
@@ -1091,10 +1110,13 @@ int calcAHIGraph(Session *session)
             f = ti - window_size_ms;
             //hours=window_size; //double(ti-f)/3600000L;
 
-            events = session->rangeCount(CPAP_Obstructive, f, ti)
-                     + session->rangeCount(CPAP_Hypopnea, f, ti)
-                     + session->rangeCount(CPAP_ClearAirway, f, ti)
-                     + session->rangeCount(CPAP_Apnea, f, ti);
+//            events = session->rangeCount(CPAP_Obstructive, f, ti)
+//                     + session->rangeCount(CPAP_AllApnea, f, ti)
+//                     + session->rangeCount(CPAP_Hypopnea, f, ti)
+//                     + session->rangeCount(CPAP_ClearAirway, f, ti)
+//                     + session->rangeCount(CPAP_Apnea, f, ti);
+
+            events = session->rangeCount(AllAhiChannels, f, ti);
 
             ahi = events / hours;
             avgahi += ahi;
diff --git a/oscar/SleepLib/common.cpp b/oscar/SleepLib/common.cpp
index 3251b815..9eab9af4 100644
--- a/oscar/SleepLib/common.cpp
+++ b/oscar/SleepLib/common.cpp
@@ -539,6 +539,7 @@ QString STR_TR_Humidifier;
 
 QString STR_TR_H;       // Short form of Hypopnea
 QString STR_TR_OA;      // Short form of Obstructive Apnea
+QString STR_TR_A;       // Short form of Apnea
 QString STR_TR_UA;      // Short form of Unspecified Apnea
 QString STR_TR_CA;      // Short form of Clear Airway Apnea
 QString STR_TR_FL;      // Short form of Flow Limitation
@@ -746,7 +747,8 @@ void initializeStrings()
 
     STR_TR_H = QObject::tr("H");      // Short form of Hypopnea
     STR_TR_OA = QObject::tr("OA");    // Short form of Obstructive Apnea
-    STR_TR_UA = QObject::tr("A");     // Short form of Unspecified Apnea
+    STR_TR_A = QObject::tr("A");     // Short form of All Apnea
+    STR_TR_UA = QObject::tr("UA");     // Short form of Unspecified Apnea
     STR_TR_CA = QObject::tr("CA");    // Short form of Clear Airway Apnea
     STR_TR_FL = QObject::tr("FL");    // Short form of Flow Limitation
     STR_TR_SA = QObject::tr("SA");    // Short form of Flow Limitation
diff --git a/oscar/SleepLib/common.h b/oscar/SleepLib/common.h
index 1ef4dee7..2bd629a5 100644
--- a/oscar/SleepLib/common.h
+++ b/oscar/SleepLib/common.h
@@ -262,6 +262,7 @@ extern QString STR_TR_Humidifier;
 
 extern QString STR_TR_H;       // Short form of Hypopnea
 extern QString STR_TR_OA;      // Short form of Obstructive Apnea
+extern QString STR_TR_A;       // Short form of Apnea
 extern QString STR_TR_UA;      // Short form of Unspecified Apnea
 extern QString STR_TR_CA;      // Short form of Clear Airway Apnea
 extern QString STR_TR_FL;      // Short form of Flow Limitation
diff --git a/oscar/SleepLib/day.cpp b/oscar/SleepLib/day.cpp
index a18f657a..30b97cc1 100644
--- a/oscar/SleepLib/day.cpp
+++ b/oscar/SleepLib/day.cpp
@@ -638,6 +638,12 @@ EventDataType Day::sum(ChannelID code)
     // Cache this?
     EventDataType val = 0;
 
+    if (code == AllAhiChannels) {
+        for (int i = 0; i < ahiChannels.size(); i++)
+            val += sum(ahiChannels.at(i));
+        return val;
+    }
+
     for (auto & sess : sessions) {
         if (sess->enabled() && sess->m_sum.contains(code)) {
             val += sess->sum(code);
@@ -1118,6 +1124,12 @@ EventDataType Day::count(ChannelID code)
 {
     EventDataType total = 0;
 
+    if (code == AllAhiChannels) {
+        for (int i = 0; i < ahiChannels.size(); i++)
+            total += count(ahiChannels.at(i));
+        return total;
+    }
+
     for (auto & sess : sessions) {
         if (sess->enabled() && sess->m_cnt.contains(code)) {
             total += sess->count(code);
diff --git a/oscar/SleepLib/day.h b/oscar/SleepLib/day.h
index 2691f652..037effdf 100644
--- a/oscar/SleepLib/day.h
+++ b/oscar/SleepLib/day.h
@@ -250,14 +250,14 @@ class Day
 
     //! \brief Calculate AHI (Apnea Hypopnea Index)
     EventDataType calcAHI() {
-        EventDataType c = count(CPAP_Hypopnea) + count(CPAP_Obstructive) + count(CPAP_Apnea) + count(CPAP_ClearAirway);
+        EventDataType c = count(AllAhiChannels);
         EventDataType minutes = hours(MT_CPAP) * 60.0;
         return (c * 60.0) / minutes;
     }
 
     //! \brief Calculate RDI (Respiratory Disturbance Index)
     EventDataType calcRDI() {
-        EventDataType c = count(CPAP_Hypopnea) + count(CPAP_Obstructive) + count(CPAP_Apnea) + count(CPAP_ClearAirway) + count(CPAP_RERA);
+        EventDataType c = count(AllAhiChannels) + count(CPAP_RERA);
         EventDataType minutes = hours(MT_CPAP) * 60.0;
         return (c * 60.0) / minutes;
     }
@@ -280,13 +280,13 @@ class Day
 
     //! \brief SleepyyHead Events Index, AHI combined with OSCAR detected events.. :)
     EventDataType calcSHEI() {
-        EventDataType c = count(CPAP_Hypopnea) + count(CPAP_Obstructive) + count(CPAP_Apnea) + count(CPAP_ClearAirway) + count(CPAP_UserFlag1) + count(CPAP_UserFlag2);
+        EventDataType c = count(AllAhiChannels) + count(CPAP_UserFlag1) + count(CPAP_UserFlag2);
         EventDataType minutes = hours(MT_CPAP) * 60.0;
         return (c * 60.0) / minutes;
     }
     //! \brief Total duration of all Apnea/Hypopnea events in seconds,
     EventDataType calcTTIA() {
-        EventDataType c = sum(CPAP_Hypopnea) + sum(CPAP_Obstructive) + sum(CPAP_Apnea) + sum(CPAP_ClearAirway);
+        EventDataType c = sum(AllAhiChannels);
         return c;
     }
     bool hasEvents();
diff --git a/oscar/SleepLib/machine_common.cpp b/oscar/SleepLib/machine_common.cpp
index 29fb0214..5476c9db 100644
--- a/oscar/SleepLib/machine_common.cpp
+++ b/oscar/SleepLib/machine_common.cpp
@@ -9,12 +9,14 @@
 
 #include "machine_common.h"
 
+ChannelID AllAhiChannels = 0xffff;
+QVector<ChannelID> ahiChannels;
 
 ChannelID NoChannel, SESSION_ENABLED, CPAP_SummaryOnly;
 ChannelID CPAP_IPAP, CPAP_IPAPLo, CPAP_IPAPHi, CPAP_EPAP, CPAP_EPAPLo, CPAP_EPAPHi, CPAP_Pressure,
           CPAP_PS, CPAP_Mode, CPAP_AHI,
           CPAP_PressureMin, CPAP_PressureMax, CPAP_Ramp, CPAP_RampTime, CPAP_RampPressure, CPAP_Obstructive,
-          CPAP_Hypopnea,
+          CPAP_Hypopnea, CPAP_AllApnea,
           CPAP_ClearAirway, CPAP_Apnea, CPAP_PB, CPAP_CSR, CPAP_LeakFlag, CPAP_ExP, CPAP_NRI, CPAP_VSnore,
           CPAP_VSnore2,
           CPAP_RERA, CPAP_PressurePulse, CPAP_FlowLimit, CPAP_SensAwake, CPAP_FlowRate, CPAP_MaskPressure,
diff --git a/oscar/SleepLib/machine_common.h b/oscar/SleepLib/machine_common.h
index 51848735..c3172c9c 100644
--- a/oscar/SleepLib/machine_common.h
+++ b/oscar/SleepLib/machine_common.h
@@ -141,13 +141,15 @@ struct MachineInfo {
 enum MCDataType
 { MC_bool = 0, MC_int, MC_long, MC_float, MC_double, MC_string, MC_datetime };
 
+extern ChannelID AllAhiChannels;
+extern QVector<ChannelID> ahiChannels;
 
 extern ChannelID NoChannel, SESSION_ENABLED, CPAP_SummaryOnly;
 extern ChannelID CPAP_IPAP, CPAP_IPAPLo, CPAP_IPAPHi, CPAP_EPAP, CPAP_EPAPLo, CPAP_EPAPHi,
        CPAP_Pressure, CPAP_PS, CPAP_PSMin, CPAP_PSMax,
        CPAP_Mode, CPAP_AHI,
        CPAP_PressureMin, CPAP_PressureMax, CPAP_Ramp, CPAP_RampTime, CPAP_RampPressure, CPAP_Obstructive,
-       CPAP_Hypopnea,
+       CPAP_Hypopnea, CPAP_AllApnea,
        CPAP_ClearAirway, CPAP_Apnea, CPAP_PB, CPAP_CSR, CPAP_LeakFlag, CPAP_ExP, CPAP_NRI, CPAP_VSnore,
        CPAP_VSnore2,
        CPAP_RERA, CPAP_PressurePulse, CPAP_FlowLimit, CPAP_SensAwake, CPAP_FlowRate, CPAP_MaskPressure,
diff --git a/oscar/SleepLib/machine_loader.cpp b/oscar/SleepLib/machine_loader.cpp
index f295b99d..9cf44abf 100644
--- a/oscar/SleepLib/machine_loader.cpp
+++ b/oscar/SleepLib/machine_loader.cpp
@@ -211,10 +211,13 @@ QList<ChannelID> CPAPLoader::eventFlags(Day * day)
         return list;
     }
 
-    list.push_back(CPAP_ClearAirway);
-    list.push_back(CPAP_Obstructive);
-    list.push_back(CPAP_Hypopnea);
-    list.push_back(CPAP_Apnea);
+    for (int i = 0; i < ahiChannels.size(); i++)
+        list.push_back(ahiChannels.at(i));
+//    list.push_back(CPAP_ClearAirway);
+//    list.push_back(CPAP_AllApnea);
+//    list.push_back(CPAP_Obstructive);
+//    list.push_back(CPAP_Hypopnea);
+//    list.push_back(CPAP_Apnea);
 
     return list;
 }
diff --git a/oscar/SleepLib/schema.cpp b/oscar/SleepLib/schema.cpp
index 50b316dc..5c703687 100644
--- a/oscar/SleepLib/schema.cpp
+++ b/oscar/SleepLib/schema.cpp
@@ -65,6 +65,7 @@ void setOrders() {
 
     schema::channel[CPAP_ClearAirway].setOrder(order++);
     schema::channel[CPAP_NRI].setOrder(order++);
+    schema::channel[CPAP_AllApnea].setOrder(order++);
     schema::channel[CPAP_Obstructive].setOrder(order++);
     schema::channel[CPAP_Apnea].setOrder(order++);
     schema::channel[CPAP_Hypopnea].setOrder(order++);
@@ -160,6 +161,8 @@ void init()
             QObject::tr("Hypopnea"), QObject::tr("A partially obstructed airway"), QObject::tr("H"),        STR_UNIT_EventsPerHour,    DEFAULT,    QColor("blue")));
     schema::channel.add(GRP_CPAP, new Channel(CPAP_Apnea         = 0x1004, FLAG,        MT_CPAP, SESSION, "Apnea",
             QObject::tr("Unclassified Apnea"), QObject::tr("An apnea that couldn't be determined as Central or Obstructive."),QObject::tr("UA"),       STR_UNIT_EventsPerHour,    DEFAULT,    QColor("dark green")));
+    schema::channel.add(GRP_CPAP, new Channel(CPAP_AllApnea      = 0x1010, FLAG,        MT_CPAP, SESSION, "AllApnea",
+            QObject::tr("Apnea"), QObject::tr("An apnea reportred by your CPAP machine."),QObject::tr("A"),       STR_UNIT_EventsPerHour,    DEFAULT,    QColor("#40c0ff")));
     schema::channel.add(GRP_CPAP, new Channel(CPAP_FlowLimit     = 0x1005, FLAG,        MT_CPAP, SESSION, "FlowLimit",
             QObject::tr("Flow Limitation"), QObject::tr("A restriction in breathing from normal, causing a flattening of the flow waveform."), QObject::tr("FL"), STR_UNIT_EventsPerHour,    DEFAULT,    QColor("#404040")));
     schema::channel.add(GRP_CPAP, new Channel(CPAP_RERA          = 0x1006, FLAG,        MT_CPAP, SESSION, "RERA",
@@ -367,6 +370,18 @@ void init()
     schema::channel[CPAP_PB].setShowInOverview(true);
     schema::channel[CPAP_LargeLeak].setShowInOverview(true);
     schema::channel[CPAP_FLG].setShowInOverview(true);
+
+    // Identify the channels that contribute to AHI calculation
+    // When adding more AHI-contributing channels,
+    // 1) update this list
+    // 2) Update setOrders() above
+    // 3) Search source for CPAP_Obstructive to look for possible other places to add new channel
+    // 4) Search for AllAhiChannels to find all uses of the AHI-contributing channel list
+    ahiChannels.append(CPAP_ClearAirway);
+    ahiChannels.append(CPAP_AllApnea);
+    ahiChannels.append(CPAP_Obstructive);
+    ahiChannels.append(CPAP_Hypopnea);
+    ahiChannels.append(CPAP_Apnea);
 }
 
 
diff --git a/oscar/SleepLib/session.cpp b/oscar/SleepLib/session.cpp
index c18e7122..1f285cb8 100644
--- a/oscar/SleepLib/session.cpp
+++ b/oscar/SleepLib/session.cpp
@@ -1623,6 +1623,13 @@ EventDataType Session::countInsideSpan(ChannelID span, ChannelID code)
 
 EventDataType Session::rangeCount(ChannelID id, qint64 first, qint64 last)
 {
+    int total = 0, cnt;
+
+    if (id == AllAhiChannels) {
+        for (int i = 0; i < ahiChannels.size(); i++)
+            total += rangeCount(ahiChannels.at(i), first, last);
+    }
+
     QHash<ChannelID, QVector<EventList *> >::iterator j = eventlist.find(id);
 
     if (j == eventlist.end()) {
@@ -1630,7 +1637,6 @@ EventDataType Session::rangeCount(ChannelID id, qint64 first, qint64 last)
     }
 
     QVector<EventList *> &evec = j.value();
-    int total = 0, cnt;
 
     qint64 t, start;
 
@@ -1897,6 +1903,14 @@ EventDataType Session::rangeMax(ChannelID id, qint64 first, qint64 last)
 
 EventDataType Session::count(ChannelID id)
 {
+    int sum = 0;
+
+    if (id == AllAhiChannels) {
+        for (int i = 0; i < ahiChannels.size(); i++)
+            sum += count(ahiChannels.at(i));
+        return sum;
+    }
+
     QHash<ChannelID, EventDataType>::iterator i = m_cnt.find(id);
 
     if (i != m_cnt.end()) {
@@ -1912,7 +1926,6 @@ EventDataType Session::count(ChannelID id)
 
     QVector<EventList *> &evec = j.value();
 
-    int sum = 0;
     int evec_size=evec.size();
     if (evec_size == 0)
         return 0;
diff --git a/oscar/daily.cpp b/oscar/daily.cpp
index 37fd0583..2531adac 100644
--- a/oscar/daily.cpp
+++ b/oscar/daily.cpp
@@ -291,6 +291,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
     evseg->AddSlice(CPAP_Apnea,QColor(0x20,0x80,0x20,0xff),STR_TR_UA);
     evseg->AddSlice(CPAP_Obstructive,QColor(0x40,0xaf,0xbf,0xff),STR_TR_OA);
     evseg->AddSlice(CPAP_ClearAirway,QColor(0xb2,0x54,0xcd,0xff),STR_TR_CA);
+    evseg->AddSlice(CPAP_AllApnea,QColor(0x40,0xaf,0xbf,0xff),STR_TR_A);
     evseg->AddSlice(CPAP_RERA,QColor(0xff,0xff,0x80,0xff),STR_TR_RE);
     evseg->AddSlice(CPAP_NRI,QColor(0x00,0x80,0x40,0xff),STR_TR_NR);
     evseg->AddSlice(CPAP_FlowLimit,QColor(0x40,0x40,0x40,0xff),STR_TR_FL);
@@ -1395,7 +1396,7 @@ QString Daily::getStatisticsInfo(Day * day)
         html+="<tr><td colspan=5>&nbsp;</td></tr>";
 
         if ((cpap->loaderName() == STR_MACH_ResMed) || ((cpap->loaderName() == STR_MACH_PRS1) && (p_profile->cpap->resyncFromUserFlagging()))) {
-            int ttia = day->sum(CPAP_Obstructive) + day->sum(CPAP_ClearAirway) + day->sum(CPAP_Apnea) + day->sum(CPAP_Hypopnea);
+            int ttia = day->sum(AllAhiChannels);
             int h = ttia / 3600;
             int m = ttia / 60 % 60;
             int s = ttia % 60;
@@ -1500,15 +1501,24 @@ QString Daily::getPieChart (float values, Day * day) {
         } else {
             html += "<tr><td align=center>"+tr("Unable to display Pie Chart on this system")+"</td></tr>\n";
         }
-    } else if (   day->channelHasData(CPAP_Obstructive)
-               || day->channelHasData(CPAP_Hypopnea)
-               || day->channelHasData(CPAP_ClearAirway)
+    } else {
+        bool gotsome = false;
+        for (int i = 0; i < ahiChannels.size(); i++)
+            gotsome = gotsome || day->channelHasData(ahiChannels.at(i));
+
+//        if (   day->channelHasData(CPAP_Obstructive)
+//               || day->channelHasData(CPAP_AllApnea)
+//               || day->channelHasData(CPAP_Hypopnea)
+//               || day->channelHasData(CPAP_ClearAirway)
+//               || day->channelHasData(CPAP_Apnea)
+
+        if (   gotsome
                || day->channelHasData(CPAP_RERA)
-               || day->channelHasData(CPAP_Apnea)
                || day->channelHasData(CPAP_FlowLimit)
                || day->channelHasData(CPAP_SensAwake)
                ) {
             html += "<tr><td align=center><img src=\"qrc:/docs/0.0.gif\"></td></tr>\n";
+        }
     }
     html+="</table>\n";
     html+="<hr/>\n";
@@ -1650,7 +1660,12 @@ void Daily::Load(QDate date)
         if (GraphView->isEmpty() && (hours>0)) {
             // TODO: Eventually we should get isBrick from the loader, since some summary days
             // on a non-brick might legitimately have no graph data.
-            if (!p_profile->hasChannel(CPAP_Obstructive) && !p_profile->hasChannel(CPAP_Hypopnea)) {
+            bool gotsome = false;
+            for (int i = 0; i < ahiChannels.size(); i++)
+                gotsome = gotsome || p_profile->hasChannel(ahiChannels.at(i));
+
+//            if (!p_profile->hasChannel(CPAP_Obstructive) && !p_profile->hasChannel(CPAP_Hypopnea) && !p_profile->hasChannel(CPAP_AllApnea)  && !p_profile->hasChannel(CPAP_ClearAirway)) {
+            if (!gotsome) {
                 GraphView->setEmptyText(STR_Empty_Brick);
 
                 GraphView->setEmptyImage(QPixmap(":/icons/sadface.png"));
@@ -1664,7 +1679,7 @@ void Daily::Load(QDate date)
 
         modestr=schema::channel[CPAP_Mode].m_options[mode];
 
-        EventDataType ahi=(day->count(CPAP_Obstructive)+day->count(CPAP_Hypopnea)+day->count(CPAP_ClearAirway)+day->count(CPAP_Apnea));
+        EventDataType ahi=day->count(AllAhiChannels);
         if (p_profile->general->calculateRDI()) ahi+=day->count(CPAP_RERA);
         ahi/=hours;
 
@@ -1742,7 +1757,7 @@ void Daily::Load(QDate date)
 
             htmlLeftIndices+="</table><hr/>";
 
-            htmlLeftPieChart = getPieChart((values[CPAP_Obstructive] + values[CPAP_Hypopnea] +
+            htmlLeftPieChart = getPieChart((values[CPAP_Obstructive] + values[CPAP_Hypopnea] + values[CPAP_AllApnea] +
                                             values[CPAP_ClearAirway] + values[CPAP_Apnea] + values[CPAP_RERA] +
                                             values[CPAP_FlowLimit] + values[CPAP_SensAwake]), day);
 
diff --git a/oscar/exportcsv.cpp b/oscar/exportcsv.cpp
index f28cab24..2b3480a4 100644
--- a/oscar/exportcsv.cpp
+++ b/oscar/exportcsv.cpp
@@ -168,10 +168,14 @@ void ExportCSV::on_exportButton_clicked()
 
 
     QList<ChannelID> countlist, avglist, p90list, maxlist;
-    countlist.append(CPAP_Hypopnea);
-    countlist.append(CPAP_Obstructive);
-    countlist.append(CPAP_Apnea);
-    countlist.append(CPAP_ClearAirway);
+    for (int i = 0; i < ahiChannels.size(); i++)
+        countlist.append(ahiChannels.at(i));
+
+//    countlist.append(CPAP_Hypopnea);
+//    countlist.append(CPAP_Obstructive);
+//    countlist.append(CPAP_Apnea);
+//    countlist.append(CPAP_ClearAirway);
+//    countlist.append(CPAP_AllApnea);
     countlist.append(CPAP_VSnore);
     countlist.append(CPAP_VSnore2);
     countlist.append(CPAP_RERA);
@@ -298,8 +302,9 @@ void ExportCSV::on_exportButton_clicked()
                     int s = int(time) % 60;
                     data += sep + QString().sprintf("%02i:%02i:%02i", h, m, s);
 
-                    float ahi = sess->count(CPAP_Obstructive) + sess->count(CPAP_Hypopnea) + sess->count(
-                                    CPAP_Apnea) + sess->count(CPAP_ClearAirway);
+                    float ahi = sess->count(AllAhiChannels);
+                                //sess->count(CPAP_AllApnea) + sess->count(CPAP_Obstructive) + sess->count(CPAP_Hypopnea)
+                                // + sess->count(CPAP_Apnea) + sess->count(CPAP_ClearAirway);
                     ahi /= sess->hours();
                     data += sep + QString::number(ahi, 'f', 3);
 
diff --git a/oscar/reports.cpp b/oscar/reports.cpp
index 7c165959..c9a8e68a 100644
--- a/oscar/reports.cpp
+++ b/oscar/reports.cpp
@@ -208,8 +208,7 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
                 cpapinfo += /*QObject::tr("Pressure Relief")+": "+ */day->getPressureRelief() + "\n";
             }
 
-            float ahi = (day->count(CPAP_Obstructive) + day->count(CPAP_Hypopnea) +
-                         day->count(CPAP_ClearAirway) + day->count(CPAP_Apnea));
+            float ahi = day->count(AllAhiChannels);
 
             if (p_profile->general->calculateRDI()) { ahi += day->count(CPAP_RERA); }
 
@@ -219,6 +218,7 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
             //float pb = (100.0 / hours) * (day->sum(CPAP_PB) / 3600.0);
             float uai = day->count(CPAP_Apnea) / hours;
             float oai = day->count(CPAP_Obstructive) / hours;
+            float ai = day->count(CPAP_AllApnea) / hours;
             float hi = (day->count(CPAP_ExP) + day->count(CPAP_Hypopnea)) / hours;
             float cai = day->count(CPAP_ClearAirway) / hours;
             float rei = day->count(CPAP_RERA) / hours;
@@ -290,6 +290,8 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
             } else if (cpap->loaderName() == STR_MACH_Intellipap) {
                 stats += QObject::tr("NRI=%1 LKI=%2 EPI=%3")
                         .arg(nri, 0, 'f', 2).arg(lki, 0, 'f', 2).arg(exp, 0,'f', 2);
+            } else if (cpap->loaderName() == STR_MACH_SleepStyle) {
+                stats += QObject::tr("AI=%1 ").arg(ai, 0, 'f', 2);
             }
 
             bounds = painter.boundingRect(QRectF(0, top + ttop, virt_width, 0), stats,
diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index 4878b8a2..bae75574 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -240,7 +240,7 @@ void Statistics::updateRXChanges()
                     }
 
                     // Update AHI/RDI/Time counts
-                    tmp = day->count(CPAP_Hypopnea) + day->count(CPAP_Obstructive) + day->count(CPAP_Apnea) + day->count(CPAP_ClearAirway);
+                    tmp = day->count(AllAhiChannels);
                     rx.ahi += tmp;
                     rx.rdi += tmp + day->count(CPAP_RERA);
                     rx.hours += day->hours(MT_CPAP);
@@ -264,7 +264,7 @@ void Statistics::updateRXChanges()
                     rx1.days = 1;
 
                     // Only this days AHI/RDI counts
-                    tmp = day->count(CPAP_Hypopnea) + day->count(CPAP_Obstructive) + day->count(CPAP_Apnea) + day->count(CPAP_ClearAirway);
+                    tmp = day->count(AllAhiChannels);
                     rx1.ahi = tmp;
                     rx1.rdi = tmp + day->count(CPAP_RERA);
 
@@ -322,7 +322,7 @@ void Statistics::updateRXChanges()
                             Day * dy = rx.dates[di.key()] = p_profile->GetDay(di.key(), MT_CPAP);
 
                             // Update AHI/RDI counts
-                            tmp = dy->count(CPAP_Hypopnea) + dy->count(CPAP_Obstructive) + dy->count(CPAP_Apnea) + dy->count(CPAP_ClearAirway);;
+                            tmp = dy->count(AllAhiChannels);
                             rx.ahi += tmp;
                             rx.rdi += tmp + dy->count(CPAP_RERA);
 
@@ -350,7 +350,7 @@ void Statistics::updateRXChanges()
                             Day * dy = rx2.dates[di.key()] = p_profile->GetDay(di.key(), MT_CPAP);
 
                             // Update AHI/RDI counts
-                            tmp = dy->count(CPAP_Hypopnea) + dy->count(CPAP_Obstructive) + dy->count(CPAP_Apnea) + dy->count(CPAP_ClearAirway);;
+                            tmp = dy->count(AllAhiChannels);
                             rx2.ahi += tmp;
                             rx2.rdi += tmp + dy->count(CPAP_RERA);
 
@@ -434,7 +434,7 @@ void Statistics::updateRXChanges()
             if ((rx.relief == relief) && (rx.mode == mode) && (rx.pressure == pressure) && (rx.machine == mach) ) {
 
                 // Update AHI/RDI
-                tmp = day->count(CPAP_Hypopnea) + day->count(CPAP_Obstructive) + day->count(CPAP_Apnea) + day->count(CPAP_ClearAirway);
+                tmp = day->count(AllAhiChannels);
                 rx.ahi += tmp;
                 rx.rdi += tmp + day->count(CPAP_RERA);
 
@@ -466,7 +466,7 @@ void Statistics::updateRXChanges()
             rx.days = 1;
 
             // Set AHI/RDI for just this day
-            tmp = day->count(CPAP_Hypopnea) + day->count(CPAP_Obstructive) + day->count(CPAP_Apnea) + day->count(CPAP_ClearAirway);
+            tmp = day->count(AllAhiChannels);
             rx.ahi = tmp;
             rx.rdi = tmp + day->count(CPAP_RERA);
 
@@ -542,6 +542,7 @@ Statistics::Statistics(QObject *parent) :
 
     rows.push_back(StatisticsRow(tr("Therapy Efficacy"),  SC_SUBHEADING, MT_CPAP));
     rows.push_back(StatisticsRow("AHI",        SC_AHI,     MT_CPAP));
+    rows.push_back(StatisticsRow("AllApnea",   SC_CPH,     MT_CPAP));
     rows.push_back(StatisticsRow("Obstructive",   SC_CPH,     MT_CPAP));
     rows.push_back(StatisticsRow("Hypopnea",   SC_CPH,     MT_CPAP));
     rows.push_back(StatisticsRow("Apnea",   SC_CPH,     MT_CPAP));
@@ -745,10 +746,16 @@ QString Statistics::generateFooter(bool showinfo)
 // Add RERA if calculating RDI instead of just AHI
 EventDataType calcAHI(QDate start, QDate end)
 {
-    EventDataType val = (p_profile->calcCount(CPAP_Obstructive, MT_CPAP, start, end)
-                         + p_profile->calcCount(CPAP_Hypopnea, MT_CPAP, start, end)
-                         + p_profile->calcCount(CPAP_ClearAirway, MT_CPAP, start, end)
-                         + p_profile->calcCount(CPAP_Apnea, MT_CPAP, start, end));
+    EventDataType val = 0;
+
+    for (int i = 0; i < ahiChannels.size(); i++)
+        val += p_profile->calcCount(ahiChannels.at(i), MT_CPAP, start, end);
+
+//                        (p_profile->calcCount(CPAP_Obstructive, MT_CPAP, start, end)
+//                         + p_profile->calcCount(CPAP_AllApnea, MT_CPAP, start, end)
+//                         + p_profile->calcCount(CPAP_Hypopnea, MT_CPAP, start, end)
+//                         + p_profile->calcCount(CPAP_ClearAirway, MT_CPAP, start, end)
+//                         + p_profile->calcCount(CPAP_Apnea, MT_CPAP, start, end));
 
     if (p_profile->general->calculateRDI()) {
         val += p_profile->calcCount(CPAP_RERA, MT_CPAP, start, end);
diff --git a/oscar/tests/sessiontests.cpp b/oscar/tests/sessiontests.cpp
index d76000b8..110b927a 100644
--- a/oscar/tests/sessiontests.cpp
+++ b/oscar/tests/sessiontests.cpp
@@ -148,6 +148,7 @@ static QString eventChannel(ChannelID i)
     QString s;
     do {
         CHANNELNAME(CPAP_Obstructive);
+        CHANNELNAME(CPAP_AllApnea);
         CHANNELNAME(CPAP_Hypopnea);
         CHANNELNAME(CPAP_PB);
         CHANNELNAME(CPAP_LeakTotal);
diff --git a/oscar/welcome.cpp b/oscar/welcome.cpp
index 4afe85bb..fb9f2cf4 100644
--- a/oscar/welcome.cpp
+++ b/oscar/welcome.cpp
@@ -202,7 +202,8 @@ QString Welcome::GenerateCPAPHTML()
             QDate endtime = date.addDays(-1);
 
 
-            EventDataType ahi = (day->count(CPAP_Obstructive) + day->count(CPAP_Hypopnea) + day->count(CPAP_ClearAirway) + day->count(CPAP_Apnea)) / hours;
+//            EventDataType ahi = (day->count(CPAP_AllApnea) + day->count(CPAP_Obstructive) + day->count(CPAP_Hypopnea) + day->count(CPAP_ClearAirway) + day->count(CPAP_Apnea)) / hours;
+            EventDataType ahi = day->count(AllAhiChannels) / hours;
             EventDataType ahidays = calcAHI(starttime, endtime);
 
             const QString under = tr("under");