Internally store Time Deltas rather than full 64bit timestamps.. DB changesgit diff! DB change notification dialog

Graphs/gCandleStick.cpp

@@ -1,150 +0,0 @@
-/********************************************************************
- gCandleStick Graph Implementation
- Copyright (c)2011 Mark Watkins <jedimark@users.sourceforge.net>
- License: GPL
-*********************************************************************/
-
-#include <math.h>
-#include "gCandleStick.h"
-
-gCandleStick::gCandleStick(Qt::Orientation o)
-:gLayer(MC_UNKNOWN)
-{
-    m_orientation=o;
-}
-gCandleStick::~gCandleStick()
-{
-}
-void gCandleStick::SetDay(Day * d)
-{
-    gLayer::SetDay(d);
-    m_total=0;
-    if (!m_day) return;
-    int cnt;
-    for (map<MachineCode,int>::iterator c=m_counts.begin();c!=m_counts.end();c++) {
-        c->second=0;
-        for (vector<Session *>::iterator s=m_day->begin();s!=m_day->end();s++) {
-            // check summary objects first..
-            //if (*s)->summary_exists(c->first) {
-                cnt=(*s)->count(c->first);
-            //} else
-                cnt=(*s)->summary[c->first].toInt();
-            //}
-            c->second+=cnt;
-            m_total+=cnt;
-        }
-    }
-}
-void gCandleStick::AddSlice(MachineCode code, QColor color, QString name)
-{
-    m_counts[code]=0;
-    m_names[code]=name;
-    m_colors[code]=color;
-}
-void gCandleStick::Plot(gGraphWindow & w,float scrx,float scry)
-{
-    if (!m_visible) return;
-    if (!m_day) return;
-
-    int start_px=w.GetLeftMargin();
-    int start_py=w.GetBottomMargin();
-    int width=scrx-(w.GetLeftMargin()+w.GetRightMargin())-1;
-    int height=scry-(w.GetTopMargin()+w.GetBottomMargin())-1;
-
-
-    for (map<MachineCode,int>::iterator m=m_counts.begin();m!=m_counts.end();m++) {
-        if (!m->second) continue;
-        int j=float(m->second)/float(m_total); // ratio of this pie slice
-        //QColor & col1 = m_colors[m->first];
-        //QColor & col2 = m_gradient_color;
-    }
-/*    float sum=0;
-    for (int i=0;i<data->np[0];i++)
-        sum+=data->point[0][i].y();
-
-    float pxr;
-    float px;
-    if (m_orientation==Qt::Vertical) {
-        pxr=height/sum;
-        px=start_py;
-    } else {
-        pxr=width/sum;
-        px=start_px;
-    }
-
-    float x,y;
-
-    float t1,t2;
-    int barwidth;
-    if (m_orientation==Qt::Vertical) {
-        barwidth=width;
-    } else {
-        barwidth=height;
-    }
-
-    QColor col2=QColor("light grey");
-    QColor c(0,0,0,255);
-    QString str,st;
-    QRect rect;
-
-    //Qt::AlignmDirection dir;
-
-    glLineWidth(1);
-
-//    glDisable(GL_LINE_SMOOTH);
-    for (int i=0;i<data->np[0];i++) {
-        t1=floor(px);
-        t2=data->point[0][i].y()*pxr;
-        px+=t2;
-        t2=ceil(t2);
-        if (m_orientation==Qt::Vertical) {
-            rect=QRect(start_px,t1,barwidth,t2);
-            //dir=wxEAST;
-        } else {
-            rect=QRect(t1,start_py,t2,barwidth);
-            //dir=wxSOUTH;
-        }
-
-        QColor col1=color[i % color.size()];
-
-        glBegin(GL_QUADS);
-        glColor4ub(col1.red(),col1.green(),col1.blue(),col1.alpha());
-        glVertex2f(rect.x()+1, rect.y()+height);
-        glVertex2f(rect.x()+rect.width(), rect.y()+height);
-
-        glColor4ub(col2.red(),col2.green(),col2.blue(),col2.alpha());
-        glVertex2f(rect.x()+rect.width(), rect.y()+1);
-        glVertex2f(rect.x()+1, rect.y()+1);
-        glEnd();
-
-        glColor4ub(0,0,0,255);
-        glBegin(GL_LINE_LOOP);
-        glVertex2f(rect.x()+1, rect.y()+height);
-        glVertex2f(rect.x()+rect.width(), rect.y()+height);
-
-        glVertex2f(rect.x()+rect.width(), rect.y()+1);
-        glVertex2f(rect.x()+1, rect.y()+1);
-        glEnd();
-        //LinedRoundedRectangle(rect.x,rect.y,rect.width,rect.height,0,1,c);
-
-        str="";
-        if ((int)m_names.size()>i) {
-        //    str=m_names[i]+" ";
-        }
-        st.sprintf("%0.1f",data->point[0][i].x());
-        str+=st;
-        GetTextExtent(str, x, y);
-        //x+=5;
-        if (t2>x+5) {
-            int j=t1+((t2/2.0)-(x/2.0));
-            if (m_orientation==Qt::Vertical) {
-                DrawText(str,start_px+barwidth+2+y,scry-j,270.0);
-            } else {
-                //w.renderText(j,float(scry)-(float(start_py)+(barwidth/2.0)-(y/2.0)),str);
-                DrawText(str,j,float(scry)-(float(start_py)+(barwidth/2.0)-(y/2.0)));
-            }
-        }
-    } // for (int i
-    glFlush(); */
-}
-

