From 9b0d27629ae3c4ecae927a4d6e2506ec7ab850b3 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Fri, 2 Dec 2011 11:04:26 +1000
Subject: [PATCH] Added Oximetry discard threshold for re-indexer

---
 daily.cpp             |  2 +-
 docs/channels.xml     |  1 +
 mainwindow.cpp        |  6 +++++-
 preferencesdialog.cpp |  4 ++++
 preferencesdialog.ui  | 37 ++++++++++++++++++++++++++++++++++++-
 5 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/daily.cpp b/daily.cpp
index 50af63e2..ec0771d2 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -683,7 +683,7 @@ void Daily::Load(QDate date)
         ChannelID chans[]={
             CPAP_Pressure,CPAP_EPAP,CPAP_IPAP,CPAP_PS,CPAP_PTB,
             CPAP_MinuteVent,CPAP_AHI, CPAP_RespRate, CPAP_RespEvent,CPAP_FLG,
-            CPAP_Leak,CPAP_Snore,CPAP_IE,CPAP_Ti,CPAP_Te, CPAP_TgMV,
+            CPAP_Leak, CPAP_LeakTotal, CPAP_Snore,CPAP_IE,CPAP_Ti,CPAP_Te, CPAP_TgMV,
             CPAP_TidalVolume, OXI_Pulse, OXI_SPO2
         };
         int numchans=sizeof(chans)/sizeof(ChannelID);
diff --git a/docs/channels.xml b/docs/channels.xml
index e7075658..bef1fddd 100644
--- a/docs/channels.xml
+++ b/docs/channels.xml
@@ -50,6 +50,7 @@ One id code per item
   <channel id="0x1114" class="data" name="TgMV" details="Target Minute Ventilation" label="Trgt Min Vent." unit="" color="dark cyan"/>
   <channel id="0x1115" class="data" name="MaxLeak" details="Maximum Leak" label="MaxLeaks" unit="L/min" color="dark red"/>
   <channel id="0x1116" class="data" name="AHI" details="AHI/Hour" label="AHI/Hr" unit="" color="dark red"/>
+  <channel id="0x1117" class="data" name="LeakTotal" details="Total Leak Rate" label="Total Leaks" unit="L/min" color="dark green"/>
 
   <channel id="0x1150" class="data" name="PRS1_00" details="Unknown 00" label="U00" unit="" color="black"/>
   <channel id="0x1151" class="data" name="PRS1_01" details="Unknown 01" label="U01" unit="" color="black"/>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5381b0df..d1daf145 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -123,6 +123,7 @@ MainWindow::MainWindow(QWidget *parent) :
     if (!PROFILE.Exists("PulseChangeBPM")) PROFILE["PulseChangeDuration"]=5;
     if (!PROFILE.Exists("PulseChangeDuration")) PROFILE["PulseChangeDuration"]=8;
     if (!PROFILE.Exists("GraphHeight")) PROFILE["GraphHeight"]=180;
+    if (!PROFILE.Exists("OxiDiscardThreshold")) PROFILE["OxiDiscardThreshold"]=10;
 
     //ui->actionUse_AntiAliasing->setChecked(PROFILE["UseAntiAliasing"].toBool());
     ui->action_Link_Graph_Groups->setChecked(PROFILE["LinkGroups"].toBool());
@@ -827,6 +828,9 @@ void MainWindow::on_action_Rebuild_Oximetry_Index_triggered()
 
     QVector<Machine *> machines=PROFILE.GetMachines(MT_OXIMETER);
 
+    bool ok;
+    int discard_threshold=PROFILE["OxiDiscardThreshold"].toInt(&ok);
+    if (!ok) discard_threshold=10;
     Machine *m;
     for (int z=0;z<machines.size();z++) {
         m=machines[z];
@@ -847,7 +851,7 @@ void MainWindow::on_action_Rebuild_Oximetry_Index_triggered()
                     int i=0;
                     QVector<EventList *> newlist;
                     for (int i=0;i<e.value().size();i++)  {
-                        if (e.value()[i]->count() > 1) {
+                        if (e.value()[i]->count() > discard_threshold) {
                             newlist.push_back(e.value()[i]);
                         } else {
                             delete e.value()[i];
diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp
index 99017d66..2acaa718 100644
--- a/preferencesdialog.cpp
+++ b/preferencesdialog.cpp
@@ -114,6 +114,9 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
     v=(*profile)["PulseChangeDuration"].toDouble(&ok);
     if (!ok) v=5;
     ui->pulseChangeTime->setValue(v);
+    v=(*profile)["OxiDiscardThreshold"].toDouble(&ok);
+    if (!ok) v=10;
+    ui->oxiDiscardThreshold->setValue(v);
 
     QTime t=(*profile)["DaySplitTime"].toTime();
     ui->timeEdit->setTime(t);
@@ -338,6 +341,7 @@ void PreferencesDialog::Save()
     (*profile)["SPO2DropDuration"]=ui->spo2DropTime->value();
     (*profile)["PulseChangeBPM"]=ui->pulseChange->value();
     (*profile)["PulseChangeDuration"]=ui->pulseChangeTime->value();
+    (*profile)["OxiDiscardThreshold"]=ui->oxiDiscardThreshold->value();
 
     //PREF["SkipLoginScreen"]=ui->skipLoginScreen->isChecked();
 
diff --git a/preferencesdialog.ui b/preferencesdialog.ui
index f15a86b4..2f724378 100644
--- a/preferencesdialog.ui
+++ b/preferencesdialog.ui
@@ -38,7 +38,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>6</number>
+      <number>4</number>
      </property>
      <widget class="QWidget" name="importTab">
       <attribute name="title">
@@ -711,6 +711,21 @@ Mask History could go here one day</string>
           <bool>true</bool>
          </property>
          <layout class="QGridLayout" name="gridLayout_2">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
+          <property name="topMargin">
+           <number>8</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
+          </property>
+          <property name="bottomMargin">
+           <number>4</number>
+          </property>
+          <property name="spacing">
+           <number>5</number>
+          </property>
           <item row="0" column="0">
            <widget class="QLabel" name="label_20">
             <property name="sizePolicy">
@@ -848,6 +863,26 @@ Mask History could go here one day</string>
                </property>
               </widget>
              </item>
+             <item row="3" column="0" colspan="2">
+              <widget class="QLabel" name="label_33">
+               <property name="text">
+                <string>Discard chunks under</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="2">
+              <widget class="QSpinBox" name="oxiDiscardThreshold">
+               <property name="suffix">
+                <string>s</string>
+               </property>
+               <property name="maximum">
+                <number>300</number>
+               </property>
+              </widget>
+             </item>
             </layout>
            </widget>
           </item>