From 536d3fa14b6ac1233f8dfaa1443fbfafc03dad45 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Mon, 1 Aug 2011 18:58:46 +1000
Subject: [PATCH] Stopped calculating P90 & Weighted averages on S9's Flow Rate
 & Mask Pressures.. too darn slow

---
 SleepLib/loader_plugins/resmed_loader.cpp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp
index 5d0a0e48..72278e0c 100644
--- a/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/SleepLib/loader_plugins/resmed_loader.cpp
@@ -376,7 +376,7 @@ int ResmedLoader::Open(QString & path,Profile *profile)
                 sess->max(e[i]);
                 sess->min(e[i]);
                 sess->avg(e[i]);
-                sess->p90(e[i]);
+                //sess->p90(e[i]);
                 sess->cph(e[i]);
                 sess->sph(e[i]);
             }
@@ -384,7 +384,7 @@ int ResmedLoader::Open(QString & path,Profile *profile)
             sess->setSph(CPAP_AHI,sess->sph(CPAP_Obstructive)+sess->sph(CPAP_Hypopnea)+sess->sph(CPAP_ClearAirway)+sess->sph(CPAP_Apnea));
 
             ChannelID a[]={
-                CPAP_FlowRate, CPAP_MaskPressure, CPAP_Leak, CPAP_Snore, CPAP_EPAP,
+                CPAP_Leak, CPAP_Snore, CPAP_EPAP,
                 CPAP_IPAP, CPAP_TidalVolume, CPAP_RespiratoryRate,
                 CPAP_PatientTriggeredBreaths,CPAP_MinuteVentilation,
                 CPAP_FlowLimitGraph, CPAP_PressureSupport,CPAP_Pressure
@@ -395,10 +395,23 @@ int ResmedLoader::Open(QString & path,Profile *profile)
                     sess->max(a[i]);
                     sess->avg(a[i]);
                     sess->wavg(a[i]);
-                    sess->p90(a[i]);
+                    //sess->p90(a[i]);
                     sess->cph(a[i]);
                 }
             }
+            ChannelID b[]={
+                CPAP_FlowRate, CPAP_MaskPressure
+            };
+            for (unsigned i=0;i<sizeof(b)/sizeof(ChannelID);i++) {
+                if (sess->eventlist.contains(b[i])) {
+                    sess->min(b[i]);
+                    sess->max(b[i]);
+                    sess->avg(b[i]);
+                    //sess->wavg(b[i]);
+                    //sess->p90(b[i]);
+                    sess->cph(b[i]);
+                }
+            }
             sess->settings[CPAP_Mode]=MODE_APAP;
         }