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

ChannelID Integer Rework.. WARNING.. BACKUP YOUR SleepApp profile First

Browse Source
This commit is contained in:
Mark Watkins 2011-12-22 03:00:19 +10:00
parent 10bf80f741
commit 5081e7f711
26 changed files with 357 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Graphs/gFooBar.cpp
View File

@ -7,7 +7,7 @@
#include "gFooBar.h"
gShadowArea::gShadowArea(QColor shadow_color,QColor line_color)
:Layer(""),m_shadow_color(shadow_color),m_line_color(line_color)
:Layer(NoChannel),m_shadow_color(shadow_color),m_line_color(line_color)
{
addGLBuf(quads=new GLShortBuffer(20,GL_QUADS));
addGLBuf(lines=new GLShortBuffer(20,GL_LINES));
@ -43,7 +43,7 @@ void gShadowArea::paint(gGraph & w,int left, int top, int width, int height)
}
gFooBar::gFooBar(int offset,QColor handle_color,QColor line_color)
:Layer(""),m_offset(offset),m_handle_color(handle_color),m_line_color(line_color)
:Layer(NoChannel),m_offset(offset),m_handle_color(handle_color),m_line_color(line_color)
{
}
gFooBar::~gFooBar()

4
Graphs/gGraphView.cpp
View File