Graphs/gCandleStick.h

@@ -1,35 +0,0 @@
-/********************************************************************
- gCandleStick Graph Header
- Copyright (c)2011 Mark Watkins <jedimark@users.sourceforge.net>
- License: GPL
-*********************************************************************/
-
-#ifndef GCANDLESTICK_H
-#define GCANDLESTICK_H
-
-#include "graphlayer.h"
-
-class gCandleStick:public gLayer
-{
-    public:
-        gCandleStick(Qt::Orientation o=Qt::Horizontal);
-        virtual ~gCandleStick();
-        virtual void SetDay(Day *d);
-
-        virtual void Plot(gGraphWindow & w,float scrx,float scry);
-        void AddSlice(MachineCode code,QColor color,QString name="");
-
-        void setGradientColor(QColor & color) { m_gradient_color=color; }
-        void setOutlineColor(QColor & color) { m_outline_color=color; }
-    protected:
-        Qt::Orientation m_orientation;
-        map<MachineCode,int> m_counts;
-        map<MachineCode,QString> m_names;
-        map<MachineCode,QColor> m_colors;
-        QColor m_gradient_color;
-        QColor m_outline_color;
-        int m_total;
-};
-
-
-#endif // GCANDLESTICK_H

Graphs/gLineChart.cpp

