From 22333f62947f816099cbc876f3254707af9b1f88 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Sat, 3 Dec 2011 20:08:40 +1000
Subject: [PATCH] Fix for oximetry event stuff I just broke

---
 SleepLib/schema.cpp | 3 ---
 daily.cpp           | 2 +-
 docs/channels.xml   | 6 +++---
 oximetry.cpp        | 8 ++++----
 oximetry.h          | 6 +++---
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/SleepLib/schema.cpp b/SleepLib/schema.cpp
index 0a329570..3a43a94b 100644
--- a/SleepLib/schema.cpp
+++ b/SleepLib/schema.cpp
@@ -174,9 +174,6 @@ bool ChannelList::Load(QString filename)
             name=e.attribute("name","");
             details=e.attribute("details","");
             label=e.attribute("label","");
-            if (name=="Pulse") {
-                int i=5;
-            }
 
             if (name.isEmpty() || details.isEmpty() || label.isEmpty()) {
                 qWarning() << "Missing name,details or label attribute in" << filename << "line" << line;
diff --git a/daily.cpp b/daily.cpp
index 698c86f5..99223692 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -412,7 +412,7 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
             if (mcroot.find(code)==mcroot.end()) {
                 int cnt=day->count(code);
                 total_events+=cnt;
-                QString st=schema::channel[m.key()].description();
+                QString st=schema::channel[code].description();
                 if (st.isEmpty())  {
                     st="Fixme "+code;
                 }
diff --git a/docs/channels.xml b/docs/channels.xml
index 633e276c..6dfb4766 100644
--- a/docs/channels.xml
+++ b/docs/channels.xml
@@ -14,12 +14,12 @@ One id code per item
   <channel id="0x1003" class="data" name="Hypopnea" details="Hypopnea" label="H" unit="events/hour" color="blue"/>
   <channel id="0x1004" class="data" name="Apnea" details="Unspecified Apnea" label="UA" unit="events/hour" color="dark green"/>
   <channel id="0x1005" class="data" name="FlowLimit" details="Flow Limitation" label="FL" unit="events/hour" color="dark grey"/>
-  <channel id="0x1006" class="data" name="RERA" details="Respiratory Effort Related Arousal" unit="events/hour" label="RERA" color="gold"/>
+  <channel id="0x1006" class="data" name="RERA" details="Resp. Effort Related Arousal" unit="events/hour" label="RERA" color="gold"/>
   <channel id="0x1007" class="data" name="VSnore" details="Vibratory Snore" label="VS" unit="events/hour" color="red"/>
   <channel id="0x1008" class="data" name="VSnore2" details="Vibratory Snore 2" label="VS2" unit="events/hour" color="orange"/>
-  <channel id="0x1009" class="data" name="PressurePulse" details="Pressure Pulse" unit="events/hour" color="dark red"/>
+  <channel id="0x1009" class="data" name="PressurePulse" details="Pressure Pulse" label="PP" unit="events/hour" color="dark red"/>
   <channel id="0x100a" class="data" name="LeakFlag" details="Leak Event" label="L" unit="events/hour" color="dark blue"/>
-  <channel id="0x100b" class="data" name="NRI" details="Non-Responding Event" unit="events/hour" color="orange"/>
+  <channel id="0x100b" class="data" name="NRI" details="Non-Responding Event" label="NRI" unit="events/hour" color="orange"/>
   <channel id="0x100c" class="data" name="EP" details="Exhale Puff" label="EP" unit="events/hour" color="dark magenta"/>
 
   <channel id="0x1020" class="data" name="PressureMin" details="Min Therapy Pressure" label="PMin" color="black"/>
diff --git a/oximetry.cpp b/oximetry.cpp
index 49832723..c61ac599 100644
--- a/oximetry.cpp
+++ b/oximetry.cpp
@@ -78,8 +78,8 @@ bool SerialOximeter::Open(QextSerialPort::QueryMode mode)
 
     if (m_port->open(QIODevice::ReadWrite) == true) {
        // if (m_mode==QextSerialPort::EventDriven)
-            connect(m_port, SIGNAL(readyRead()), this, SLOT(onReadyRead()));
-        //connect(port, SIGNAL(dsrChanged(bool)), this, SLOT(onDsrChanged(bool)));
+            connect(m_port, SIGNAL(readyRead()), this, SLOT(ReadyRead()));
+        //connect(port, SIGNAL(dsrChanged(bool)), this, SLOT(DsrChanged(bool)));
         if (!(m_port->lineStatus() & LS_DSR))
             qDebug() << "check device is turned on";
         qDebug() << "listening for data on" << m_port->portName();
@@ -97,7 +97,7 @@ void SerialOximeter::Close()
 
     if (m_port) m_port->close();
     if (m_portmode==QextSerialPort::EventDriven)
-        disconnect(m_port, SIGNAL(readyRead()), this, SLOT(onReadyRead()));
+        disconnect(m_port, SIGNAL(readyRead()), this, SLOT(ReadyRead()));
     m_mode=SO_OFF;
     m_opened=false;
 }
@@ -789,7 +789,7 @@ void Oximetry::on_SerialPortsCombo_activated(const QString &arg1)
     oximeter->setPortName(arg1);
 }
 
-void Oximetry::RunButton_toggled(bool checked)
+void Oximetry::on_RunButton_toggled(bool checked)
 {
     if (!checked) {
             oximeter->stopLive();
diff --git a/oximetry.h b/oximetry.h
index 38bde804..89cc3789 100644
--- a/oximetry.h
+++ b/oximetry.h
@@ -163,11 +163,11 @@ public:
 
 private slots:
     void on_RefreshPortsButton_clicked();
-    void RunButton_toggled(bool checked);
+    void on_RunButton_toggled(bool checked);
 
     void on_SerialPortsCombo_activated(const QString &arg1);
-    //void onReadyRead();
-    //void onDsrChanged(bool status);
+    //void ReadyRead();
+    //void DsrChanged(bool status);
 
     void on_ImportButton_clicked();