F&P Flow Waveform extraction

SleepLib/loader_plugins/icon_loader.cpp

@@ -135,15 +135,14 @@ int FPIconLoader::OpenMachine(Machine *mach, QString & path, Profile * profile)
     for (int i=0;i<det.size();i++) {
         OpenDetail(mach,det[i],profile);
     }
+    for (int i=0;i<flw.size();i++) {
+        OpenFLW(mach,flw[i],profile);
+    }
     mach->Save();
 
     return true;
 }
 
-QDateTime decodeTime(quint32 time)
-{
-
-}
 
 bool FPIconLoader::OpenFLW(Machine * mach,QString filename, Profile * profile)
 {
@@ -175,75 +174,145 @@ bool FPIconLoader::OpenFLW(Machine * mach,QString filename, Profile * profile)
 
     quint16 t1;
     quint32 ts;
-    qint64 ti;
+    double ti;
     qint8 b;
     //QByteArray line;
 
-    char * buf=data.data()+4;
+    unsigned char * buf=(unsigned char *)data.data();
+
+    unsigned char * endbuf=buf+data.size();
 
     EventList * flow=NULL;
-    qint16 dat[0x34];
+//    qint16 dat[0x32];
-    EventDataType rate=200;
     QDateTime datetime;
-    quint8 a1,a2;
+  //  quint8 a1,a2;
 
     int month,day,year,hour,minute,second;
-    do {
-        in >> a1;
-        in >> a2;
-        t1=a2 << 8 | a1;
 
-        if (t1==0xfafe)
+    long pos=0;
-            break;
 
-        day=t1 & 0x1f;
+    t1=buf[pos+1] << 8 | buf[pos];
-        month=(t1 >> 5) & 0x0f;
+    pos+=2;
-        year=2000+((t1 >> 9) & 0x7f);
+    buf+=2;
 
-        in >> a1;
+    if (t1==0xfafe)  // End of file marker..
-        in >> a2;
+    {
-        t1=a2 << 8 | a1;
+        qDebug() << "FaFE observed in" << filename;
 
-        second=(t1 & 0x1f) * 2;
+    }
-        minute=(t1 >> 5) & 0x3f;
-        hour=(t1 >> 11) & 0x1f;
 
-        datetime=QDateTime(QDate(year,month,day),QTime(hour,minute,second));
+    day=t1 & 0x1f;
+    month=(t1 >> 5) & 0x0f;
+    year=2000+((t1 >> 9) & 0x7f);
 
-        ts=datetime.toTime_t();
+    //in >> a1;
+    //in >> a2;
+    t1=buf[pos+1] << 8 | buf[pos];
+    pos+=2;
+    buf+=2;
 
-        if (!Sessions.contains(ts)) {
+    second=(t1 & 0x1f) * 2;
-            // Skip until ends in 0xFF FF FF 7F
+    minute=(t1 >> 5) & 0x3f;
-            // skip 0
+    hour=(t1 >> 11) & 0x1f;
-            break;
-        }
-        Session *sess=Sessions[ts];
 
-        flow=sess->AddEventList(CPAP_FlowRate,EVL_Waveform,1.0,0,0,0,rate);
+    datetime=QDateTime(QDate(year,month,day),QTime(hour,minute,second));
+    QDate date=datetime.date();
+
+    QList<Session *> values = SessDate.values(date);
+    EventStoreType pbuf[256];
+
+    Session *sess;
+
+    int count;
+    for (int chunks=0;chunks<values.size();++chunks) { // each chunk is a seperate session
+        ts=values.at(chunks)->session();
+
+        datetime=datetime.toTimeSpec(Qt::UTC);
+        QTime time=datetime.time();
+
+        //ts=datetime.toTime_t();
+
+        flow=NULL;
+        if (Sessions.contains(ts)) {
+            sess=Sessions[ts];
+
+        } else sess=NULL;
 
         ti=qint64(ts)*1000L;
-        int i;
+
+        // Little endian.
+        // 100 byte blocks ending in 0x84 03 ?? ff ff   (900)
+        // 0x90 01 ?? ff ff    (400)
+
+        // 900 / 400   Waveform ID?
+        // entire sequence ends in 0xff 7f
+
+        count=0;
+        int len;
+        qint16 z1;
+        qint8 z2;
         do {
-            in >> t1;
+            unsigned char * p=buf,*p2;
-            for (i=0;i<0x34;i++) {
+
-                if (t1==0xffff)
+            // scan ahead to 0xffff marker
+            do {
+                while ((*p++ != 0xff) && (p < endbuf)) {
+                    pos++;
+                }
+                if (p >= endbuf)
                     break;
-                dat[i]=t1;
+                pos++;
-                in >> t1;
+            } while ((*p++ != 0xff) && (p < endbuf));
+            if (p >= endbuf)
+                break;
+            p2=p-5;
+            len=p2-buf;
+            z1=p2[1] << 8 | p2[0];
+            z2=p2[2];
+
+            count++;
+
+            double rate=1000.0/23.5;
+            if (sess && !flow) {
+                flow=sess->AddEventList(CPAP_FlowRate,EVL_Waveform,1.0,0,0,0,rate);
             }
-            flow->AddWaveform(ti,dat,i,i*rate);
+            if (flow) {
-        } while ((t1!=0xff7f) && !in.atEnd());
+                quint16 tmp;
+                unsigned char * bb=(unsigned char *)buf;
+                char c;
+                if (len>100) {
+                    int i=5;
+                }
 
-        if (in.atEnd()) break;
+                for (int i=0;i<len/2;i++) {
+                    c=bb[1];// & 0x1f;
+                    //c-=0x10;
+                    tmp=c << 8 | bb[0];
+                    if (tmp<0) tmp=-tmp;
+                    //tmp ^= 0x8000;
+                    bb+=2;
 
-        do {
+                    pbuf[i]=tmp;
-            in >> b;
+                }
-        } while (!b);
+                flow->AddWaveform(ti,pbuf,len/2,rate);
+            }
 
-        t1=b << 8;
+            ti+=qint64(len/2)*rate;
-        in >> b;
+
-        t1|=b;
+            buf=p;
-    } while (!in.atEnd());
+
+            if (buf >= endbuf-1) break;
+            if ((p[0]==0xff) && (p[1]==0x7f)) {
+                buf+=2;
+                pos+=2;
+                while ((*buf++ == 0) && (buf < endbuf)) pos++;
+                break;
+            }
+
+        } while (buf < endbuf);
+        if (buf >= endbuf)
+            break;
+    }
 
     return true;
 }