@@ -135,7 +135,8 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
         for (unsigned n=0;n<evec.size();n++) { // for each segment
             EventList & el=*evec[n];
 
-            accel=!m_disable_accel && (el.type()==EVL_Waveform); // Turn on acceleration if this is a waveform.
+            accel=(el.type()==EVL_Waveform); // Turn on acceleration if this is a waveform.
+            if (m_disable_accel) accel=false;
 
 
             square_plot=m_square_plot;
@@ -262,7 +263,7 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
             EventDataType ymin=miny/gain;
 
             const vector<EventStoreType> & dat=el.getData();
-            const vector<qint64> & tim=el.getTime();
+            //const vector<qint32> & tim=el.getTime();
 
             done=false;
             first=true;
@@ -350,13 +351,13 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
 //////////////////////////////////////////////////////////////////
                 first=true;
                 for (int i=idx;i<siz;i+=sam) {
-                    time=tim[i]; //el.time(i);
+                    time=el.time(i);
 
                     if (first) {
                         if (num_points>5 && (time < minx)) continue; // Skip stuff before the start of our data window
                         first=false;
                         if (i>=sam)  i-=sam; // Start with the previous sample (which will be in clipping area)
-                        time=tim[i]; //el.time(i);
+                        time=el.time(i); //el.time(i);
                     }
                     data=dat[i]*gain; //
                     //data=el.data(i); // raw access is faster

SleepLib/event.cpp

@@ -28,11 +28,10 @@ EventList::~EventList()
 }
 qint64 EventList::time(int i)
 {
-    if (m_type==EVL_Waveform) {
+    if (m_type==EVL_Event) {
-        qint64 t=m_first+(double(i)*m_rate);
+        return m_first+qint64(m_time[i]);
-        return t;
     }
-    return m_time[i];
+    return m_first+(EventDataType(i)*m_rate);
 }
 
 EventDataType EventList::data(int i)
@@ -44,22 +43,31 @@ void EventList::AddEvent(qint64 time, EventStoreType data)
 {
     // Apply gain & offset
     m_data.push_back(data);
-    EventDataType val=data;
+    EventDataType val=EventDataType(data)*m_gain+m_offset;
-    val*=m_gain;
-    val+=m_offset;
-    m_count++;
     if (m_update_minmax) {
         if (m_min>val) m_min=val;
         if (m_max<val) m_max=val;
     }
 
-    m_time.push_back(time);
     if (!m_first) {
         m_first=time;
         m_last=time;
     }
-    if (m_first>time) m_first=time;
+    if (m_first>time) {
-    if (m_last<time) m_last=time;
+        // Crud.. Update all the previous records
+        // This really shouldn't happen.
+
+        qint64 t=(m_first-time);
+        for (int i=0;i<m_count;i++) {
+            m_time[i]-=t & 0xffffffff;
+        }
+        m_first=time;
+    }
+    if (m_last < time) m_last=time;
+    quint32 t=(time-m_first) & 0xffffffff;
+
+    m_time.push_back(t);
+    m_count++;
 }
 
 // Adds a consecutive waveform chunk

SleepLib/event.h

@@ -54,9 +54,9 @@ public:
     inline const bool & update_minmax() { return m_update_minmax; }
 
     vector<EventStoreType> & getData() { return m_data; }
-    vector<qint64> & getTime() { return m_time; }
+    vector<quint32> & getTime() { return m_time; }
 protected:
-    vector<qint64> m_time; // 32bitalize this.. add offsets to m_first
+    vector<quint32> m_time; // 32bitalize this.. add offsets to m_first
     vector<EventStoreType> m_data;
     MachineCode m_code;
     EventListType m_type;

SleepLib/machine.cpp

@@ -247,7 +247,7 @@ bool Machine::Purge(int secret)
         bool ok;
         ext_s.toInt(&ok,10);
         if (ok) {
-            qDebug() << "TestMe: Deleting " << fullpath;
+            qDebug() << "Deleting " << fullpath;
             dir.remove(fullpath);
         } else could_not_kill++;
 

SleepLib/machine_common.h

@@ -16,10 +16,11 @@ typedef long MachineID;
 typedef long SessionID;
 
 class BoundsError {};
+class OldDBVersion {};
 
 // This is the uber important database version for SleepyHeads internal storage
 // Increment this after stuffing with Session's save & load code.
-const quint16 dbversion=4;
+const quint16 dbversion=5;
 
 const int max_number_event_fields=10;
 

SleepLib/profiles.cpp

@@ -49,6 +49,26 @@ Profile::~Profile()
     delete i->second;
     }
 }