@ -772,7 +772,7 @@ void Layer::drawGLBuf(float linesize)
void Layer::SetDay(Day * d)
{
if (d && !m_code.isEmpty()) {
if (d && m_code) {
m_day=d;
m_minx=d->first(m_code);
m_maxx=d->last(m_code);
@ -798,7 +798,7 @@ void Layer::setLayout(LayerPosition position, short width, short height, short o
}
LayerGroup::LayerGroup() :
Layer("")
Layer(NoChannel)
{
}
LayerGroup::~LayerGroup()

4
Graphs/gLineChart.cpp
View File

@ -141,7 +141,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
bool fndbetter=false;
for (QList<schema::Channel *>::iterator l=ch.m_links.begin();l!=ch.m_links.end();l++) {
schema::Channel *c=*l;
ci=(*m_day)[svi]->eventlist.find(c->name());
ci=(*m_day)[svi]->eventlist.find(c->id());
if (ci!=(*m_day)[svi]->eventlist.end()) {
fndbetter=true;
break;
@ -451,7 +451,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
AHIChart::AHIChart(const QColor col)
:Layer("ZZZ"),m_color(col)
:Layer(NoChannel),m_color(col)
{
m_miny=m_maxy=0;
addGLBuf(lines=new GLShortBuffer(100000,GL_LINES));

2
Graphs/gSegmentChart.cpp
View File

@ -9,7 +9,7 @@
gSegmentChart::gSegmentChart(GraphSegmentType type,QColor gradient_color,QColor outline_color)
:Layer("EmptyChannel"),m_graph_type(type),m_gradient_color(gradient_color),m_outline_color(outline_color)
:Layer(NoChannel),m_graph_type(type),m_gradient_color(gradient_color),m_outline_color(outline_color)
{
m_empty=true;
addGLBuf(poly=new GLFloatBuffer(4000,GL_POLYGON));

2
Graphs/gSummaryChart.cpp
View File

@ -12,7 +12,7 @@
extern QLabel * qstatus2;
SummaryChart::SummaryChart(QString label,GraphType type)
:Layer(""),m_label(label),m_graphtype(type)
:Layer(NoChannel),m_label(label),m_graphtype(type)
{
//QColor color=Qt::black;
addGLBuf(quads=new GLShortBuffer(20000,GL_QUADS));

2
Graphs/gXAxis.cpp
View File

@ -17,7 +17,7 @@ const quint64 divisors[]={
const int divcnt=sizeof(divisors)/sizeof(quint64);
gXAxis::gXAxis(QColor col,bool fadeout)
:Layer("")
:Layer(NoChannel)
{
m_line_color=col;
m_text_color=col;

6
Graphs/gYAxis.cpp
View File

@ -10,13 +10,13 @@
#include "SleepLib/profiles.h"
gYSpacer::gYSpacer(int spacer)
:Layer("")
:Layer(NoChannel)
{
Q_UNUSED(spacer)
}
gXGrid::gXGrid(QColor col)
:Layer("")
:Layer(NoChannel)
{
Q_UNUSED(col)
@ -125,7 +125,7 @@ void gXGrid::paint(gGraph & w,int left,int top, int width, int height)
gYAxis::gYAxis(QColor col)
:Layer("")
:Layer(NoChannel)
{
m_line_color=col;
m_text_color=col;

2
SleepLib/calcs.cpp
View File

@ -216,7 +216,7 @@ int filterFlow(Session *session, EventList *in, EventList *out, EventList *tv, E
goodb.push_back(time);
}
}
for (int i=0;i<breaths_max.size();i++) {
for (int i=0;i<breaths_min.size();i++) {
min=breaths_min[i];
time=breaths_min_peak[i];
if (min < avgmin*0.2) {

8
SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -552,7 +552,7 @@ bool PRS1Loader::Parse002v5(qint32 sequence, quint32 timestamp, unsigned char *b
return false;
Session *session=new_sessions[sequence];
QString Codes[]={
ChannelID Codes[]={
PRS1_00, PRS1_01, CPAP_Pressure, CPAP_EPAP, CPAP_PressurePulse, CPAP_Obstructive,
CPAP_ClearAirway, CPAP_Hypopnea, PRS1_08, CPAP_FlowLimit, PRS1_0A, CPAP_CSR,
PRS1_0C, CPAP_VSnore, PRS1_0E, PRS1_0F, PRS1_10,
@ -590,7 +590,7 @@ bool PRS1Loader::Parse002v5(qint32 sequence, quint32 timestamp, unsigned char *b
pos+=2;
t+=qint64(delta)*1000L;
}
QString cpapcode=Codes[(int)code];
ChannelID cpapcode=Codes[(int)code];
//EventDataType PS;
tt=t;
cnt++;
@ -736,7 +736,7 @@ bool PRS1Loader::Parse002v5(qint32 sequence, quint32 timestamp, unsigned char *b
Code[20]->AddEvent(t,data[2]=buffer[pos++]); // Snore
if (data[2]>0) {
if (!Code[21]) {
if (!(Code[21]=session->AddEventList("VSnore",EVL_Event)))
if (!(Code[21]=session->AddEventList(CPAP_VSnore,EVL_Event)))
return false;
}
Code[21]->AddEvent(t,0); //data[2]); // VSnore
@ -1496,7 +1496,7 @@ bool PRS1Loader::OpenWaveforms(SessionID sid, QString filename)
//QString FlowRate=CPAP_FlowRate;
//QString MaskPressure="MaskPressure";
QString wc[2]={CPAP_FlowRate,CPAP_MaskPressure};
ChannelID wc[2]={CPAP_FlowRate,CPAP_MaskPressure};
do {
timestamp=m_buffer[pos+0xb] | m_buffer[pos+0xc] << 8 | m_buffer[pos+0xd] << 16 | m_buffer[pos+0x0e] << 24;
register unsigned char sum8=0;

8
SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -436,7 +436,7 @@ int ResmedLoader::Open(QString & path,Profile *profile)
if (mode==0) {
sess->settings[CPAP_Mode]=MODE_CPAP;
sig=stredf.lookupSignal("Set Pressure"); // ?? What's meant by Set Pressure?
sig=stredf.lookupSignal(RMS9_SetPressure); // ?? What's meant by Set Pressure?
if (sig) {
EventDataType pressure=sig->data[dn]*sig->gain;
sess->settings[CPAP_PressureMin]=pressure;
@ -879,9 +879,9 @@ void ResInitModelMap()
resmed_codes[CPAP_Mode].push_back("Mode");
resmed_codes[CPAP_Mode].push_back("Modus");
resmed_codes["Set Pressure"].push_back("Eingest. Druck");
resmed_codes["Set Pressure"].push_back("Set Pressure"); // Prescription
resmed_codes["Set Pressure"].push_back("Pres. prescrite");
resmed_codes[RMS9_SetPressure].push_back("Eingest. Druck");
resmed_codes[RMS9_SetPressure].push_back("Set Pressure"); // Prescription
resmed_codes[RMS9_SetPressure].push_back("Pres. prescrite");
resmed_codes[RMS9_EPR].push_back("EPR");
resmed_codes[RMS9_EPRSet].push_back("EPR Level");
resmed_codes[RMS9_EPRSet].push_back("EPR-Stufe");

18
SleepLib/machine.cpp
View File

@ -408,6 +408,24 @@ SleepStage::~SleepStage()
}
ChannelID NoChannel;
ChannelID CPAP_IPAP, CPAP_IPAPLo, CPAP_IPAPHi, CPAP_EPAP, CPAP_Pressure, CPAP_PS, CPAP_Mode, CPAP_AHI,
CPAP_PressureMin, CPAP_PressureMax, CPAP_RampTime, CPAP_RampPressure, CPAP_Obstructive, CPAP_Hypopnea,
CPAP_ClearAirway, CPAP_Apnea, CPAP_CSR, CPAP_LeakFlag, CPAP_ExP, CPAP_NRI, CPAP_VSnore, CPAP_VSnore2,
CPAP_RERA, CPAP_PressurePulse, CPAP_FlowLimit, CPAP_FlowRate, CPAP_MaskPressure, CPAP_MaskPressureHi,
CPAP_RespEvent, CPAP_Snore, CPAP_MinuteVent, CPAP_RespRate, CPAP_TidalVolume, CPAP_PTB, CPAP_Leak,
CPAP_LeakMedian, CPAP_LeakTotal, CPAP_MaxLeak, CPAP_FLG, CPAP_IE, CPAP_Te, CPAP_Ti, CPAP_TgMV,
CPAP_UserFlag1, CPAP_UserFlag2, CPAP_BrokenSummary, CPAP_BrokenWaveform;
ChannelID RMS9_E01, RMS9_E02, RMS9_EPR, RMS9_EPRSet, RMS9_SetPressure;
ChannelID INTP_SmartFlex;
ChannelID PRS1_00, PRS1_01, PRS1_08, PRS1_0A, PRS1_0B, PRS1_0C, PRS1_0E, PRS1_0F, PRS1_10, PRS1_12,
PRS1_FlexMode, PRS1_FlexSet, PRS1_HumidStatus, PRS1_HumidSetting, PRS1_SysLock, PRS1_SysOneResistStat,
PRS1_SysOneResistSet, PRS1_HoseDiam, PRS1_AutoOn, PRS1_AutoOff, PRS1_MaskAlert, PRS1_ShowAHI;
ChannelID OXI_Pulse, OXI_SPO2, OXI_PulseChange, OXI_SPO2Drop, OXI_Plethy;
ChannelID Journal_Notes, Journal_Weight, Journal_BMI, Journal_ZombieMeter, Bookmark_Start, Bookmark_End, Bookmark_Notes;

106
SleepLib/machine_common.h
View File

@ -15,7 +15,7 @@
#include <QDebug>
using namespace std;
typedef QString ChannelID;
typedef quint32 ChannelID;
typedef long MachineID;
typedef long SessionID;
typedef float EventDataType;
@ -76,92 +76,26 @@ enum PRTypes//:short
enum MCDataType
{ MC_bool=0, MC_int, MC_long, MC_float, MC_double, MC_string, MC_datetime };
// This all needs replacing with actual integer codes.. There will likely be a big speedup when this happens again.
const ChannelID CPAP_IPAP="IPAP";
const ChannelID CPAP_IPAPLo="IPAPLo";
const ChannelID CPAP_IPAPHi="IPAPHi";
const ChannelID CPAP_EPAP="EPAP";
const ChannelID CPAP_Pressure="Pressure";
const ChannelID CPAP_PS="PS";
const ChannelID CPAP_Mode="PAPMode";
const ChannelID CPAP_BrokenSummary="BrokenSummary";
const ChannelID CPAP_PressureMin="PressureMin";
const ChannelID CPAP_PressureMax="PressureMax";
const ChannelID CPAP_RampTime="RampTime";
const ChannelID CPAP_RampPressure="RampPressure";
const ChannelID CPAP_Obstructive="Obstructive";
const ChannelID CPAP_Hypopnea="Hypopnea";
const ChannelID CPAP_ClearAirway="ClearAirway";
const ChannelID CPAP_Apnea="Apnea";
const ChannelID CPAP_CSR="CSR";
const ChannelID CPAP_LeakFlag="LeakFlag";
const ChannelID CPAP_ExP="ExP";
const ChannelID CPAP_NRI="NRI";
const ChannelID CPAP_VSnore="VSnore";
const ChannelID CPAP_VSnore2="VSnore2";
const ChannelID CPAP_RERA="RERA";
const ChannelID CPAP_PressurePulse="PressurePulse";
const ChannelID CPAP_FlowLimit="FlowLimit";
const ChannelID CPAP_FlowRate="FlowRate";
const ChannelID CPAP_MaskPressure="MaskPressure";
const ChannelID CPAP_MaskPressureHi="MaskPressureHi";
const ChannelID CPAP_RespEvent="RespEvent";
const ChannelID CPAP_Snore="Snore";
const ChannelID CPAP_MinuteVent="MinuteVent";
const ChannelID CPAP_RespRate="RespRate";
const ChannelID CPAP_TidalVolume="TidalVolume";
const ChannelID CPAP_PTB="PTB";
const ChannelID CPAP_Leak="Leak";
const ChannelID CPAP_LeakMedian="LeakMedian";
const ChannelID CPAP_LeakTotal="LeakTotal";
const ChannelID CPAP_MaxLeak="MaxLeak";
const ChannelID CPAP_FLG="FLG";
const ChannelID CPAP_IE="IE";
const ChannelID CPAP_Te="Te";
const ChannelID CPAP_Ti="Ti";
const ChannelID CPAP_TgMV="TgMV";
const ChannelID RMS9_E01="RMS9_E01";
const ChannelID RMS9_E02="RMS9_E02";
const ChannelID RMS9_EPR="EPR";
const ChannelID RMS9_EPRSet="EPRSet";
const ChannelID PRS1_00="PRS1_00";
const ChannelID PRS1_01="PRS1_01";
const ChannelID PRS1_08="PRS1_08";
const ChannelID PRS1_0A="PRS1_0A";
const ChannelID PRS1_0B="PRS1_0B";
const ChannelID PRS1_0C="PRS1_0C";
const ChannelID PRS1_0E="PRS1_0E";
const ChannelID PRS1_0F="PRS1_0F";
const ChannelID PRS1_10="PRS1_10";
const ChannelID PRS1_12="PRS1_12";
const ChannelID PRS1_FlexMode="FlexMode";
const ChannelID PRS1_FlexSet="FlexSet";
const ChannelID PRS1_HumidStatus="HumidStat";
const ChannelID PRS1_HumidSetting="HumidSet";
const ChannelID PRS1_SysLock="SysLock";
const ChannelID PRS1_SysOneResistStat="SysOneResistStat";
const ChannelID PRS1_SysOneResistSet="SysOneResistSet";
const ChannelID PRS1_HoseDiam="HoseDiam";
const ChannelID PRS1_AutoOn="AutoOn";
const ChannelID PRS1_AutoOff="AutoOff";
const ChannelID PRS1_MaskAlert="MaskAlert";
const ChannelID PRS1_ShowAHI="ShowAHI";
const ChannelID CPAP_UserFlag1="UserFlag1";
const ChannelID CPAP_UserFlag2="UserFlag2";
const ChannelID OXI_Pulse="Pulse";
const ChannelID OXI_SPO2="SPO2";
const ChannelID OXI_PulseChange="PulseChange";
const ChannelID OXI_SPO2Drop="SPO2Drop";
const ChannelID OXI_Plethy="Plethy";
extern ChannelID NoChannel;
extern ChannelID CPAP_IPAP, CPAP_IPAPLo, CPAP_IPAPHi, CPAP_EPAP, CPAP_Pressure, CPAP_PS, CPAP_Mode, CPAP_AHI,
CPAP_PressureMin, CPAP_PressureMax, CPAP_RampTime, CPAP_RampPressure, CPAP_Obstructive, CPAP_Hypopnea,
CPAP_ClearAirway, CPAP_Apnea, CPAP_CSR, CPAP_LeakFlag, CPAP_ExP, CPAP_NRI, CPAP_VSnore, CPAP_VSnore2,
CPAP_RERA, CPAP_PressurePulse, CPAP_FlowLimit, CPAP_FlowRate, CPAP_MaskPressure, CPAP_MaskPressureHi,
CPAP_RespEvent, CPAP_Snore, CPAP_MinuteVent, CPAP_RespRate, CPAP_TidalVolume, CPAP_PTB, CPAP_Leak,
CPAP_LeakMedian, CPAP_LeakTotal, CPAP_MaxLeak, CPAP_FLG, CPAP_IE, CPAP_Te, CPAP_Ti, CPAP_TgMV,
CPAP_UserFlag1, CPAP_UserFlag2, CPAP_BrokenSummary, CPAP_BrokenWaveform;
extern ChannelID RMS9_E01, RMS9_E02, RMS9_EPR, RMS9_EPRSet, RMS9_SetPressure;
extern ChannelID INTP_SmartFlex;
extern ChannelID PRS1_00, PRS1_01, PRS1_08, PRS1_0A, PRS1_0B, PRS1_0C, PRS1_0E, PRS1_0F, PRS1_10, PRS1_12,
PRS1_FlexMode, PRS1_FlexSet, PRS1_HumidStatus, PRS1_HumidSetting, PRS1_SysLock, PRS1_SysOneResistStat,
PRS1_SysOneResistSet, PRS1_HoseDiam, PRS1_AutoOn, PRS1_AutoOff, PRS1_MaskAlert, PRS1_ShowAHI;
extern ChannelID OXI_Pulse, OXI_SPO2, OXI_PulseChange, OXI_SPO2Drop, OXI_Plethy;
extern ChannelID Journal_Notes, Journal_Weight, Journal_BMI, Journal_ZombieMeter, Bookmark_Start, Bookmark_End, Bookmark_Notes;
const ChannelID CPAP_AHI="AHI";
const ChannelID Journal_Notes="Journal";
const ChannelID Journal_Weight="Weight";
const ChannelID Journal_BMI="BMI";
const ChannelID Journal_ZombieMeter="ZombieMeter";
const ChannelID Bookmark_Start="BookmarkStart";
const ChannelID Bookmark_End="BookmarkEnd";
const ChannelID Bookmark_Notes="BookmarkNotes";
#endif // MACHINE_COMMON_H

2
SleepLib/profiles.cpp
View File

@ -469,7 +469,7 @@ Profile *Create(QString name)
prof->user->setUserName(name);
//prof->Set("Realname",realname);
//if (!password.isEmpty()) prof.user->setPassword(password);
prof->Set(STR_GEN_DataFolder,"{home}/Profiles/{Username}");
prof->Set(STR_GEN_DataFolder,QString("{home}/Profiles/{")+QString(UI_STR_UserName)+QString("}"));
Machine *m=new Machine(prof,0);
m->SetClass("Journal");

80
SleepLib/profiles.h
View File

@ -276,14 +276,14 @@ public:
//! \brief Create OxiSettings object given Profile *p, and initialize the defaults
OxiSettings(Profile *p) :m_profile(p)
{
if (m_profile->contains(OS_STR_EnableOximetry)) (*m_profile)[OS_STR_EnableOximetry]=false;
if (m_profile->contains(OS_STR_SyncOximetry)) (*m_profile)[OS_STR_SyncOximetry]=true;
if (m_profile->contains(OS_STR_OximeterType)) (*m_profile)[OS_STR_OximeterType]="CMS50";
if (m_profile->contains(OS_STR_OxiDiscardThreshold)) (*m_profile)[OS_STR_OxiDiscardThreshold]=0.0;
if (m_profile->contains(OS_STR_SPO2DropDuration)) (*m_profile)[OS_STR_SPO2DropDuration]=8.0;
if (m_profile->contains(OS_STR_SPO2DropPercentage)) (*m_profile)[OS_STR_SPO2DropPercentage]=3.0;
if (m_profile->contains(OS_STR_PulseChangeDuration)) (*m_profile)[OS_STR_PulseChangeDuration]=8.0;
if (m_profile->contains(OS_STR_PulseChangeBPM)) (*m_profile)[OS_STR_PulseChangeBPM]=5.0;
if (!m_profile->contains(OS_STR_EnableOximetry)) (*m_profile)[OS_STR_EnableOximetry]=false;
if (!m_profile->contains(OS_STR_SyncOximetry)) (*m_profile)[OS_STR_SyncOximetry]=true;
if (!m_profile->contains(OS_STR_OximeterType)) (*m_profile)[OS_STR_OximeterType]="CMS50";
if (!m_profile->contains(OS_STR_OxiDiscardThreshold)) (*m_profile)[OS_STR_OxiDiscardThreshold]=0.0;
if (!m_profile->contains(OS_STR_SPO2DropDuration)) (*m_profile)[OS_STR_SPO2DropDuration]=8.0;
if (!m_profile->contains(OS_STR_SPO2DropPercentage)) (*m_profile)[OS_STR_SPO2DropPercentage]=3.0;
if (!m_profile->contains(OS_STR_PulseChangeDuration)) (*m_profile)[OS_STR_PulseChangeDuration]=8.0;
if (!m_profile->contains(OS_STR_PulseChangeBPM)) (*m_profile)[OS_STR_PulseChangeBPM]=5.0;
}
~OxiSettings() {}
@ -332,19 +332,19 @@ public:
//! \brief Create CPAPSettings object given Profile *p, and initialize the defaults
CPAPSettings(Profile *p) :m_profile(p)
{
if (m_profile->contains(CS_STR_ComplianceHours)) (*m_profile)[CS_STR_ComplianceHours]=4;
if (m_profile->contains(CS_STR_ShowCompliance)) (*m_profile)[CS_STR_ShowCompliance]=true;
if (m_profile->contains(CS_STR_ShowLeaksMode)) (*m_profile)[CS_STR_ShowLeaksMode]=0;
if (!m_profile->contains(CS_STR_ComplianceHours)) (*m_profile)[CS_STR_ComplianceHours]=4;
if (!m_profile->contains(CS_STR_ShowCompliance)) (*m_profile)[CS_STR_ShowCompliance]=true;
if (!m_profile->contains(CS_STR_ShowLeaksMode)) (*m_profile)[CS_STR_ShowLeaksMode]=0;
// TODO: Check if this date is initiliazed yet
if (m_profile->contains(CS_STR_MaskStartDate)) (*m_profile)[CS_STR_MaskStartDate]=m_profile->FirstDay();
if (m_profile->contains(CS_STR_MaskDescription)) (*m_profile)[CS_STR_MaskDescription]=QString();
if (m_profile->contains(CS_STR_MaskType)) (*m_profile)[CS_STR_MaskType]=Mask_Unknown;
if (m_profile->contains(CS_STR_PrescribedMode)) (*m_profile)[CS_STR_PrescribedMode]=MODE_UNKNOWN;
if (m_profile->contains(CS_STR_PrescribedMinPressure)) (*m_profile)[CS_STR_PrescribedMinPressure]=0.0;
if (m_profile->contains(CS_STR_PrescribedMaxPressure)) (*m_profile)[CS_STR_PrescribedMaxPressure]=0.0;
if (m_profile->contains(CS_STR_UntreatedAHI)) (*m_profile)[CS_STR_UntreatedAHI]=0.0;
if (m_profile->contains(CS_STR_Notes)) (*m_profile)[CS_STR_Notes]=QString();
if (m_profile->contains(CS_STR_DateDiagnosed)) (*m_profile)[CS_STR_DateDiagnosed]=PROFILE.FirstDay();
if (!m_profile->contains(CS_STR_MaskStartDate)) (*m_profile)[CS_STR_MaskStartDate]=QDate();
if (!m_profile->contains(CS_STR_MaskDescription)) (*m_profile)[CS_STR_MaskDescription]=QString();
if (!m_profile->contains(CS_STR_MaskType)) (*m_profile)[CS_STR_MaskType]=Mask_Unknown;
if (!m_profile->contains(CS_STR_PrescribedMode)) (*m_profile)[CS_STR_PrescribedMode]=MODE_UNKNOWN;
if (!m_profile->contains(CS_STR_PrescribedMinPressure)) (*m_profile)[CS_STR_PrescribedMinPressure]=0.0;
if (!m_profile->contains(CS_STR_PrescribedMaxPressure)) (*m_profile)[CS_STR_PrescribedMaxPressure]=0.0;
if (!m_profile->contains(CS_STR_UntreatedAHI)) (*m_profile)[CS_STR_UntreatedAHI]=0.0;
if (!m_profile->contains(CS_STR_Notes)) (*m_profile)[CS_STR_Notes]=QString();
if (!m_profile->contains(CS_STR_DateDiagnosed)) (*m_profile)[CS_STR_DateDiagnosed]=QDate();
}
~CPAPSettings() {}
@ -397,13 +397,13 @@ public:
//! \brief Create ImportSettings object given Profile *p, and initialize the defaults
SessionSettings(Profile *p) :m_profile(p)
{
if (m_profile->contains(IS_STR_DaySplitTime)) (*m_profile)[IS_STR_DaySplitTime]=QTime(12,0,0);
if (m_profile->contains(IS_STR_CacheSessions)) (*m_profile)[IS_STR_CacheSessions]=false;
if (m_profile->contains(IS_STR_CombineCloseSessions)) (*m_profile)[IS_STR_CombineCloseSessions]=240;
if (m_profile->contains(IS_STR_IgnoreShorterSessions)) (*m_profile)[IS_STR_IgnoreShorterSessions]=5;
if (m_profile->contains(IS_STR_Multithreading)) (*m_profile)[IS_STR_Multithreading]=QThread::idealThreadCount() > 1;
if (m_profile->contains(IS_STR_TrashDayCache)) (*m_profile)[IS_STR_TrashDayCache]=false; // can't remember..
if (m_profile->contains(IS_STR_ShowSerialNumbers)) (*m_profile)[IS_STR_ShowSerialNumbers]=false;
if (!m_profile->contains(IS_STR_DaySplitTime)) (*m_profile)[IS_STR_DaySplitTime]=QTime(12,0,0);
if (!m_profile->contains(IS_STR_CacheSessions)) (*m_profile)[IS_STR_CacheSessions]=false;
if (!m_profile->contains(IS_STR_CombineCloseSessions)) (*m_profile)[IS_STR_CombineCloseSessions]=240;
if (!m_profile->contains(IS_STR_IgnoreShorterSessions)) (*m_profile)[IS_STR_IgnoreShorterSessions]=5;
if (!m_profile->contains(IS_STR_Multithreading)) (*m_profile)[IS_STR_Multithreading]=QThread::idealThreadCount() > 1;
if (!m_profile->contains(IS_STR_TrashDayCache)) (*m_profile)[IS_STR_TrashDayCache]=false; // can't remember..
if (!m_profile->contains(IS_STR_ShowSerialNumbers)) (*m_profile)[IS_STR_ShowSerialNumbers]=false;
}
~SessionSettings() {}
@ -445,13 +445,13 @@ public:
//! \brief Create AppearanceSettings object given Profile *p, and initialize the defaults
AppearanceSettings(Profile *p) :m_profile(p)
{
if (m_profile->contains(AS_STR_GraphHeight)) (*m_profile)[AS_STR_GraphHeight]=180.0;
if (m_profile->contains(AS_STR_AntiAliasing)) (*m_profile)[AS_STR_AntiAliasing]=false; // i think it's ugly
if (m_profile->contains(AS_STR_HighResPrinting)) (*m_profile)[AS_STR_HighResPrinting]=true;
if (m_profile->contains(AS_STR_GraphSnapshots)) (*m_profile)[AS_STR_GraphSnapshots]=true;
if (m_profile->contains(AS_STR_Animations)) (*m_profile)[AS_STR_Animations]=true;
if (m_profile->contains(AS_STR_SquareWave)) (*m_profile)[AS_STR_SquareWave]=false;
if (m_profile->contains(AS_STR_OverlayType)) (*m_profile)[AS_STR_OverlayType]=ODT_Bars;
if (!m_profile->contains(AS_STR_GraphHeight)) (*m_profile)[AS_STR_GraphHeight]=180.0;
if (!m_profile->contains(AS_STR_AntiAliasing)) (*m_profile)[AS_STR_AntiAliasing]=false; // i think it's ugly
if (!m_profile->contains(AS_STR_HighResPrinting)) (*m_profile)[AS_STR_HighResPrinting]=true;
if (!m_profile->contains(AS_STR_GraphSnapshots)) (*m_profile)[AS_STR_GraphSnapshots]=true;
if (!m_profile->contains(AS_STR_Animations)) (*m_profile)[AS_STR_Animations]=true;
if (!m_profile->contains(AS_STR_SquareWave)) (*m_profile)[AS_STR_SquareWave]=false;
if (!m_profile->contains(AS_STR_OverlayType)) (*m_profile)[AS_STR_OverlayType]=ODT_Bars;
}
~AppearanceSettings() {}
@ -507,12 +507,12 @@ public:
//! \brief Create UserSettings object given Profile *p, and initialize the defaults
UserSettings(Profile *p) :m_profile(p)
{
if (m_profile->contains(US_STR_UnitSystem)) (*m_profile)[US_STR_UnitSystem]=US_Metric;
if (m_profile->contains(US_STR_EventWindowSize)) (*m_profile)[US_STR_EventWindowSize]=4.0;
if (m_profile->contains(US_STR_SkipEmptyDays)) (*m_profile)[US_STR_SkipEmptyDays]=true;
if (m_profile->contains(US_STR_RebuildCache)) (*m_profile)[US_STR_RebuildCache]=false; // can't remember..
if (m_profile->contains(US_STR_ShowDebug)) (*m_profile)[US_STR_ShowDebug]=false;
if (m_profile->contains(US_STR_LinkGroups)) (*m_profile)[US_STR_LinkGroups]=true; // can't remember..
if (!m_profile->contains(US_STR_UnitSystem)) (*m_profile)[US_STR_UnitSystem]=US_Metric;
if (!m_profile->contains(US_STR_EventWindowSize)) (*m_profile)[US_STR_EventWindowSize]=4.0;
if (!m_profile->contains(US_STR_SkipEmptyDays)) (*m_profile)[US_STR_SkipEmptyDays]=true;
if (!m_profile->contains(US_STR_RebuildCache)) (*m_profile)[US_STR_RebuildCache]=false; // can't remember..
if (!m_profile->contains(US_STR_ShowDebug)) (*m_profile)[US_STR_ShowDebug]=false;
if (!m_profile->contains(US_STR_LinkGroups)) (*m_profile)[US_STR_LinkGroups]=true; // can't remember..
}
~UserSettings() {}

96
SleepLib/schema.cpp
View File

@ -9,6 +9,8 @@
#include <QDomDocument>
#include <QDomElement>
#include <QDomNode>
#include <QMessageBox>
#include <QApplication>
#include "schema.h"
@ -50,7 +52,97 @@ void init()
DataTypes["datetime"]=DATETIME;
DataTypes["time"]=TIME;
schema::channel.Load(":/docs/channels.xml");
if (!schema::channel.Load(":/docs/channels.xml")) {
QMessageBox::critical(0,"Ugh!","Couldn't parse Channels.xml, this build is seriously borked, no choice but to abort!!",QMessageBox::Ok);
QApplication::exit(-1);
}
NoChannel=0;
CPAP_IPAP=schema::channel["IPAP"].id();
CPAP_IPAPLo=schema::channel["IPAPLo"].id();
CPAP_IPAPHi=schema::channel["IPAPHi"].id();
CPAP_EPAP=schema::channel["EPAP"].id();
CPAP_Pressure=schema::channel["Pressure"].id();
CPAP_PS=schema::channel["PS"].id();
CPAP_Mode=schema::channel["PAPMode"].id();
CPAP_BrokenSummary=schema::channel["BrokenSummary"].id();
CPAP_PressureMin=schema::channel["PressureMin"].id();
CPAP_PressureMax=schema::channel["PressureMax"].id();
CPAP_RampTime=schema::channel["RampTime"].id();
CPAP_RampPressure=schema::channel["RampPressure"].id();
CPAP_Obstructive=schema::channel["Obstructive"].id();
CPAP_Hypopnea=schema::channel["Hypopnea"].id();
CPAP_ClearAirway=schema::channel["ClearAirway"].id();
CPAP_Apnea=schema::channel["Apnea"].id();
CPAP_CSR=schema::channel["CSR"].id();
CPAP_LeakFlag=schema::channel["LeakFlag"].id();
CPAP_ExP=schema::channel["ExP"].id();
CPAP_NRI=schema::channel["NRI"].id();
CPAP_VSnore=schema::channel["VSnore"].id();
CPAP_VSnore2=schema::channel["VSnore2"].id();
CPAP_RERA=schema::channel["RERA"].id();
CPAP_PressurePulse=schema::channel["PressurePulse"].id();
CPAP_FlowLimit=schema::channel["FlowLimit"].id();
CPAP_FlowRate=schema::channel["FlowRate"].id();
CPAP_MaskPressure=schema::channel["MaskPressure"].id();
CPAP_MaskPressureHi=schema::channel["MaskPressureHi"].id();
CPAP_RespEvent=schema::channel["RespEvent"].id();
CPAP_Snore=schema::channel["Snore"].id();
CPAP_MinuteVent=schema::channel["MinuteVent"].id();
CPAP_RespRate=schema::channel["RespRate"].id();
CPAP_TidalVolume=schema::channel["TidalVolume"].id();
CPAP_PTB=schema::channel["PTB"].id();
CPAP_Leak=schema::channel["Leak"].id();
CPAP_LeakMedian=schema::channel["LeakMedian"].id();
CPAP_LeakTotal=schema::channel["LeakTotal"].id();
CPAP_MaxLeak=schema::channel["MaxLeak"].id();
CPAP_FLG=schema::channel["FLG"].id();
CPAP_IE=schema::channel["IE"].id();
CPAP_Te=schema::channel["Te"].id();
CPAP_Ti=schema::channel["Ti"].id();
CPAP_TgMV=schema::channel["TgMV"].id();
CPAP_UserFlag1=schema::channel["UserFlag1"].id();
CPAP_UserFlag2=schema::channel["UserFlag2"].id();
RMS9_E01=schema::channel["RMS9_E01"].id();
RMS9_E02=schema::channel["RMS9_E02"].id();
RMS9_EPR=schema::channel["EPR"].id();
RMS9_EPRSet=schema::channel["EPRSet"].id();
RMS9_SetPressure=schema::channel["SetPressure"].id();
PRS1_00=schema::channel["PRS1_00"].id();
PRS1_01=schema::channel["PRS1_01"].id();
PRS1_08=schema::channel["PRS1_08"].id();
PRS1_0A=schema::channel["PRS1_0A"].id();
PRS1_0B=schema::channel["PRS1_0B"].id();
PRS1_0C=schema::channel["PRS1_0C"].id();
PRS1_0E=schema::channel["PRS1_0E"].id();
PRS1_0F=schema::channel["PRS1_0F"].id();
PRS1_10=schema::channel["PRS1_10"].id();
PRS1_12=schema::channel["PRS1_12"].id();
PRS1_FlexMode=schema::channel["FlexMode"].id();
PRS1_FlexSet=schema::channel["FlexSet"].id();
PRS1_HumidStatus=schema::channel["HumidStat"].id();
PRS1_HumidSetting=schema::channel["HumidSet"].id();
PRS1_SysLock=schema::channel["SysLock"].id();
PRS1_SysOneResistStat=schema::channel["SysOneResistStat"].id();
PRS1_SysOneResistSet=schema::channel["SysOneResistSet"].id();
PRS1_HoseDiam=schema::channel["HoseDiam"].id();
PRS1_AutoOn=schema::channel["AutoOn"].id();
PRS1_AutoOff=schema::channel["AutoOff"].id();
PRS1_MaskAlert=schema::channel["MaskAlert"].id();
PRS1_ShowAHI=schema::channel["ShowAHI"].id();
OXI_Pulse=schema::channel["Pulse"].id();
OXI_SPO2=schema::channel["SPO2"].id();
OXI_PulseChange=schema::channel["PulseChange"].id();
OXI_SPO2Drop=schema::channel["SPO2Drop"].id();
OXI_Plethy=schema::channel["Plethy"].id();
CPAP_AHI=schema::channel["AHI"].id();
Journal_Notes=schema::channel["Journal"].id();
Journal_Weight=schema::channel["Weight"].id();
Journal_BMI=schema::channel["BMI"].id();
Journal_ZombieMeter=schema::channel["ZombieMeter"].id();
Bookmark_Start=schema::channel["BookmarkStart"].id();
Bookmark_End=schema::channel["BookmarkEnd"].id();
Bookmark_Notes=schema::channel["BookmarkNotes"].id();
}
@ -78,7 +170,7 @@ ChannelList::ChannelList()
}
ChannelList::~ChannelList()
{
for (QHash<int,Channel *>::iterator i=channels.begin();i!=channels.end();i++) {
for (QHash<ChannelID,Channel *>::iterator i=channels.begin();i!=channels.end();i++) {
delete i.value();
}
}

4
SleepLib/schema.h
View File

@ -99,7 +99,7 @@ public:
bool Save(QString filename);
//! \brief Looks up Channel in this List with the index idx, returns EmptyChannel if not found
Channel & operator[](int idx) {
Channel & operator[](ChannelID idx) {
if (channels.contains(idx))
return *channels[idx];
else
@ -114,7 +114,7 @@ public:
}
//! \brief Channel List indexed by integer ID
QHash<int,Channel *> channels;
QHash<ChannelID,Channel *> channels;
//! \brief Channel List index by name
QHash<QString,Channel *> names;

144
SleepLib/session.cpp
View File

@ -22,8 +22,8 @@ const quint16 filetype_data=1;
// This is the uber important database version for SleepyHeads internal storage
// Increment this after stuffing with Session's save & load code.
const quint16 summary_version=6;
const quint16 events_version=7;
const quint16 summary_version=7;
const quint16 events_version=8;
Session::Session(Machine * m,SessionID session)
{
@ -177,18 +177,19 @@ bool Session::LoadSummary(QString filename)
quint32 t32;
quint16 t16;
QHash<ChannelID,MCDataType> mctype;
QVector<ChannelID> mcorder;
//QHash<ChannelID,MCDataType> mctype;
//QVector<ChannelID> mcorder;
in >> t32;
if (t32!=magic) {
qDebug() << "Wrong magic number in " << filename;
return false;
}
in >> t16; // DB Version
if (t16!=summary_version) {
throw OldDBVersion();
//qWarning() << "Old dbversion "<< t16 << "summary file.. Sorry, you need to purge and reimport";
quint16 version;
in >> version; // DB Version
if (version<6) {
//throw OldDBVersion();
qWarning() << "Old dbversion "<< version << "summary file.. Sorry, you need to purge and reimport";
return false;
}
@ -212,28 +213,102 @@ bool Session::LoadSummary(QString filename)
in >> s_last; // Duration // (16bit==Limited to 18 hours)
in >> settings;
in >> m_cnt;
in >> m_sum;
in >> m_avg;
in >> m_wavg;
in >> m_90p;
in >> m_min;
in >> m_max;
in >> m_cph;
in >> m_sph;
in >> m_firstchan;
in >> m_lastchan;
/*qint16 sumsize;
in >> sumsize; // Summary size (number of Machine Code lists)
for (int i=0; i<sumsize; i++) {
in >> t16; // Machine Code
ChannelID mc=(ChannelID)t16;
in >> settings[mc];
} */
if (version<7) {
QHash<QString,QVariant> v1;
in >> v1;
settings.clear();
ChannelID code;
for (QHash<QString,QVariant>::iterator i=v1.begin();i!=v1.end();i++) {
code=schema::channel[i.key()].id();
settings[code]=i.value();
}
QHash<QString,int> zcnt;
in >> zcnt;
for (QHash<QString,int>::iterator i=zcnt.begin();i!=zcnt.end();i++) {
code=schema::channel[i.key()].id();
m_cnt[code]=i.value();
}
QHash<QString,double> zsum;
in >> zsum;
for (QHash<QString,double>::iterator i=zsum.begin();i!=zsum.end();i++) {
code=schema::channel[i.key()].id();
m_cnt[code]=i.value();
}
QHash<QString,EventDataType> ztmp;
in >> ztmp; // avg
for (QHash<QString,EventDataType>::iterator i=ztmp.begin();i!=ztmp.end();i++) {
code=schema::channel[i.key()].id();
m_avg[code]=i.value();
}
ztmp.clear();
in >> ztmp; // wavg
for (QHash<QString,EventDataType>::iterator i=ztmp.begin();i!=ztmp.end();i++) {
code=schema::channel[i.key()].id();
m_wavg[code]=i.value();
}
ztmp.clear();
in >> ztmp; // 90p
for (QHash<QString,EventDataType>::iterator i=ztmp.begin();i!=ztmp.end();i++) {
code=schema::channel[i.key()].id();
m_90p[code]=i.value();
}
ztmp.clear();
in >> ztmp; // min
for (QHash<QString,EventDataType>::iterator i=ztmp.begin();i!=ztmp.end();i++) {
code=schema::channel[i.key()].id();
m_min[code]=i.value();
}
ztmp.clear();
in >> ztmp; // max
for (QHash<QString,EventDataType>::iterator i=ztmp.begin();i!=ztmp.end();i++) {
code=schema::channel[i.key()].id();
m_max[code]=i.value();
}
ztmp.clear();
in >> ztmp; // cph
for (QHash<QString,EventDataType>::iterator i=ztmp.begin();i!=ztmp.end();i++) {
code=schema::channel[i.key()].id();
m_cph[code]=i.value();
}
ztmp.clear();
in >> ztmp; // sph
for (QHash<QString,EventDataType>::iterator i=ztmp.begin();i!=ztmp.end();i++) {
code=schema::channel[i.key()].id();
m_sph[code]=i.value();
}
QHash<QString,quint64> ztim;
in >> ztim; //firstchan
for (QHash<QString,quint64>::iterator i=ztim.begin();i!=ztim.end();i++) {
code=schema::channel[i.key()].id();
m_firstchan[code]=i.value();
}
ztim.clear();
in >> ztim; // lastchan
for (QHash<QString,quint64>::iterator i=ztim.begin();i!=ztim.end();i++) {
code=schema::channel[i.key()].id();
m_lastchan[code]=i.value();
}
//SetChanged(true);
} else {
in >> settings;
in >> m_cnt;
in >> m_sum;
in >> m_avg;
in >> m_wavg;
in >> m_90p;
in >> m_min;
in >> m_max;
in >> m_cph;
in >> m_sph;
in >> m_firstchan;
in >> m_lastchan;
}
if (version<summary_version) {
qDebug() << "Upgrading Summary file to version" << summary_version;
UpdateSummaries();
StoreSummary(filename);
}
return true;
}
@ -335,7 +410,8 @@ bool Session::LoadEvents(QString filename)
in >> version; // File Version
if (version<6) { // prior to version 6 is too old to deal with
throw OldDBVersion();
qDebug() << "Old File Version";
//throw OldDBVersion();
//qWarning() << "Old dbversion "<< t16 << "summary file.. Sorry, you need to purge and reimport";
return false;
}
@ -370,7 +446,13 @@ bool Session::LoadEvents(QString filename)
QVector<qint16> sizevec;
QString dim;
for (int i=0;i<mcsize;i++) {
in >> code;
if (version<8) {
QString txt;
in >> txt;
code=schema::channel[txt].id();
} else {
in >> code;
}
mcorder.push_back(code);
in >> size2;
sizevec.push_back(size2);

2
SleepLib/session.h
View File

@ -199,7 +199,7 @@ public:
EventDataType percentile(ChannelID id,EventDataType percentile);
//! \brief Returns true if the channel has events loaded, or a record of a count for when they are not
bool channelExists(QString name);// { return (schema::channel.names.contains(name));}
bool channelExists(ChannelID name);
bool IsLoneSession() { return s_lonesession; }
void SetLoneSession(bool b) { s_lonesession=b; }

34
daily.cpp
View File

@ -381,7 +381,7 @@ void Daily::ReloadGraphs()
}
on_calendar_currentPageChanged(d.year(),d.month());
ui->calendar->setSelectedDate(d);
Load(d);
//Load(d);
}
void Daily::on_calendar_currentPageChanged(int year, int month)
{
@ -720,27 +720,27 @@ void Daily::Load(QDate date)
} else cs="2 width='50%'>";
html+="<tr><td colspan="+cs+"<table cellspacing=0 cellpadding=1 border=0 width='100%'>"
"<tr><td align='right' bgcolor='#F88017'><b><font color='black'><a href='nothing' title='"+schema::channel[CPAP_AHI].description()+"'>"+tr("AHI")+"</a></font></b></td><td width=20% bgcolor='#F88017'><b><font color='black'>"+QString().sprintf("%.2f",ahi)+"</font></b></td></tr>\n"
"<tr><td align='right' bgcolor='#4040ff'><b><font color='white'>&nbsp;<a href='event="+CPAP_Hypopnea+"' title='"+schema::channel[CPAP_Hypopnea].description()+"'>"+tr("Hypopnea")+"</a></font></b></td><td bgcolor='#4040ff'><font color='white'>"+QString().sprintf("%.2f",hi)+"</font></td></tr>\n";
"<tr><td align='right' bgcolor='#4040ff'><b><font color='white'>&nbsp;<a href='event="+QString::number(CPAP_Hypopnea)+"' title='"+schema::channel[CPAP_Hypopnea].description()+"'>"+tr("Hypopnea")+"</a></font></b></td><td bgcolor='#4040ff'><font color='white'>"+QString().sprintf("%.2f",hi)+"</font></td></tr>\n";
if (cpap->machine->GetClass()==STR_MACH_ResMed) {
html+="<tr><td align='right' bgcolor='#208020'><b>&nbsp;<a href='event="+CPAP_Apnea+"' title='"+schema::channel[CPAP_Apnea].description()+"'>"+tr("Unspecified Apnea")+"</a></b></td><td bgcolor='#208020'>"+QString().sprintf("%.2f",uai)+"</td></tr>\n";
html+="<tr><td align='right' bgcolor='#208020'><b>&nbsp;<a href='event="+QString::number(CPAP_Apnea)+"' title='"+schema::channel[CPAP_Apnea].description()+"'>"+tr("Unspecified Apnea")+"</a></b></td><td bgcolor='#208020'>"+QString().sprintf("%.2f",uai)+"</td></tr>\n";
}
html+="<tr><td align='right' bgcolor='#40afbf'><b>&nbsp;<a href='event="+CPAP_Obstructive+"' title='"+schema::channel[CPAP_Obstructive].description()+"'>"+tr("Obstructive")+"</a></b></td><td bgcolor='#40afbf'>"+QString().sprintf("%.2f",oai)+"</td></tr>\n"
"<tr><td align='right' bgcolor='#b254cd'><b>&nbsp;<a href='event="+CPAP_ClearAirway+"' title='"+schema::channel[CPAP_ClearAirway].description()+"'>"+tr("Clear Airway")+"</a></b></td><td bgcolor='#b254cd'>"+QString().sprintf("%.2f",cai)+"</td></tr>\n"
html+="<tr><td align='right' bgcolor='#40afbf'><b>&nbsp;<a href='event="+QString::number(CPAP_Obstructive)+"' title='"+schema::channel[CPAP_Obstructive].description()+"'>"+tr("Obstructive")+"</a></b></td><td bgcolor='#40afbf'>"+QString().sprintf("%.2f",oai)+"</td></tr>\n"
"<tr><td align='right' bgcolor='#b254cd'><b>&nbsp;<a href='event="+QString::number(CPAP_ClearAirway)+"' title='"+schema::channel[CPAP_ClearAirway].description()+"'>"+tr("Clear Airway")+"</a></b></td><td bgcolor='#b254cd'>"+QString().sprintf("%.2f",cai)+"</td></tr>\n"
"</table></td>";
if (cpap->machine->GetClass()==STR_MACH_PRS1) {
html+="<td colspan=2><table cellspacing=0 cellpadding=1 border=0 width='100%'>"
"<tr><td align='right' bgcolor='#ffff80'><b>&nbsp;<a href='event="+CPAP_RERA+"' title='"+schema::channel[CPAP_RERA].description()+"'>"+tr("RERA")+"</a></b></td><td width=20% bgcolor='#ffff80'>"+QString().sprintf("%.2f",rei)+"</td></tr>\n"
"<tr><td align='right' bgcolor='#404040'><b>&nbsp;<font color='white'><a href='event="+CPAP_FlowLimit+"' title='"+schema::channel[CPAP_FlowLimit].description()+"'>"+tr("Flow Limit")+"</a></font></b></td><td bgcolor='#404040'><font color='white'>"+a.sprintf("%.2f",fli)+"</font></td></tr>\n"
"<tr><td align='right' bgcolor='#ff4040'><b>&nbsp;<a href='event="+CPAP_VSnore+"'title=' "+schema::channel[CPAP_VSnore].description()+"'>"+tr("Vsnore")+"</a></b></td><td bgcolor='#ff4040'>"+QString().sprintf("%.2f",vsi)+"</td></tr>\n"
"<tr><td align='right' bgcolor='#80ff80'><b>&nbsp;<a href='event="+CPAP_CSR+"' title='"+schema::channel[CPAP_CSR].description()+"'>"+tr("PB/CSR")+"</a></b></td><td bgcolor='#80ff80'>"+QString().sprintf("%.2f",csr)+"%</td></tr>\n"
"<tr><td align='right' bgcolor='#ffff80'><b>&nbsp;<a href='event="+QString::number(CPAP_RERA)+"' title='"+schema::channel[CPAP_RERA].description()+"'>"+tr("RERA")+"</a></b></td><td width=20% bgcolor='#ffff80'>"+QString().sprintf("%.2f",rei)+"</td></tr>\n"
"<tr><td align='right' bgcolor='#404040'><b>&nbsp;<font color='white'><a href='event="+QString::number(CPAP_FlowLimit)+"' title='"+schema::channel[CPAP_FlowLimit].description()+"'>"+tr("Flow Limit")+"</a></font></b></td><td bgcolor='#404040'><font color='white'>"+a.sprintf("%.2f",fli)+"</font></td></tr>\n"
"<tr><td align='right' bgcolor='#ff4040'><b>&nbsp;<a href='event="+QString::number(CPAP_VSnore)+"'title=' "+schema::channel[CPAP_VSnore].description()+"'>"+tr("Vsnore")+"</a></b></td><td bgcolor='#ff4040'>"+QString().sprintf("%.2f",vsi)+"</td></tr>\n"
"<tr><td align='right' bgcolor='#80ff80'><b>&nbsp;<a href='event="+QString::number(CPAP_CSR)+"' title='"+schema::channel[CPAP_CSR].description()+"'>"+tr("PB/CSR")+"</a></b></td><td bgcolor='#80ff80'>"+QString().sprintf("%.2f",csr)+"%</td></tr>\n"
"</table></td>";
} else if (cpap->machine->GetClass()==STR_MACH_Intellipap) {
html+="<td colspan=2><table cellspacing=0 cellpadding=2 border=0 width='100%'>"
"<tr><td align='right' bgcolor='#ffff80'><b>&nbsp;<a href='event="+CPAP_NRI+"'>"+tr("NRI")+"</a></b></td><td width=20% bgcolor='#ffff80'>"+QString().sprintf("%.2f",nri)+"</td></tr>\n"
"<tr><td align='right' bgcolor='#404040'><b>&nbsp;<font color='white'><a href='event="+CPAP_Leak+"'>"+tr("Leak Idx")+"</a></font></b></td><td bgcolor='#404040'><font color='white'>"+a.sprintf("%.2f",lki)+"</font></td></tr>\n"
"<tr><td align='right' bgcolor='#ff4040'><b>&nbsp;<a href='event="+CPAP_VSnore+"'>"+tr("V.Snore")+"</a></b></td><td bgcolor='#ff4040'>"+QString().sprintf("%.2f",vsi)+"</td></tr>\n"
"<tr><td align='right' bgcolor='#80ff80'><b>&nbsp;<a href='event="+CPAP_ExP+"'>"+tr("Exh.&nbsp;Puff")+"</a></b></td><td bgcolor='#80ff80'>"+QString().sprintf("%.2f",exp)+"</td></tr>\n"
"<tr><td align='right' bgcolor='#ffff80'><b>&nbsp;<a href='event="+QString::number(CPAP_NRI)+"'>"+tr("NRI")+"</a></b></td><td width=20% bgcolor='#ffff80'>"+QString().sprintf("%.2f",nri)+"</td></tr>\n"
"<tr><td align='right' bgcolor='#404040'><b>&nbsp;<font color='white'><a href='event="+QString::number(CPAP_Leak)+"'>"+tr("Leak Idx")+"</a></font></b></td><td bgcolor='#404040'><font color='white'>"+a.sprintf("%.2f",lki)+"</font></td></tr>\n"
"<tr><td align='right' bgcolor='#ff4040'><b>&nbsp;<a href='event="+QString::number(CPAP_VSnore)+"'>"+tr("V.Snore")+"</a></b></td><td bgcolor='#ff4040'>"+QString().sprintf("%.2f",vsi)+"</td></tr>\n"
"<tr><td align='right' bgcolor='#80ff80'><b>&nbsp;<a href='event="+QString::number(CPAP_ExP)+"'>"+tr("Exh.&nbsp;Puff")+"</a></b></td><td bgcolor='#80ff80'>"+QString().sprintf("%.2f",exp)+"</td></tr>\n"
"</table></td>";
}
@ -790,7 +790,7 @@ void Daily::Load(QDate date)
//if (code==CPAP_LeakTotal) suboffset=PROFILEIntentionalLeak"].toDouble(); else suboffset=0;
QString tooltip=schema::channel[code].description();
if (!schema::channel[code].units().isEmpty()) tooltip+=" ("+schema::channel[code].units()+")";
html+="<tr><td align=left><a href='graph="+code+"' title='"+tooltip+"'>"+schema::channel[code].label()+"</a>";
html+="<tr><td align=left><a href='graph="+QString::number(code)+"' title='"+tooltip+"'>"+schema::channel[code].label()+"</a>";
html+="</td><td>"+a.sprintf("%.2f",cpap->Min(code)-suboffset);
html+="</td><td>"+a.sprintf("%.2f",cpap->wavg(code)-suboffset);
html+="</td><td>"+a.sprintf("%.2f",cpap->p90(code)-suboffset);
@ -800,7 +800,7 @@ void Daily::Load(QDate date)
if (oxi && oxi->channelHasData(code)) {
QString tooltip=schema::channel[code].description();
if (!schema::channel[code].units().isEmpty()) tooltip+=" ("+schema::channel[code].units()+")";
html+="<tr><td align=left><a href='graph="+code+"' title='"+tooltip+"'>"+schema::channel[code].label()+"</a>";
html+="<tr><td align=left><a href='graph="+QString::number(code)+"' title='"+tooltip+"'>"+schema::channel[code].label()+"</a>";
html+="</td><td>"+a.sprintf("%.2f",oxi->Min(code));
html+="</td><td>"+a.sprintf("%.2f",oxi->wavg(code));
html+="</td><td>"+a.sprintf("%.2f",oxi->p90(code));
@ -892,7 +892,7 @@ void Daily::Load(QDate date)
int h=len/3600;
int m=(len/60) % 60;
int s1=len % 60;
QHash<ChannelID,QVariant>::iterator i=(*s)->settings.find("BrokenWaveform");
QHash<ChannelID,QVariant>::iterator i=(*s)->settings.find(CPAP_BrokenWaveform);
tooltip=cpap->machine->GetClass()+" "+tr("CPAP")+" "+QString().sprintf("%2ih&nbsp;%2im&nbsp;%2is",h,m,s1);
// tooltip needs to lookup language.. :-/
@ -911,7 +911,7 @@ void Daily::Load(QDate date)
int h=len/3600;
int m=(len/60) % 60;
int s1=len % 60;
QHash<ChannelID,QVariant>::iterator i=(*s)->settings.find("BrokenWaveform");
QHash<ChannelID,QVariant>::iterator i=(*s)->settings.find(CPAP_BrokenWaveform);
tooltip=oxi->machine->GetClass()+" "+tr("Oximeter")+" "+QString().sprintf("%2ih,&nbsp;%2im,&nbsp;%2is",h,m,s1);

9
docs/channels.xml
View File

@ -20,7 +20,7 @@ One id code per item
<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" 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="0x100c" class="data" name="ExP" details="Exhale Puff" label="EP" unit="events/hour" color="dark magenta"/>
<channel id="0x101e" class="data" name="UserFlag1" details="User Flag 1" label="UF1" unit="events/hour" color="dark cyan"/>
<channel id="0x101f" class="data" name="UserFlag2" details="User Flag 2" label="UF2" unit="events/hour" color="dark cyan"/>
@ -53,6 +53,7 @@ One id code per item
<channel id="0x1115" class="data" name="MaxLeak" details="Maximum Leak" label="MaxLeaks" unit="L/min" color="dark red"/>
<channel id="0x1116" class="data" name="AHI" details="Apnea/Hypopnea Index" label="AHI/Hr" unit="events/hr" color="dark red"/>
<channel id="0x1117" class="data" name="LeakTotal" details="Total Leak Rate" label="Total Leaks" unit="L/min" color="dark green"/>
<channel id="0x1118" class="data" name="LeakMedian" details="Median Leak Rate" label="Median Leaks" unit="L/min" color="dark green"/>
<channel id="0x1150" class="data" name="PRS1_00" details="Unknown 00" label="U00" unit="?" color="black"/>
<channel id="0x1151" class="data" name="PRS1_01" details="Unknown 01" label="U01" unit="?" color="black"/>
@ -66,6 +67,12 @@ One id code per item
<channel id="0x1159" class="data" name="PRS1_12" details="PRS1 Unknown 12" label="U12" unit="" color="black"/>
<channel id="0x1160" class="data" name="RMS9_E01" details="RMS9 Empty 1" label="E01" unit="" color="black"/>
<channel id="0x1161" class="data" name="RMS9_E02" details="RMS9 Empty 2" label="U02" unit="" color="black"/>
<channel id="0x1162" class="data" name="SetPressure" details="Set Pressure" label="Pressure" unit="" color="black"/>
<channel id="0x1163" class="data" name="BrokenSummary" details="Broken Summary" label="Broken Summary" unit="" color="black"/>
<channel id="0x1164" class="data" name="BrokenWaveform" details="Broken Waveform" label="Broken Waveform" unit="" color="black"/>
<channel id="0x1165" class="setting" scope="!session" name="SmartFlex" details="SmartFlex" label="SmartFlex" type="integer"/>
<channel id="0x1166" class="data" name="PRS1_0F" details="Unknown 0F" label="U0F" unit="?" color="dark green"/>
<channel id="0x1200" class="setting" scope="!session" name="PAPMode" details="PAP Mode" label="PAP Mode" type="integer">
<option id="0" value="CPAP"/>

8
exportcsv.cpp
View File

@ -135,7 +135,7 @@ void ExportCSV::on_exportButton_clicked()
const QString sep=",";
const QString newline="\n";
QStringList countlist,avglist,p90list;
QList<ChannelID> countlist,avglist,p90list;
countlist.append(CPAP_Hypopnea);
countlist.append(CPAP_Obstructive);
countlist.append(CPAP_Apnea);
@ -239,14 +239,14 @@ void ExportCSV::on_exportButton_clicked()
file.write(data.toAscii());
}
} else if (ui->rb1_details->isChecked()) {
QStringList all=countlist;
QList<ChannelID> all=countlist;
all.append(avglist);
for (int i=0;i<day->size();i++) {
Session *sess=(*day)[i];
sess->OpenEvents();
QHash<ChannelID,QVector<EventList *> >::iterator fnd;
for (int j=0;j<all.size();j++) {
QString key=all.at(j);
ChannelID key=all.at(j);
fnd=sess->eventlist.find(key);
if (fnd!=sess->eventlist.end()) {
//header="DateTime"+sep+"Session"+sep+"Event"+sep+"Data/Duration";
@ -255,7 +255,7 @@ void ExportCSV::on_exportButton_clicked()
for (quint32 q=0;q<ev->count();q++) {
data=QDateTime::fromTime_t(ev->time(q)/1000L).toString(Qt::ISODate);
data+=sep+QString::number(sess->session());
data+=sep+key;
data+=sep+schema::channel[key].name();
data+=sep+QString::number(ev->data(q),'f',2);
data+=newline;
file.write(data.toAscii());

3
main.cpp
View File

@ -94,7 +94,7 @@ int main(int argc, char *argv[])
if (args[i]=="-l") force_login_screen=true;
if (args[i]=="-p") {
#ifdef Q_WS_WIN32
Sleep(1);
Sleep(1000);
#else
sleep(1);
#endif
@ -172,6 +172,7 @@ int main(int argc, char *argv[])
p_profile=Profiles::Get(PREF[STR_GEN_Profile].toString());
qDebug() << "Selected Profile" << p_profile->user->userName();
//if (!PREF.Exists(STR_GEN_Profile)) PREF[STR_GEN_Profile]=getUserName();
//int id=QFontDatabase::addApplicationFont(":/fonts/FreeSans.ttf");

6
mainwindow.cpp
View File

@ -637,7 +637,7 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
return;
}
QString username=PROFILE.Get("_{Username}_");
QString username=PROFILE.Get(QString("_{")+QString(UI_STR_UserName)+"}_");
bool print_bookmarks=false;
if (name==STR_TR_Daily) {
@ -981,14 +981,14 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
void MainWindow::on_action_Rebuild_Oximetry_Index_triggered()
{
QVector<QString> valid;
QVector<ChannelID> valid;
valid.push_back(OXI_Pulse);
valid.push_back(OXI_SPO2);
valid.push_back(OXI_Plethy);
//valid.push_back(OXI_PulseChange); // Delete these and recalculate..
//valid.push_back(OXI_SPO2Drop);
QVector<QString> invalid;
QVector<ChannelID> invalid;
QList<Machine *> machines=PROFILE.GetMachines(MT_OXIMETER);

9
newprofile.cpp
View File

@ -119,10 +119,11 @@ void NewProfile::on_nextButton_clicked()
ui->stackedWidget->setCurrentIndex(index);
} else {
// Finish button clicked.
QString username=ui->userNameEdit->text();
if (QMessageBox::question(this,tr("Profile Changes"),tr("Accept and save this information?"),QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes) {
Profile *profile=Profiles::Get(ui->userNameEdit->text());
Profile *profile=Profiles::Get(username);
if (!profile) { // No profile, create one.
profile=Profiles::Create(ui->userNameEdit->text());
profile=Profiles::Create(username);
}
Profile &prof=*profile;
profile->user->setFirstName(ui->firstNameEdit->text());
@ -178,8 +179,8 @@ void NewProfile::on_nextButton_clicked()
}
profile->user->setHeight(v);
//profile->user->setUserName(ui->userNameEdit->text());??
PREF[STR_GEN_Profile]=ui->userNameEdit->text();
//profile->user->setUserName(username);
PREF[STR_GEN_Profile]=username;
this->accept();

14
overview.cpp
View File

@ -147,16 +147,16 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
SPO2->AddLayer(spo2);
uc=new SummaryChart(STR_UNIT_Hours,GT_BAR);
uc->addSlice("",QColor("green"),ST_HOURS,true);
uc->addSlice(NoChannel,QColor("green"),ST_HOURS,true);
UC->AddLayer(uc);
us=new SummaryChart(STR_UNIT_Hours,GT_SESSIONS);
us->addSlice("",QColor("dark blue"),ST_HOURS,true);
us->addSlice("",QColor("blue"),ST_SESSIONS,true);
us->addSlice(NoChannel,QColor("dark blue"),ST_HOURS,true);
us->addSlice(NoChannel,QColor("blue"),ST_SESSIONS,true);
US->AddLayer(us);
ses=new SummaryChart(tr("Sessions"),GT_LINE);
ses->addSlice("",QColor("blue"),ST_SESSIONS,true);
ses->addSlice(NoChannel,QColor("blue"),ST_SESSIONS,true);
SES->AddLayer(ses);
bc=new SummaryChart(tr("AHI"),GT_BAR);
@ -167,11 +167,11 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
AHI->AddLayer(bc);
set=new SummaryChart("",GT_LINE);
//set->addSlice("SysOneResistSet",QColor("grey"),ST_SETAVG);
//set->addSlice(PRS1_SysOneResistSet,QColor("grey"),ST_SETAVG);
set->addSlice(PRS1_HumidSetting,QColor("blue"),ST_SETWAVG,true);
set->addSlice(PRS1_FlexSet,QColor("red"),ST_SETWAVG,true);
set->addSlice("EPR",QColor("green"),ST_SETWAVG,true);
set->addSlice("SmartFlex",QColor("purple"),ST_SETWAVG,true);
set->addSlice(RMS9_EPR,QColor("green"),ST_SETWAVG,true);
set->addSlice(INTP_SmartFlex,QColor("purple"),ST_SETWAVG,true);
SET->setRecMinY(0);
SET->setRecMaxY(5);
SET->AddLayer(set);

2
oximetry.cpp
View File

@ -323,7 +323,7 @@ void SerialOximeter::compactAll()
qint64 tminx=0,tmaxx=0,minx,maxx;
EventDataType min,max;
for (i=session->eventlist.begin();i!=session->eventlist.end();i++) {
const QString & code=i.key();
const ChannelID & code=i.key();
min=999,max=0;
minx=maxx=0;
for (int j=0;j<i.value().size();j++) {