From ba7ce7123db5440b328fa41eee5d5b3f0ab8a211 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Sun, 3 Jul 2011 01:48:55 +1000
Subject: [PATCH] ResMed annotations timing fix

---
 Graphs/graphdata_custom.cpp               |  2 +-
 SleepLib/loader_plugins/resmed_loader.cpp | 16 ++++++++--------
 daily.cpp                                 |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Graphs/graphdata_custom.cpp b/Graphs/graphdata_custom.cpp
index 80e93173..58525b6f 100644
--- a/Graphs/graphdata_custom.cpp
+++ b/Graphs/graphdata_custom.cpp
@@ -44,7 +44,7 @@ void WaveData::Reload(Day *day)
 
             Waveform *w=(*l);
             double st=w->start()/86400000.0;
-            double rate=(w->duration()/w->samples())/86400000.0;
+            double rate=double(w->duration())/w->samples()/86400000.0;
             //qDebug() << "Waveform Chunk contains " << w->samples() << " samples";
             for (int i=0;i<w->samples();i++) {
                 QPointD r(st,(*w)[i]);
diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp
index 62d819ca..ba127ef1 100644
--- a/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/SleepLib/loader_plugins/resmed_loader.cpp
@@ -90,7 +90,7 @@ bool EDFParser::Parse()
     }
     startdate=startDate.toMSecsSinceEpoch();
 
-    //qDebug() << startDate.toString("yyyy-MM-dd HH:mm:ss");
+    qDebug() << startDate.toString("yyyy-MM-dd HH:mm:ss");
 
     num_header_bytes=QString::fromAscii(header.num_header_bytes,8).toLong(&ok);
     if (!ok)
@@ -368,7 +368,7 @@ bool ResmedLoader::LoadEVE(Session *sess,EDFParser &edf)
     long pos;
     bool sign,ok;
     double d;
-    qint64 tt;
+    double tt;
     EventDataType fields[3];
     MachineCode code;
     //Event *e;
@@ -410,8 +410,7 @@ bool ResmedLoader::LoadEVE(Session *sess,EDFParser &edf)
                 break;
             }
             if (!sign) d=-d;
-
-            tt+=d*1000.0;
+            tt=edf.startdate+(d*1000.0);
             duration=0;
             // First entry
 
@@ -423,11 +422,12 @@ bool ResmedLoader::LoadEVE(Session *sess,EDFParser &edf)
                     t+=data[pos];
                     pos++;
                 } while ((data[pos]!=20) && (pos<recs)); // start code
-                duration=t.toDouble(&ok)*1000.0;
+                duration=t.toDouble(&ok);
                 if (!ok) {
                     qDebug() << "Faulty EDF EVE file (at %" << pos << ") " << edf.filename;
                     break;
                 }
+                //duration*=1000;
             }
             while ((data[pos]==20) && (pos<recs)) {
                 t="";
@@ -448,14 +448,14 @@ bool ResmedLoader::LoadEVE(Session *sess,EDFParser &edf)
                     else if (t=="hypopnea") code=CPAP_Hypopnea;
                     else if (t=="central apnea") code=CPAP_ClearAirway;
                     if (code!=MC_UNKNOWN) {
-                        fields[0]=duration/1000.0;
+                        fields[0]=duration;///1000.0;
                         sess->AddEvent(new Event(tt,code,fields,1));
                     } else {
                         if (t!="recording starts") {
                             qDebug() << "Unknown ResMed annotation field: " << t;
                         }
                     }
-                   // qDebug((tt.toString("yyyy-MM-dd HH:mm:ss")+t).toLatin1());
+                    // qDebug((tt.toString("yyyy-MM-dd HH:mm:ss")+t).toLatin1());
                 }
                 if (pos>=recs) {
                     qDebug() << "Short EDF EVE file" << edf.filename;
@@ -500,7 +500,7 @@ void ResmedLoader::ToTimeDelta(Session *sess,EDFParser &edf, qint16 *data, Machi
 {
     bool first=true;
     double rate=(duration/recs); // milliseconds per record
-    qint64 tt=edf.startdate;
+    double tt=edf.startdate;
     EventDataType c,last;
     //return;
     Event *e=new Event(tt,code,&c,1);
diff --git a/daily.cpp b/daily.cpp
index cd6b8052..8c76768c 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -616,7 +616,7 @@ void Daily::Load(QDate date)
             html+=(" </td><td>")+a.sprintf("%.2f",cpap->summary_weighted_avg(BIPAP_EAPAverage));
             html+=("</td><td>")+a.sprintf("%.2f",cpap->summary_max(BIPAP_EAPMax))+("</td></tr>");
 
-            html+=("<tr><td> align=left"+tr("IPAP:")+"</td><td>")+a.sprintf("%.2f",cpap->summary_min(BIPAP_IAPMin));
+            html+=("<tr><td align=left>"+tr("IPAP:")+"</td><td>")+a.sprintf("%.2f",cpap->summary_min(BIPAP_IAPMin));
             html+=("</td><td>")+a.sprintf("%.2f",cpap->summary_weighted_avg(BIPAP_IAPAverage));
             html+=("</td><td>")+a.sprintf("%.2f",cpap->summary_max(BIPAP_IAPMax))+("</td></tr>");