+void Profile::DataFormatError(Machine *m)
+{
+    QString msg="Software changes have been made that require the reimporting of the following machines data:\n\n";
+    msg=msg+m->properties["Brand"]+" "+m->properties["Model"]+" "+m->properties["Serial"];
+    msg=msg+"\n\nThis is still only alpha software and these changes are sometimes necessary.\n\n";
+    msg=msg+"I can automatically purge this data for you, or you can cancel now and continue to run in a previous version.\n\n";
+    msg=msg+"Would you like me to purge this data this for you so you can run the new version?";
+
+    if (QMessageBox::warning(NULL,"Machine Database Changes",msg,QMessageBox::Yes | QMessageBox::Cancel,QMessageBox::Yes)==QMessageBox::Yes) {
+
+        if (!m->Purge(3478216)) { // Do not copy this line without thinking.. You will be eaten by a Grue if you do
+            QMessageBox::critical(NULL,"Purge Failed","Sorry, I could not purge this data, which means this version of SleepyHead can't start.. SleepyHead's Data folder needs to be removed manually\n\nThis folder currently resides at the following location:\n"+pref["DataFolder"].toString(),QMessageBox::Ok);
+            exit(-1);
+        }
+    } else {
+        exit(-1);
+    }
+    return;
+
+}
 void Profile::LoadMachineData()
 {
     for (map<MachineID,Machine *>::iterator i=machlist.begin(); i!=machlist.end(); i++) {
@@ -64,21 +84,18 @@ void Profile::LoadMachineData()
             bool ok;
             cv=m->properties["DataVersion"].toLong(&ok);
             if (!ok || cv<v) {
-                QString msg="Software changes have been made that require the reimporting of the following machines data:\n\n";
+                DataFormatError(m);
-                msg=msg+m->properties["Brand"]+" "+m->properties["Model"]+" "+m->properties["Serial"];
+                // It may exit above and not return here..
-                msg=msg+"\n\nNo attempt will be made to load previous data.\n\n";
+                QString s;
-                msg=msg+"Importing ALL of your data for this machine again will rectify this problem.\n\n";
+                s.sprintf("%li",v);
-                msg=msg+"However, if you have more than one seperate datacard/stash for this machine, it would be best if the machine data was purged first.\n\nWould you like me to do this for you?";
+                m->properties["DataVersion"]=s; // Dont need to nag again if they are too lazy.
-
+            } else {
-                if (QMessageBox::warning(NULL,"Machine Database Changes",msg,QMessageBox::Yes | QMessageBox::No,QMessageBox::Yes)==QMessageBox::Yes) {
+                try {
-
+                    m->Load();
-                    if (m->Purge(3478216)) { // Do not copy this line without thinking.. You will be eaten by a Grue if you do
+                } catch (OldDBVersion e){
-                        QString s;
+                    DataFormatError(m);
-                        s.sprintf("%li",v);
-                        m->properties["DataVersion"]=s; // Dont need to nag again if they are too lazy.
-                    }
                 }
-            } else  m->Load();
+            }
         } else {
             m->Load();
         }

SleepLib/profiles.h

@@ -36,6 +36,7 @@ public:
     void AddMachine(Machine *m);
     void DelMachine(Machine *m);
     void LoadMachineData();
+    void DataFormatError(Machine *m);
     int Import(QString path);
 
     void AddDay(QDate date,Day *day,MachineType mt);

SleepLib/session.cpp

@@ -53,6 +53,11 @@ void Session::TrashEvents()
 bool Session::OpenEvents() {
     if (s_events_loaded)
         return true;
+
+    s_events_loaded=eventlist.size() > 0;
+    if (s_events_loaded)
+        return true;
+
     bool b=LoadEvents(s_eventfile);
     if (!b) {
         qWarning() << "Error Unkpacking Events" << s_eventfile;
@@ -75,11 +80,11 @@ bool Session::Store(QString path)
     base.sprintf("%08lx",s_session);
     base=path+"/"+base;
     //qDebug() << "Storing Session: " << base;
-    bool a,b=false;
+    bool a;
     a=StoreSummary(base+".000"); // if actually has events
     //qDebug() << " Summary done";
     if (eventlist.size()>0)
-        b=StoreEvents(base+".001");
+        StoreEvents(base+".001");
     //qDebug() << " Events done";
     s_changed=false;
     s_eventfile=base+".001";
@@ -119,8 +124,8 @@ bool Session::StoreSummary(QString filename)
     out << (quint16)dbversion;
     out << (quint16)filetype_summary;
     out << (quint32)s_machine->id();
-    out << (quint32)s_session;
 
+    out << (quint32)s_session;
     out << s_first;  // Session Start Time
     out << s_last;   // Duration of sesion in seconds.
     out << (quint16)summary.size();
@@ -152,12 +157,9 @@ bool Session::LoadSummary(QString filename)
     in.setVersion(QDataStream::Qt_4_6);
     in.setByteOrder(QDataStream::LittleEndian);
 
-    quint64 t64;
     quint32 t32;
     quint16 t16;
-    quint8 t8;
 
-    qint16 sumsize;
     map<MachineCode,MCDataType> mctype;
     vector<MachineCode> mcorder;
     in >> t32;
@@ -168,7 +170,8 @@ bool Session::LoadSummary(QString filename)
 
     in >> t16;      // DB Version
     if (t16!=dbversion) {
-        qWarning() << "Old dbversion "<< t16 << "summary file.. Sorry, you need to purge and reimport";
+        throw OldDBVersion();
+        //qWarning() << "Old dbversion "<< t16 << "summary file.. Sorry, you need to purge and reimport";
         return false;
     }
 
@@ -179,13 +182,19 @@ bool Session::LoadSummary(QString filename)
     }
 
 
-    in >> t32;      // MachineID (dont need this result)
+    qint32 ts32;
+    in >> ts32;      // MachineID (dont need this result)
+    if (ts32!=s_machine->id()) {
+        qWarning() << "Machine ID does not match in" << filename << " I will try to load anyway in case you know what your doing.";
+    }
+
     in >> t32;      // Sessionid;
     s_session=t32;
 
     in >> s_first;  // Start time
     in >> s_last;   // Duration // (16bit==Limited to 18 hours)
 
+    qint16 sumsize;
     in >> sumsize;  // Summary size (number of Machine Code lists)
 
     for (int i=0; i<sumsize; i++) {
@@ -210,8 +219,8 @@ bool Session::StoreEvents(QString filename)
     out << (quint16)dbversion;      // File Version
     out << (quint16)filetype_data;  // File type 1 == Event
     out << (quint32)s_machine->id();// Machine ID
-    out << (quint32)s_session;      // This session's ID
 
+    out << (quint32)s_session;      // This session's ID
     out << s_first;
     out << s_last;
 
@@ -237,8 +246,6 @@ bool Session::StoreEvents(QString filename)
             out << e.max();
         }
     }
-    qint64 t,last;
-    quint32 x;
     for (i=eventlist.begin(); i!=eventlist.end(); i++) {
         for (unsigned j=0;j<i->second.size();j++) {
             EventList &e=*i->second[j];
@@ -247,12 +254,8 @@ bool Session::StoreEvents(QString filename)
                 out << e.raw(c);
             }
             if (e.type()!=EVL_Waveform) {
-                last=e.first();
                 for (int c=0;c<e.count();c++) {
-                    t=e.time(c);
+                    out << e.getTime()[c];
-                    x=(t-last);
-                    out << x;
-                    last=e.time(c);
                 }
             }
         }
@@ -288,7 +291,8 @@ bool Session::LoadEvents(QString filename)
     }
     in >> t16;      // File Version
     if (t16!=dbversion) {
-        qWarning() << "Old dbversion "<< t16 << "summary file.. Sorry, you need to purge and reimport";
+        throw OldDBVersion();
+        //qWarning() << "Old dbversion "<< t16 << "summary file.. Sorry, you need to purge and reimport";
         return false;
     }
 