@@ -291,6 +360,8 @@ bool FPIconLoader::OpenSummary(Machine * mach,QString filename, Profile * profil
     int runtime,usage;
 
     int day,month,year,hour,minute,second;
+    QDate date;
+
     do {
         in >> a1;
         in >> a2;
@@ -312,7 +383,8 @@ bool FPIconLoader::OpenSummary(Machine * mach,QString filename, Profile * profil
         hour=(t1 >> 11) & 0x1f;
 
         datetime=QDateTime(QDate(year,month,day),QTime(hour,minute,second));
-
+        date=datetime.date();
+        datetime=datetime.toTimeSpec(Qt::UTC);
         ts=datetime.toTime_t();
 
         // the following two quite often match in value
@@ -354,6 +426,7 @@ bool FPIconLoader::OpenSummary(Machine * mach,QString filename, Profile * profil
             sess->SetChanged(true);
             sess->setCount(CPAP_Obstructive, j2);
             sess->setCount(CPAP_Hypopnea, j3);
+            SessDate.insert(date,sess);
 //            sess->setCount(CPAP_Obstructive,j1);
 //            sess->setCount(CPAP_Hypopnea,j2);
 //            sess->setCount(CPAP_ClearAirway,j3);
@@ -444,6 +517,7 @@ bool FPIconLoader::OpenDetail(Machine * mach, QString filename, Profile * profil
         hour=(t1 >> 11) & 0x1f;
 
         datetime=QDateTime(QDate(year,month,day),QTime(hour,minute,second));
+        datetime=datetime.toTimeSpec(Qt::UTC);
 
         ts=datetime.toTime_t();
 

SleepLib/loader_plugins/icon_loader.h

@@ -11,7 +11,7 @@ Copyright: (c)2012 Mark Watkins
 #ifndef ICON_LOADER_H
 #define ICON_LOADER_H
 
-
+#include <QMultiMap>
 #include "SleepLib/machine.h"
 #include "SleepLib/machine_loader.h"
 #include "SleepLib/profiles.h"
@@ -78,6 +78,7 @@ protected:
     QString last;
     QHash<QString,Machine *> MachList;
     QHash<SessionID, Session *> Sessions;
+    QMultiMap<QDate,Session *> SessDate;
 
     unsigned char * m_buffer;
 };

SleepyHeadQT.pro

@@ -20,6 +20,10 @@ CONFIG += rtti
 #PKGCONFIG += freetype2
 
 TARGET = SleepyHead
+unix:!macx {
+TARGET.path=/usr/bin
+}
+
 TEMPLATE = app
 
 # GIT_VERSION = $$system(git describe --tags --long --abbrev=6 --dirty="*")

mainwindow.cpp

@@ -187,6 +187,7 @@ MainWindow::MainWindow(QWidget *parent) :
     QString loadingtxt="<HTML><body style='text-align: center; vertical-align: center'><table width='100%' height='100%'><tr><td align=center><h1>Loading...</h1></td></tr></table></body></HTML>";
     ui->summaryView->setHtml(loadingtxt);
     on_tabWidget_currentChanged(0);
+    ui->actionImport_RemStar_MSeries_Data->setVisible(false);
 }
 extern MainWindow *mainwin;
 MainWindow::~MainWindow()
@@ -2460,7 +2461,6 @@ void MainWindow::on_webView_linkClicked(const QUrl &url)
     qDebug() << "Link Clicked" << url;
     if (s.toLower().startsWith("https:")) {
         QDesktopServices().openUrl(url);
-
     } else {
         ui->webView->setUrl(url);
     }
@@ -2683,3 +2683,17 @@ void MainWindow::on_actionImport_RemStar_MSeries_Data_triggered()
         daily->LoadDate(daily->getDate());
     }
 }
+
+void MainWindow::on_actionSleep_Disorder_Terms_Glossary_triggered()
+{
+    ui->webView->load(QUrl("http://sourceforge.net/apps/mediawiki/sleepyhead/index.php?title=Glossary"));
+    ui->tabWidget->setCurrentWidget(ui->helpTab);
+}
+
+void MainWindow::on_actionHelp_Support_Sleepyhead_Development_triggered()
+{
+    QUrl url=QUrl("http://sourceforge.net/apps/mediawiki/sleepyhead/index.php?title=Support_SleepyHead_Development");
+    QDesktopServices().openUrl(url);
+//    ui->webView->load(url);
+//    ui->tabWidget->setCurrentWidget(ui->helpTab);
+}

mainwindow.h

@@ -294,6 +294,10 @@ private slots:
 
     void on_actionImport_RemStar_MSeries_Data_triggered();
 
+    void on_actionSleep_Disorder_Terms_Glossary_triggered();
+
+    void on_actionHelp_Support_Sleepyhead_Development_triggered();
+
 private:
     void FreeSessions();
 

mainwindow.ui

@@ -78,7 +78,7 @@
          <enum>QTabWidget::North</enum>
         </property>
         <property name="currentIndex">
-         <number>0</number>
+         <number>1</number>
         </property>
         <property name="documentMode">
          <bool>false</bool>
@@ -1592,10 +1592,12 @@
     </property>
     <addaction name="actionOnline_Users_Guide"/>
     <addaction name="action_Frequently_Asked_Questions"/>
+    <addaction name="actionSleep_Disorder_Terms_Glossary"/>
     <addaction name="separator"/>
     <addaction name="actionDebug"/>
     <addaction name="actionCheck_for_Updates"/>
     <addaction name="separator"/>
+    <addaction name="actionHelp_Support_Sleepyhead_Development"/>
     <addaction name="action_About"/>
    </widget>
    <widget class="QMenu" name="menu_Data">
@@ -1714,7 +1716,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Debug</string>
+    <string>Show Debug Pane</string>
    </property>
   </action>
   <action name="action_Reset_Graph_Layout">
@@ -1828,6 +1830,16 @@
     <string>Import RemStar &amp;MSeries Data</string>
    </property>
   </action>
+  <action name="actionHelp_Support_Sleepyhead_Development">
+   <property name="text">
+    <string>&amp;Support Sleepyhead Development</string>
+   </property>
+  </action>
+  <action name="actionSleep_Disorder_Terms_Glossary">
+   <property name="text">
+    <string>Sleep Disorder Terms &amp;Glossary</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>