chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Database Changes.. hopefully the last one for quite a while

Browse Source
This commit is contained in:
Mark Watkins 2011-07-28 01:28:46 +10:00
parent 8c788b30c6
commit d422a46802
10 changed files with 105 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Graphs/gFlagsLine.cpp
View File

@ -67,8 +67,8 @@ void gFlagsGroup::Plot(gGraphWindow &w, float scrx, float scry)
} }
gFlagsLine::gFlagsLine(MachineCode code,QColor col,QString _label,bool always_visible,FLT_Type flt) gFlagsLine::gFlagsLine(MachineCode code,QColor col,QString label,bool always_visible,FlagType flt)
:gLayer(code),label(_label),m_always_visible(always_visible),m_flt(flt) :gLayer(code),m_label(label),m_always_visible(always_visible),m_flt(flt)
{ {
color.clear(); color.clear();
color.push_back(col); color.push_back(col);
@ -136,8 +136,8 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry)
// Draw text label // Draw text label
float x,y; float x,y;
GetTextExtent(label,x,y); GetTextExtent(m_label,x,y);
DrawText(w,label,start_px-x-10,(scry-line_top)-(line_h/2)+(y/2)); DrawText(w,m_label,start_px-x-10,(scry-line_top)-(line_h/2)+(y/2));
float x1,x2; float x1,x2;
QColor & col=color[0]; QColor & col=color[0];
@ -157,12 +157,12 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry)
if (Y < minx) continue; if (Y < minx) continue;
if (X > maxx) break; if (X > maxx) break;
x1=(X - minx) * xmult + w.GetLeftMargin(); x1=(X - minx) * xmult + w.GetLeftMargin();
if (m_flt==FLT_Bar) { if (m_flt==FT_Bar) {
vertarray[vertcnt++]=x1; vertarray[vertcnt++]=x1;
vertarray[vertcnt++]=top; vertarray[vertcnt++]=top;
vertarray[vertcnt++]=x1; vertarray[vertcnt++]=x1;
vertarray[vertcnt++]=bottom; vertarray[vertcnt++]=bottom;
} else if (m_flt==FLT_Span) { } else if (m_flt==FT_Span) {
x2=(Y-minx)*xmult+w.GetLeftMargin(); x2=(Y-minx)*xmult+w.GetLeftMargin();
//w1=x2-x1; //w1=x2-x1;
quadarray[quadcnt++]=x1; quadarray[quadcnt++]=x1;

12
Graphs/gFlagsLine.h
View File

@ -11,27 +11,25 @@
class gFlagsGroup; class gFlagsGroup;
enum FLT_Type { FLT_Bar, FLT_Span, FLT_Dot };
class gFlagsLine:public gLayer class gFlagsLine:public gLayer
{ {
friend class gFlagsGroup; friend class gFlagsGroup;
public: public:
gFlagsLine(MachineCode code,QColor col=Qt::black,QString _label="",bool always_visible=false,FLT_Type flt=FLT_Bar); gFlagsLine(MachineCode code,QColor col=Qt::black,QString label="",bool always_visible=false,FlagType flt=FT_Bar);
virtual ~gFlagsLine(); virtual ~gFlagsLine();
virtual void Plot(gGraphWindow & w,float scrx,float scry); virtual void Plot(gGraphWindow & w,float scrx,float scry);
bool isAlwaysVisible() { return m_always_visible; } bool isAlwaysVisible() { return m_always_visible; }
void setAlwaysVisible(bool b) { m_always_visible=b; } void setAlwaysVisible(bool b) { m_always_visible=b; }
QString Label() { return label; } QString label() { return m_label; }
void Label(QString s) { label=s; } void setLabel(QString s) { m_label=s; }
void setTotalLines(int i) { total_lines=i; } void setTotalLines(int i) { total_lines=i; }
void setLineNum(int i) { line_num=i; } void setLineNum(int i) { line_num=i; }
protected: protected:
QString label; QString m_label;
bool m_always_visible; bool m_always_visible;
int total_lines,line_num; int total_lines,line_num;
FLT_Type m_flt; FlagType m_flt;
}; };
class gFlagsGroup:public gLayerGroup class gFlagsGroup:public gLayerGroup

16
Graphs/gLineOverlay.cpp
View File

@ -8,8 +8,8 @@
#include "SleepLib/profiles.h" #include "SleepLib/profiles.h"
#include "gLineOverlay.h" #include "gLineOverlay.h"
gLineOverlayBar::gLineOverlayBar(MachineCode code,QColor col,QString _label,LO_Type _lot) gLineOverlayBar::gLineOverlayBar(MachineCode code,QColor col,QString label,FlagType flt)
:gLayer(code),label(_label),lo_type(_lot) :gLayer(code),m_label(label),m_flt(flt)
{ {
color.clear(); color.clear();
color.push_back(col); color.push_back(col);
@ -63,7 +63,7 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry)
// bool done=false; // bool done=false;
for (int i=0;i<el.count();i++) { for (int i=0;i<el.count();i++) {
X=el.time(i); X=el.time(i);
if (lo_type==LOT_Span) { if (m_flt==FT_Span) {
Y=X-(qint64(el.raw(i))*1000.0L); // duration Y=X-(qint64(el.raw(i))*1000.0L); // duration
if (X < w.min_x) continue; if (X < w.min_x) continue;
@ -74,7 +74,7 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry)
} }
x1=w.x2p(X); x1=w.x2p(X);
if (lo_type==LOT_Span) { if (m_flt==FT_Span) {
x2=w.x2p(Y); x2=w.x2p(Y);
//double w1=x2-x1; //double w1=x2-x1;
quadarray[quadcnt++]=x1; quadarray[quadcnt++]=x1;
@ -85,7 +85,7 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry)
quadarray[quadcnt++]=start_py+height; quadarray[quadcnt++]=start_py+height;
quadarray[quadcnt++]=x2; quadarray[quadcnt++]=x2;
quadarray[quadcnt++]=start_py; quadarray[quadcnt++]=start_py;
} else if (lo_type==LOT_Dot) { } else if (m_flt==FT_Dot) {
//if (pref["AlwaysShowOverlayBars"].toBool()) { //if (pref["AlwaysShowOverlayBars"].toBool()) {
if (pref["AlwaysShowOverlayBars"].toBool() || (xx<3600000.0)) { if (pref["AlwaysShowOverlayBars"].toBool() || (xx<3600000.0)) {
@ -99,7 +99,7 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry)
vertarray[vertcnt++]=x1; vertarray[vertcnt++]=x1;
vertarray[vertcnt++]=start_py+1+12; vertarray[vertcnt++]=start_py+1+12;
} }
} else if (lo_type==LOT_Bar) { } else if (m_flt==FT_Bar) {
int z=start_py+height; int z=start_py+height;
if (pref["AlwaysShowOverlayBars"].toBool() || (xx<3600000)) { if (pref["AlwaysShowOverlayBars"].toBool() || (xx<3600000)) {
z=top; z=top;
@ -117,8 +117,8 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry)
vertarray[vertcnt++]=z-12; vertarray[vertcnt++]=z-12;
} }
if (xx<(1800000)) { if (xx<(1800000)) {
GetTextExtent(label,x,y); GetTextExtent(m_label,x,y);
DrawText(w,label,x1-(x/2),scry-(start_py+height-30+y)); DrawText(w,m_label,x1-(x/2),scry-(start_py+height-30+y));
//w.renderText(x1-(x/2),scry-(start_py+height-30+y),label); //w.renderText(x1-(x/2),scry-(start_py+height-30+y),label);
} }

8
Graphs/gLineOverlay.h
View File

@ -8,13 +8,11 @@
#define GLINEOVERLAY_H #define GLINEOVERLAY_H
#include "graphlayer.h" #include "graphlayer.h"
#include "graphdata.h"
enum LO_Type { LOT_Bar, LOT_Span, LOT_Dot };
class gLineOverlayBar:public gLayer class gLineOverlayBar:public gLayer
{ {
public: public:
gLineOverlayBar(MachineCode code,QColor col=QColor("black"),QString _label="",LO_Type _lot=LOT_Bar); gLineOverlayBar(MachineCode code,QColor col=QColor("black"),QString _label="",FlagType _flt=FT_Bar);
virtual ~gLineOverlayBar(); virtual ~gLineOverlayBar();
virtual void Plot(gGraphWindow & w,float scrx,float scry); virtual void Plot(gGraphWindow & w,float scrx,float scry);
@ -22,8 +20,8 @@ class gLineOverlayBar:public gLayer
virtual EventDataType Maxy() { return 0; } virtual EventDataType Maxy() { return 0; }
virtual bool isEmpty() { return true; } virtual bool isEmpty() { return true; }
protected: protected:
QString label; QString m_label;
LO_Type lo_type; FlagType m_flt;
}; };
#endif // GLINEOVERLAY_H #endif // GLINEOVERLAY_H

9
Graphs/glcommon.cpp
View File

@ -134,12 +134,13 @@ void DrawTextQueue(gGraphWindow & wid)
// I bet this slows things down craploads.. should probably skip the vector and use a preallocated textbuffer array. // I bet this slows things down craploads.. should probably skip the vector and use a preallocated textbuffer array.
void DrawText(gGraphWindow &wid,QString text, int x, int y, float angle, QColor color,QFont *font) void DrawText(gGraphWindow &wid,QString text, int x, int y, float angle, QColor color,QFont *font)
{ {
if (angle==90) { if (angle!=0) {
//TextBuffer *b=new TextBuffer(text,x,y,angle,color,font); //TextBuffer *b=new TextBuffer(text,x,y,angle,color,font);
// TextQueRot.push_back(TextBuffer(text,x,y,angle,color,font)); TextQueRot.push_back(TextBuffer(text,x,y,angle,color,font));
} else { } else {
wid.qglColor(color); TextQue.push_back(TextBuffer(text,x,y,0,color,font));
wid.renderText(x,wid.GetScrY()-y,0,text,*font); //wid.qglColor(color);
//wid.renderText(x,wid.GetScrY()-y,0,text,*font);
//TextQue.push_back(b); //TextQue.push_back(b);
} }
} }

4
Graphs/graphlayer.h
View File

@ -11,11 +11,9 @@
#include "SleepLib/day.h" #include "SleepLib/day.h"
#include "graphwindow.h" #include "graphwindow.h"
#include "graphdata.h" enum FlagType { FT_Bar, FT_Dot, FT_Span };
class gGraphWindow; class gGraphWindow;
class gGraphData;
class gPointData;
class gLayer class gLayer
{ {
public: public:

110
SleepLib/machine.cpp
View File

@ -17,89 +17,17 @@
extern QProgressBar * qprogress; extern QProgressBar * qprogress;
map<MachineType,ChannelCode> MachLastCode; //map<MachineType,ChannelCode> MachLastCode;
/* ChannelCode RegisterChannel(MachineType type)
{
if (MachLastCode.find(type)==MachLastCode.end()) {
return MachLastCode[type]=0;
}
return ++(MachLastCode[type]);
};
const int CPAP_WHATEVER=RegisterChannel(MT_CPAP); */
//map<MachineID,Machine *> MachList;
/*map<MachineType,QString> MachineTypeString= {
{MT_UNKNOWN, wxT("Unknown")},
{MT_CPAP, wxT("CPAP")},
{MT_OXIMETER, wxT("Oximeter")},
{MT_SLEEPSTAGE, wxT("SleepStage")}
}; */
/*map<QString,MachineType> MachineTypeLookup= {
{ MachineTypeString[MT_UNKNOWN].Lower(), MT_UNKNOWN },
{ MachineTypeString[MT_CPAP].Lower(), MT_CPAP },
{ MachineTypeString[MT_OXIMETER].Lower(), MT_OXIMETER },
{ MachineTypeString[MT_SLEEPSTAGE].Lower(), MT_SLEEPSTAGE}
}; */
map<CPAPMode,QString> CPAPModeNames; map<CPAPMode,QString> CPAPModeNames;
/*={
{MODE_UNKNOWN,wxT("Undetermined")},
{MODE_CPAP,wxT("CPAP")},
{MODE_APAP,wxT("APAP")},
{MODE_BIPAP,wxT("BIPAP")},
{MODE_ASV,wxT("ASV")}
};*/
map<PRTypes,QString> PressureReliefNames; map<PRTypes,QString> PressureReliefNames;
/*={
{PR_UNKNOWN,_("Undetermined")},
{PR_NONE,_("None")},
{PR_CFLEX,wxT("C-Flex")},
{PR_CFLEXPLUS,wxT("C-Flex+")},
{PR_AFLEX,wxT("A-Flex")},
{PR_BIFLEX,wxT("Bi-Flex")},
{PR_EPR,wxT("Exhalation Pressure Relief (EPR)")},
{PR_SMARTFLEX,wxT("SmartFlex")}
}; */
// Master list. Look up local name table first.. then these if not found. // Master list. Look up local name table first.. then these if not found.
map<MachineCode,QString> DefaultMCShortNames; map<MachineCode,QString> DefaultMCShortNames;
/*= {
{CPAP_Obstructive, wxT("OA")},
{CPAP_Hypopnea, wxT("H")},
{CPAP_RERA, wxT("RE")},
{CPAP_ClearAirway, wxT("CA")},
{CPAP_CSR, wxT("CSR")},
{CPAP_VSnore, wxT("VS")},
{CPAP_FlowLimit, wxT("FL")},
{CPAP_Pressure, wxT("P")},
{CPAP_Leak, wxT("LR")},
{CPAP_EAP, wxT("EAP")},
{CPAP_IAP, wxT("IAP")},
{PRS1_VSnore2, wxT("VS")},
{PRS1_PressurePulse,wxT("PP")}
}; */
// Master list. Look up local name table first.. then these if not found. // Master list. Look up local name table first.. then these if not found.
map<MachineCode,QString> DefaultMCLongNames; map<MachineCode,QString> DefaultMCLongNames;
/*= {
{CPAP_Obstructive, wxT("Obstructive Apnea")},
{CPAP_Hypopnea, wxT("Hypopnea")},
{CPAP_RERA, wxT("Respiratory Effort / Arrousal")},
{CPAP_ClearAirway, wxT("Clear Airway Apnea")},
{CPAP_CSR, wxT("Cheyne Stokes Respiration")},
{CPAP_VSnore, wxT("Vibratory Snore")},
{CPAP_FlowLimit, wxT("Flow Limitation")},
{CPAP_Pressure, wxT("Pressure")},
{CPAP_Leak, wxT("Leak Rate")},
{CPAP_EAP, wxT("BIPAP EPAP")},
{CPAP_IAP, wxT("BIPAP IPAP")},
{PRS1_VSnore2, wxT("Vibratory Snore")},
{PRS1_PressurePulse,wxT("Pressue Pulse")}
}; */
void InitMapsWithoutAwesomeInitializerLists() void InitMapsWithoutAwesomeInitializerLists()
{ {
@ -119,6 +47,7 @@ void InitMapsWithoutAwesomeInitializerLists()
PressureReliefNames[PR_SMARTFLEX]=QObject::tr("SmartFlex"); PressureReliefNames[PR_SMARTFLEX]=QObject::tr("SmartFlex");
DefaultMCShortNames[CPAP_Obstructive]=QObject::tr("OA"); DefaultMCShortNames[CPAP_Obstructive]=QObject::tr("OA");
DefaultMCShortNames[CPAP_Apnea]=QObject::tr("A");
DefaultMCShortNames[CPAP_Hypopnea]=QObject::tr("H"); DefaultMCShortNames[CPAP_Hypopnea]=QObject::tr("H");
DefaultMCShortNames[CPAP_RERA]=QObject::tr("RE"); DefaultMCShortNames[CPAP_RERA]=QObject::tr("RE");
DefaultMCShortNames[CPAP_ClearAirway]=QObject::tr("CA"); DefaultMCShortNames[CPAP_ClearAirway]=QObject::tr("CA");
@ -134,6 +63,7 @@ void InitMapsWithoutAwesomeInitializerLists()
DefaultMCLongNames[CPAP_Obstructive]=QObject::tr("Obstructive Apnea"); DefaultMCLongNames[CPAP_Obstructive]=QObject::tr("Obstructive Apnea");
DefaultMCLongNames[CPAP_Hypopnea]=QObject::tr("Hypopnea"); DefaultMCLongNames[CPAP_Hypopnea]=QObject::tr("Hypopnea");
DefaultMCLongNames[CPAP_Apnea]=QObject::tr("Apnea");
DefaultMCLongNames[CPAP_RERA]=QObject::tr("RERA"); DefaultMCLongNames[CPAP_RERA]=QObject::tr("RERA");
DefaultMCLongNames[CPAP_ClearAirway]=QObject::tr("Clear Airway Apnea"); DefaultMCLongNames[CPAP_ClearAirway]=QObject::tr("Clear Airway Apnea");
DefaultMCLongNames[CPAP_CSR]=QObject::tr("Periodic Breathing"); DefaultMCLongNames[CPAP_CSR]=QObject::tr("Periodic Breathing");
@ -141,6 +71,7 @@ void InitMapsWithoutAwesomeInitializerLists()
DefaultMCLongNames[CPAP_FlowLimit]=QObject::tr("Flow Limitation"); DefaultMCLongNames[CPAP_FlowLimit]=QObject::tr("Flow Limitation");
DefaultMCLongNames[CPAP_Pressure]=QObject::tr("Pressure"); DefaultMCLongNames[CPAP_Pressure]=QObject::tr("Pressure");
DefaultMCLongNames[CPAP_Leak]=QObject::tr("Leak Rate"); DefaultMCLongNames[CPAP_Leak]=QObject::tr("Leak Rate");
DefaultMCLongNames[CPAP_PS]=QObject::tr("Pressure Support");
DefaultMCLongNames[CPAP_EAP]=QObject::tr("BIPAP EPAP"); DefaultMCLongNames[CPAP_EAP]=QObject::tr("BIPAP EPAP");
DefaultMCLongNames[CPAP_IAP]=QObject::tr("BIPAP IPAP"); DefaultMCLongNames[CPAP_IAP]=QObject::tr("BIPAP IPAP");
DefaultMCLongNames[CPAP_Snore]=QObject::tr("Vibratory Snore"); // Graph data DefaultMCLongNames[CPAP_Snore]=QObject::tr("Vibratory Snore"); // Graph data
@ -154,35 +85,6 @@ void InitMapsWithoutAwesomeInitializerLists()
} }
// This is technically gui related.. however I have something in mind for it.
/*const map<MachineCode,FlagType> DefaultFlagTypes= {
{CPAP_Obstructive, FT_BAR},
{CPAP_Hypopnea, FT_BAR},
{CPAP_RERA, FT_BAR},
{CPAP_VSnore, FT_BAR},
{PRS1_VSnore2, FT_BAR},
{CPAP_FlowLimit, FT_BAR},
{CPAP_ClearAirway, FT_BAR},
{CPAP_CSR, FT_SPAN},
{PRS1_PressurePulse,FT_DOT},
{CPAP_Pressure, FT_DOT}
};
const unsigned char flagalpha=0x80;
const map<MachineCode,wxColour> DefaultFlagColours= {
{CPAP_Obstructive, wxColour(0x80,0x80,0xff,flagalpha)},
{CPAP_Hypopnea, wxColour(0x00,0x00,0xff,flagalpha)},
{CPAP_RERA, wxColour(0x40,0x80,0xff,flagalpha)},
{CPAP_VSnore, wxColour(0xff,0x20,0x20,flagalpha)},
{CPAP_FlowLimit, wxColour(0x20,0x20,0x20,flagalpha)},
{CPAP_ClearAirway, wxColour(0xff,0x40,0xff,flagalpha)},
{CPAP_CSR, wxColour(0x40,0xff,0x40,flagalpha)},
{PRS1_VSnore2, wxColour(0xff,0x20,0x20,flagalpha)},
{PRS1_PressurePulse,wxColour(0xff,0x40,0xff,flagalpha)}
}; */
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
// Machine Base-Class implmementation // Machine Base-Class implmementation
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
@ -243,7 +145,6 @@ Day *Machine::AddSession(Session *s,Profile *p)
QDate date=d2.date(); QDate date=d2.date();
//QTime time=d2.time(); //QTime time=d2.time();
// pref["NoonDateSplit"]=true;
if (pref.Exists("NoonDataSplit") && pref["NoonDateSplit"].toBool()) { if (pref.Exists("NoonDataSplit") && pref["NoonDateSplit"].toBool()) {
int hour=d2.time().hour(); int hour=d2.time().hour();
if (hour<12) if (hour<12)
@ -405,7 +306,6 @@ bool Machine::Load()
if (sess->LoadSummary(s->second[0])) { if (sess->LoadSummary(s->second[0])) {
sess->SetEventFile(s->second[1]); sess->SetEventFile(s->second[1]);
sess->SetWaveFile(s->second[2]);
AddSession(sess,profile); AddSession(sess,profile);
} else { } else {
qWarning() << "Error unpacking summary data"; qWarning() << "Error unpacking summary data";

11
SleepLib/machine_common.h
View File

@ -17,6 +17,10 @@ typedef long SessionID;
class BoundsError {}; class BoundsError {};
// 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 int max_number_event_fields=10; const int max_number_event_fields=10;
enum MachineType//: short enum MachineType//: short
@ -25,7 +29,8 @@ enum MachineType//: short
// Could be implimented by MachineLoader's register function requesting a block of integer space, // Could be implimented by MachineLoader's register function requesting a block of integer space,
// and a map to name strings. // and a map to name strings.
typedef int ChannelCode; //typedef int ChannelCode;
// Be cautious when extending these.. add to the end of each groups to preserve file formats. // Be cautious when extending these.. add to the end of each groups to preserve file formats.
enum MachineCode//:qint16 enum MachineCode//:qint16
@ -67,13 +72,9 @@ enum MachineCode//:qint16
GEN_Weight=0x3000, GEN_Notes, GEN_Glucose, GEN_Calories, GEN_Energy, GEN_Mood, GEN_Excercise, GEN_Reminder GEN_Weight=0x3000, GEN_Notes, GEN_Glucose, GEN_Calories, GEN_Energy, GEN_Mood, GEN_Excercise, GEN_Reminder
}; };
void InitMapsWithoutAwesomeInitializerLists(); void InitMapsWithoutAwesomeInitializerLists();
enum FlagType//:short
{ FT_BAR, FT_DOT, FT_SPAN };
enum CPAPMode//:short enum CPAPMode//:short
{ {

197
SleepLib/session.cpp
View File

@ -9,6 +9,7 @@
#include "math.h" #include "math.h"
#include <QDir> #include <QDir>
#include <QDebug> #include <QDebug>
#include <QMessageBox>
#include <QMetaType> #include <QMetaType>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
@ -52,8 +53,7 @@ void Session::TrashEvents()
bool Session::OpenEvents() { bool Session::OpenEvents() {
if (s_events_loaded) if (s_events_loaded)
return true; return true;
bool b; bool b=LoadEvents(s_eventfile);
b=LoadEvents(s_eventfile);
if (!b) { if (!b) {
qWarning() << "Error Unkpacking Events" << s_eventfile; qWarning() << "Error Unkpacking Events" << s_eventfile;
return false; return false;
@ -75,23 +75,29 @@ bool Session::Store(QString path)
base.sprintf("%08lx",s_session); base.sprintf("%08lx",s_session);
base=path+"/"+base; base=path+"/"+base;
//qDebug() << "Storing Session: " << base; //qDebug() << "Storing Session: " << base;
bool a; bool a,b=false;
a=StoreSummary(base+".000"); // if actually has events a=StoreSummary(base+".000"); // if actually has events
//qDebug() << " Summary done"; //qDebug() << " Summary done";
s_eventfile=base+".001"; if (eventlist.size()>0)
if (eventlist.size()>0) StoreEvents(base+".001"); b=StoreEvents(base+".001");
//qDebug() << " Events done"; //qDebug() << " Events done";
if (a) { s_changed=false;
s_changed=false; s_eventfile=base+".001";
s_events_loaded=true; s_events_loaded=true;
//TrashEvents(); //TrashEvents();
} //} else {
// qDebug() << "Session::Store() No event data saved" << s_session;
//}
return a; return a;
} }
const quint16 filetype_summary=0;
const quint16 filetype_data=1;
const quint32 magic=0xC73216AB; const quint32 magic=0xC73216AB;
bool IsPlatformLittleEndian() bool IsPlatformLittleEndian()
{ {
quint32 j=1; quint32 j=1;
@ -107,69 +113,23 @@ bool Session::StoreSummary(QString filename)
QDataStream out(&file); QDataStream out(&file);
out.setVersion(QDataStream::Qt_4_6); out.setVersion(QDataStream::Qt_4_6);
out.setByteOrder(QDataStream::LittleEndian);
out << (quint32)magic; out << (quint32)magic;
out << (quint16)dbversion;
out << (quint16)filetype_summary;
out << (quint32)s_machine->id(); out << (quint32)s_machine->id();
out << (quint32)s_session; out << (quint32)s_session;
out << (quint16)0 << (quint16)0;
quint32 starttime=s_first/1000L; out << s_first; // Session Start Time
quint32 duration=(s_last-s_first)/1000L; out << s_last; // Duration of sesion in seconds.
out << (quint32)starttime; // Session Start Time
out << (quint32)duration; // Duration of sesion in seconds.
out << (quint16)summary.size(); out << (quint16)summary.size();
map<MachineCode,MCDataType> mctype;
// First output the Machine Code and type for each summary record // First output the Machine Code and type for each summary record
map<MachineCode,QVariant>::iterator i; for (map<MachineCode,QVariant>::iterator i=summary.begin(); i!=summary.end(); i++) {
for (i=summary.begin(); i!=summary.end(); i++) {
MachineCode mc=i->first; MachineCode mc=i->first;
QMetaType::Type type=(QMetaType::Type)i->second.type(); // Urkk.. this is a mess.
if (type==QMetaType::Bool) {
mctype[mc]=MC_bool;
} else if (type==QMetaType::Int) {
mctype[mc]=MC_int;
} else if (type==QMetaType::LongLong) {
mctype[mc]=MC_long;
} else if (type==QMetaType::Double) {
mctype[mc]=MC_double;
} else if (type==QMetaType::Float) {
mctype[mc]=MC_float;
} else if (type==QMetaType::QString) {
mctype[mc]=MC_string;
} else if (type==QMetaType::QDateTime) {
mctype[mc]=MC_datetime;
} else {
QString t=i->second.typeToName((QVariant::Type)type);
qWarning() << "Error in Session->StoreSummary: Can't pack variant type " << t;
return false;
//exit(1);
}
out << (qint16)mc; out << (qint16)mc;
out << (qint8)mctype[mc]; out << i->second;
}
// Then dump out the actual data, according to format.
for (i=summary.begin(); i!=summary.end(); i++) {
MachineCode mc=i->first;
if (mctype[mc]==MC_bool) {
out << i->second.toBool();
} else if (mctype[mc]==MC_int) {
out << (qint32)i->second.toInt();
} else if (mctype[mc]==MC_long) {
out << (qint64)i->second.toLongLong();
} else if (mctype[mc]==MC_double) {
out << (double)i->second.toDouble();
} else if (mctype[mc]==MC_float) {
float f=(float)i->second.toDouble(); // check me.
out << f;
} else if (mctype[mc]==MC_string) {
out << i->second.toString();
} else if (mctype[mc]==MC_datetime) {
out << i->second.toDateTime();
}
} }
file.close(); file.close();
return true; return true;
@ -177,17 +137,20 @@ bool Session::StoreSummary(QString filename)
bool Session::LoadSummary(QString filename) bool Session::LoadSummary(QString filename)
{ {
if (filename.isEmpty()) return false; if (filename.isEmpty()) {
//qDebug() << "Loading Summary " << filename; qDebug() << "Empty summary filename";
return false;
}
QFile file(filename); QFile file(filename);
if (!file.open(QIODevice::ReadOnly)) { if (!file.open(QIODevice::ReadOnly)) {
qDebug() << "Couldn't open file" << filename; qDebug() << "Couldn't open summary file" << filename;
return false; return false;
} }
QDataStream in(&file); QDataStream in(&file);
in.setVersion(QDataStream::Qt_4_6); in.setVersion(QDataStream::Qt_4_6);
in.setByteOrder(QDataStream::LittleEndian);
quint64 t64; quint64 t64;
quint32 t32; quint32 t32;
@ -203,67 +166,34 @@ bool Session::LoadSummary(QString filename)
return false; return false;
} }
in >> t32; // MachineID (dont need this result) in >> t16; // DB Version
if (t16!=dbversion) {
in >> t32; // Sessionid; qWarning() << "Old dbversion "<< t16 << "summary file.. Sorry, you need to purge and reimport";
s_session=t32; return false;
}
in >> t16; // File Type in >> t16; // File Type
if (t16!=0) { if (t16!=filetype_summary) {
qDebug() << "Wrong file type"; //wrong file type qDebug() << "Wrong file type"; //wrong file type
return false; return false;
} }
in >> t16; // File Version
// dont care yet
in >> t32; // Start time in >> t32; // MachineID (dont need this result)
s_first=qint64(t32)*1000L; in >> t32; // Sessionid;
s_session=t32;
in >> t32; // Duration // (16bit==Limited to 18 hours) in >> s_first; // Start time
s_last=s_first+qint64(t32)*1000L; in >> s_last; // Duration // (16bit==Limited to 18 hours)
in >> sumsize; // Summary size (number of Machine Code lists) in >> sumsize; // Summary size (number of Machine Code lists)
for (int i=0; i<sumsize; i++) { for (int i=0; i<sumsize; i++) {
in >> t16; // Machine Code in >> t16; // Machine Code
MachineCode mc=(MachineCode)t16; MachineCode mc=(MachineCode)t16;
in >> t8; // Data Type in >> summary[mc];
mctype[mc]=(MCDataType)t8;
mcorder.push_back(mc);
} }
for (int i=0; i<sumsize; i++) { // Load each summary entry according to type
MachineCode mc=mcorder[i];
if (mctype[mc]==MC_bool) {
bool b;
in >> b;
summary[mc]=b;
} else if (mctype[mc]==MC_int) {
in >> t32;
summary[mc]=(qint32)t32;
} else if (mctype[mc]==MC_long) {
in >> t64;
summary[mc]=(qint64)t64;
} else if (mctype[mc]==MC_double) {
double dl;
in >> dl;
summary[mc]=(double)dl;
} else if (mctype[mc]==MC_float) {
float fl;
in >> fl;
summary[mc]=(float)fl;
} else if (mctype[mc]==MC_string) {
QString s;
in >> s;
summary[mc]=s;
} else if (mctype[mc]==MC_datetime) {
QDateTime dt;
in >> dt;
summary[mc]=dt;
}
}
return true; return true;
} }
@ -274,12 +204,13 @@ bool Session::StoreEvents(QString filename)
QDataStream out(&file); QDataStream out(&file);
out.setVersion(QDataStream::Qt_4_6); out.setVersion(QDataStream::Qt_4_6);
out.setByteOrder(QDataStream::LittleEndian);
out << (quint32)magic; // Magic Number out << (quint32)magic; // Magic Number
out << (quint32)s_machine->id(); // Machine ID out << (quint16)dbversion; // File Version
out << (quint32)s_session; // This session's ID out << (quint16)filetype_data; // File type 1 == Event
out << (quint16)1; // File type 1 == Event out << (quint32)s_machine->id();// Machine ID
out << (quint16)0; // File Version out << (quint32)s_session; // This session's ID
out << s_first; out << s_first;
out << s_last; out << s_last;
@ -302,13 +233,8 @@ bool Session::StoreEvents(QString filename)
out << e.rate(); out << e.rate();
out << e.gain(); out << e.gain();
out << e.offset(); out << e.offset();
//if (!e.update_minmax()) { out << e.min();
out << e.min(); out << e.max();
out << e.max();
//} else {
// out << (EventDataType)0;
// out << (EventDataType)0;
//}
} }
} }
qint64 t,last; qint64 t,last;
@ -316,6 +242,7 @@ bool Session::StoreEvents(QString filename)
for (i=eventlist.begin(); i!=eventlist.end(); i++) { for (i=eventlist.begin(); i!=eventlist.end(); i++) {
for (unsigned j=0;j<i->second.size();j++) { for (unsigned j=0;j<i->second.size();j++) {
EventList &e=*i->second[j]; EventList &e=*i->second[j];
for (int c=0;c<e.count();c++) { for (int c=0;c<e.count();c++) {
out << e.raw(c); out << e.raw(c);
} }
@ -331,12 +258,14 @@ bool Session::StoreEvents(QString filename)
} }
} }
//file.close();
return true; return true;
} }
bool Session::LoadEvents(QString filename) bool Session::LoadEvents(QString filename)
{ {
if (filename.isEmpty()) return false; if (filename.isEmpty()) {
qDebug() << "Session::LoadEvents() Filename is empty";
return false;
}
QFile file(filename); QFile file(filename);
if (!file.open(QIODevice::ReadOnly)) { if (!file.open(QIODevice::ReadOnly)) {
@ -345,6 +274,7 @@ bool Session::LoadEvents(QString filename)
} }
QDataStream in(&file); QDataStream in(&file);
in.setVersion(QDataStream::Qt_4_6); in.setVersion(QDataStream::Qt_4_6);
in.setByteOrder(QDataStream::LittleEndian);
quint32 t32; quint32 t32;
quint16 t16; quint16 t16;
@ -356,19 +286,21 @@ bool Session::LoadEvents(QString filename)
qWarning() << "Wrong Magic number in " << filename; qWarning() << "Wrong Magic number in " << filename;
return false; return false;
} }
in >> t32; // MachineID in >> t16; // File Version
if (t16!=dbversion) {
in >> t32; // Sessionid; qWarning() << "Old dbversion "<< t16 << "summary file.. Sorry, you need to purge and reimport";
s_session=t32; return false;
}
in >> t16; // File Type in >> t16; // File Type
if (t16!=1) { if (t16!=filetype_data) {
qDebug() << "Wrong File Type in " << filename; qDebug() << "Wrong File Type in " << filename;
return false; return false;
} }
in >> t16; // File Version in >> t32; // MachineID
// dont give a crap yet.. in >> t32; // Sessionid;
s_session=t32;
in >> s_first; in >> s_first;
in >> s_last; in >> s_last;
@ -392,9 +324,7 @@ bool Session::LoadEvents(QString filename)
sizevec.push_back(size2); sizevec.push_back(size2);
for (int j=0;j<size2;j++) { for (int j=0;j<size2;j++) {
in >> ts1; in >> ts1;
//UpdateFirst(ts1);
in >> ts2; in >> ts2;
//UpdateLast(ts2);
in >> evcount; in >> evcount;
in >> t8; in >> t8;
elt=(EventListType)t8; elt=(EventListType)t8;
@ -412,7 +342,6 @@ bool Session::LoadEvents(QString filename)
} }
} }
EventStoreType t; EventStoreType t;
qint64 last; qint64 last;
quint32 x; quint32 x;

6
daily.cpp
View File

@ -78,7 +78,7 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) :
SF->setMinimumHeight(160); SF->setMinimumHeight(160);
fg=new gFlagsGroup(); fg=new gFlagsGroup();
fg->AddLayer(new gFlagsLine(CPAP_CSR,QColor("light green"),"CSR",false,FLT_Span)); fg->AddLayer(new gFlagsLine(CPAP_CSR,QColor("light green"),"CSR",false,FT_Span));
fg->AddLayer(new gFlagsLine(CPAP_ClearAirway,QColor("purple"),"CA",true)); fg->AddLayer(new gFlagsLine(CPAP_ClearAirway,QColor("purple"),"CA",true));
fg->AddLayer(new gFlagsLine(CPAP_Obstructive,QColor("#40c0ff"),"OA",true)); fg->AddLayer(new gFlagsLine(CPAP_Obstructive,QColor("#40c0ff"),"OA",true));
fg->AddLayer(new gFlagsLine(CPAP_Hypopnea,QColor("blue"),"H",true)); fg->AddLayer(new gFlagsLine(CPAP_Hypopnea,QColor("blue"),"H",true));
@ -122,13 +122,13 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) :
//FRW->AddLayer(new gFooBar()); //FRW->AddLayer(new gFooBar());
FRW->AddLayer(new gYAxis()); FRW->AddLayer(new gYAxis());
FRW->AddLayer(new gXAxis()); FRW->AddLayer(new gXAxis());
FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_CSR,QColor("light green"),"CSR",LOT_Span))); FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_CSR,QColor("light green"),"CSR",FT_Span)));
g=new gLineChart(CPAP_FlowRate,Qt::black,false); g=new gLineChart(CPAP_FlowRate,Qt::black,false);
g->ReportEmpty(true); g->ReportEmpty(true);
AddCPAP(g); AddCPAP(g);
FRW->AddLayer(g); FRW->AddLayer(g);
FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_Hypopnea,QColor("blue"),"H"))); FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_Hypopnea,QColor("blue"),"H")));
FRW->AddLayer(AddCPAP(new gLineOverlayBar(PRS1_PressurePulse,QColor("red"),"PR",LOT_Dot))); FRW->AddLayer(AddCPAP(new gLineOverlayBar(PRS1_PressurePulse,QColor("red"),"PR",FT_Dot)));
FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_RERA,QColor("gold"),"RE"))); FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_RERA,QColor("gold"),"RE")));
//FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_Unknown0E,QColor("dark green"),"U0E"))); //FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_Unknown0E,QColor("dark green"),"U0E")));
FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_VSnore,QColor("red"),"VS"))); FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_VSnore,QColor("red"),"VS")));