@@ -298,10 +302,14 @@ bool Session::LoadEvents(QString filename)
         return false;
     }
 
-    in >> t32;      // MachineID
+    qint32 ts32;
-    in >> t32;      // Sessionid;
+    in >> ts32;      // MachineID
-    s_session=t32;
+    if (ts32!=s_machine->id()) {
+        qWarning() << "Machine ID does not match in" << filename << " I will try to load anyway in case you know what your doing.";
+    }
 
+    in >> t32;      // Sessionid
+    s_session=t32;
     in >> s_first;
     in >> s_last;
 
@@ -343,25 +351,26 @@ bool Session::LoadEvents(QString filename)
     }
 
     EventStoreType t;
-    qint64 last;
     quint32 x;
     for (int i=0;i<mcsize;i++) {
         code=mcorder[i];
         size2=sizevec[i];
         for (int j=0;j<size2;j++) {
             EventList &evec=*eventlist[code][j];
-            evec.m_data.resize(evec.m_count);
+            evec.m_data.reserve(evec.m_count);
             for (int c=0;c<evec.m_count;c++) {
                 in >> t;
-                evec.m_data[c]=t;
+                //evec.m_data[c]=t;
+                evec.m_data.push_back(t);
             }
-            last=evec.first();
+            //last=evec.first();
             if (evec.type()!=EVL_Waveform) {
-                evec.m_time.resize(evec.m_count);
+                evec.m_time.reserve(evec.m_count);
                 for (int c=0;c<evec.m_count;c++) {
                     in >> x;
-                    last+=x;
+                    //last+=x;
-                    evec.m_time[c]=last;
+                    evec.m_time.push_back(x);
+                    //evec.m_time[c]=x;
                 }
             }
         }

SleepLib/session.h

@@ -65,7 +65,6 @@ public:
     void SetChanged(bool val) {
         s_changed=val;
         s_events_loaded=val; // dirty hack putting this here
-        s_waves_loaded=val;
     };
     bool IsChanged() {
         return s_changed;
@@ -76,7 +75,6 @@ public:
     bool IsLoneSession() { return s_lonesession; }
     void SetLoneSession(bool b) { s_lonesession=b; }
     void SetEventFile(QString & filename) { s_eventfile=filename; }
-    void SetWaveFile(QString & filename) { s_wavefile=filename; }
 
     inline void UpdateFirst(qint64 v) { if (!s_first) s_first=v; else if (s_first>v) s_first=v; }
     inline void UpdateLast(qint64 v) { if (!s_last) s_last=v; else if (s_last<v) s_last=v; }
@@ -102,9 +100,7 @@ protected:
     bool _first_session;
 
     bool s_events_loaded;
-    bool s_waves_loaded;
     QString s_eventfile;
-    QString s_wavefile;
 };
 
 

SleepyHeadQT.pro

@@ -52,7 +52,6 @@ SOURCES += main.cpp\
     Graphs/gFlagsLine.cpp \
     Graphs/glcommon.cpp \
     Graphs/gTitle.cpp \
-    Graphs/gCandleStick.cpp \
     Graphs/gBarChart.cpp \
     Graphs/gSegmentChart.cpp \
     Graphs/gSessionTime.cpp \

mainwindow.ui

@@ -33,7 +33,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="Resources.qrc">
-    <normaloff>:/icons/moon.png</normaloff>:/icons/moon.png</iconset>
+    <normaloff>:/docs/sheep.png</normaloff>:/docs/sheep.png</iconset>
   </property>
   <property name="iconSize">
    <size>

oximetry.cpp

@@ -74,11 +74,12 @@ Oximetry::Oximetry(QWidget *parent,QGLWidget * shared) :
         }
         Graphs[i]->AddLayer(new gYAxis());
         Graphs[i]->AddLayer(new gXAxis());
-        Graphs[i]->AddLayer(new gFooBar());
+        //Graphs[i]->AddLayer(new gFooBar());
 
         gSplitter->addWidget(Graphs[i]);
     }
     PLETHY->AddLayer(plethy);
+    PLETHY->AddLayer(new gFooBar());
     PULSE->AddLayer(pulse);
     SPO2->AddLayer(spo2);