From 5081e7f711381f37fe5a76516877bfe93eaeea06 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 22 Dec 2011 03:00:19 +1000 Subject: [PATCH] ChannelID Integer Rework.. WARNING.. BACKUP YOUR SleepApp profile First --- Graphs/gFooBar.cpp | 4 +- Graphs/gGraphView.cpp | 4 +- Graphs/gLineChart.cpp | 4 +- Graphs/gSegmentChart.cpp | 2 +- Graphs/gSummaryChart.cpp | 2 +- Graphs/gXAxis.cpp | 2 +- Graphs/gYAxis.cpp | 6 +- SleepLib/calcs.cpp | 2 +- SleepLib/loader_plugins/prs1_loader.cpp | 8 +- SleepLib/loader_plugins/resmed_loader.cpp | 8 +- SleepLib/machine.cpp | 18 +++ SleepLib/machine_common.h | 106 +++------------- SleepLib/profiles.cpp | 2 +- SleepLib/profiles.h | 80 ++++++------ SleepLib/schema.cpp | 96 ++++++++++++++- SleepLib/schema.h | 4 +- SleepLib/session.cpp | 144 +++++++++++++++++----- SleepLib/session.h | 2 +- daily.cpp | 34 ++--- docs/channels.xml | 9 +- exportcsv.cpp | 8 +- main.cpp | 3 +- mainwindow.cpp | 6 +- newprofile.cpp | 9 +- overview.cpp | 14 +-- oximetry.cpp | 2 +- 26 files changed, 357 insertions(+), 222 deletions(-) diff --git a/Graphs/gFooBar.cpp b/Graphs/gFooBar.cpp index aa5130f4..91d85fbf 100644 --- a/Graphs/gFooBar.cpp +++ b/Graphs/gFooBar.cpp @@ -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() diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index e1ba9fc2..e2ea9bb1 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -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() diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp index 92f42980..b59df899 100644 --- a/Graphs/gLineChart.cpp +++ b/Graphs/gLineChart.cpp @@ -141,7 +141,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height) bool fndbetter=false; for (QList::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)); diff --git a/Graphs/gSegmentChart.cpp b/Graphs/gSegmentChart.cpp index 4ee14a75..4a42ec8b 100644 --- a/Graphs/gSegmentChart.cpp +++ b/Graphs/gSegmentChart.cpp @@ -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)); diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp index 6e370a1f..cfa8dfa2 100644 --- a/Graphs/gSummaryChart.cpp +++ b/Graphs/gSummaryChart.cpp @@ -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)); diff --git a/Graphs/gXAxis.cpp b/Graphs/gXAxis.cpp index 1239dad1..d7dd82b0 100644 --- a/Graphs/gXAxis.cpp +++ b/Graphs/gXAxis.cpp @@ -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; diff --git a/Graphs/gYAxis.cpp b/Graphs/gYAxis.cpp index c8cef5f6..832d356e 100644 --- a/Graphs/gYAxis.cpp +++ b/Graphs/gYAxis.cpp @@ -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; diff --git a/SleepLib/calcs.cpp b/SleepLib/calcs.cpp index eb17d9aa..f07cfc82 100644 --- a/SleepLib/calcs.cpp +++ b/SleepLib/calcs.cpp @@ -216,7 +216,7 @@ int filterFlow(Session *session, EventList *in, EventList *out, EventList *tv, E goodb.push_back(time); } } - for (int i=0;iAddEvent(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; diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp index d2cf1cb0..bc1db2b7 100644 --- a/SleepLib/loader_plugins/resmed_loader.cpp +++ b/SleepLib/loader_plugins/resmed_loader.cpp @@ -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"); diff --git a/SleepLib/machine.cpp b/SleepLib/machine.cpp index d1c9ef22..ef42b610 100644 --- a/SleepLib/machine.cpp +++ b/SleepLib/machine.cpp @@ -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; diff --git a/SleepLib/machine_common.h b/SleepLib/machine_common.h index b0fff615..7a3c0063 100644 --- a/SleepLib/machine_common.h +++ b/SleepLib/machine_common.h @@ -15,7 +15,7 @@ #include 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 diff --git a/SleepLib/profiles.cpp b/SleepLib/profiles.cpp index 3eeee5d7..0fd09595 100644 --- a/SleepLib/profiles.cpp +++ b/SleepLib/profiles.cpp @@ -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"); diff --git a/SleepLib/profiles.h b/SleepLib/profiles.h index 40399813..66cc59c2 100644 --- a/SleepLib/profiles.h +++ b/SleepLib/profiles.h @@ -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() {} diff --git a/SleepLib/schema.cpp b/SleepLib/schema.cpp index 3a43a94b..783b6ddb 100644 --- a/SleepLib/schema.cpp +++ b/SleepLib/schema.cpp @@ -9,6 +9,8 @@ #include #include #include +#include +#include #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::iterator i=channels.begin();i!=channels.end();i++) { + for (QHash::iterator i=channels.begin();i!=channels.end();i++) { delete i.value(); } } diff --git a/SleepLib/schema.h b/SleepLib/schema.h index 56d65ef1..2d4812cc 100644 --- a/SleepLib/schema.h +++ b/SleepLib/schema.h @@ -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 channels; + QHash channels; //! \brief Channel List index by name QHash names; diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index a43d6697..1790e8c2 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -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 mctype; - QVector mcorder; + //QHash mctype; + //QVector 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> t16; // Machine Code - ChannelID mc=(ChannelID)t16; - in >> settings[mc]; - } */ + if (version<7) { + QHash v1; + in >> v1; + settings.clear(); + ChannelID code; + for (QHash::iterator i=v1.begin();i!=v1.end();i++) { + code=schema::channel[i.key()].id(); + settings[code]=i.value(); + } + QHash zcnt; + in >> zcnt; + for (QHash::iterator i=zcnt.begin();i!=zcnt.end();i++) { + code=schema::channel[i.key()].id(); + m_cnt[code]=i.value(); + } + QHash zsum; + in >> zsum; + for (QHash::iterator i=zsum.begin();i!=zsum.end();i++) { + code=schema::channel[i.key()].id(); + m_cnt[code]=i.value(); + } + QHash ztmp; + in >> ztmp; // avg + for (QHash::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::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::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::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::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::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::iterator i=ztmp.begin();i!=ztmp.end();i++) { + code=schema::channel[i.key()].id(); + m_sph[code]=i.value(); + } + QHash ztim; + in >> ztim; //firstchan + for (QHash::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::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> 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 sizevec; QString dim; for (int i=0;i> 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); diff --git a/SleepLib/session.h b/SleepLib/session.h index 23b0304d..dae078a1 100644 --- a/SleepLib/session.h +++ b/SleepLib/session.h @@ -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; } diff --git a/daily.cpp b/daily.cpp index 370a2a77..9ba620e6 100644 --- a/daily.cpp +++ b/daily.cpp @@ -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("AHI")+""+QString().sprintf("%.2f",ahi)+"\n" - " "+tr("Hypopnea")+""+QString().sprintf("%.2f",hi)+"\n"; + " "+tr("Hypopnea")+""+QString().sprintf("%.2f",hi)+"\n"; if (cpap->machine->GetClass()==STR_MACH_ResMed) { - html+=" "+tr("Unspecified Apnea")+""+QString().sprintf("%.2f",uai)+"\n"; + html+=" "+tr("Unspecified Apnea")+""+QString().sprintf("%.2f",uai)+"\n"; } - html+=" "+tr("Obstructive")+""+QString().sprintf("%.2f",oai)+"\n" - " "+tr("Clear Airway")+""+QString().sprintf("%.2f",cai)+"\n" + html+=" "+tr("Obstructive")+""+QString().sprintf("%.2f",oai)+"\n" + " "+tr("Clear Airway")+""+QString().sprintf("%.2f",cai)+"\n" ""; if (cpap->machine->GetClass()==STR_MACH_PRS1) { html+="" - "\n" - "\n" - "\n" - "\n" + "\n" + "\n" + "\n" + "\n" "
 "+tr("RERA")+""+QString().sprintf("%.2f",rei)+"
 "+tr("Flow Limit")+""+a.sprintf("%.2f",fli)+"
 "+tr("Vsnore")+""+QString().sprintf("%.2f",vsi)+"
 "+tr("PB/CSR")+""+QString().sprintf("%.2f",csr)+"%
 "+tr("RERA")+""+QString().sprintf("%.2f",rei)+"
 "+tr("Flow Limit")+""+a.sprintf("%.2f",fli)+"
 "+tr("Vsnore")+""+QString().sprintf("%.2f",vsi)+"
 "+tr("PB/CSR")+""+QString().sprintf("%.2f",csr)+"%
"; } else if (cpap->machine->GetClass()==STR_MACH_Intellipap) { html+="" - "\n" - "\n" - "\n" - "\n" + "\n" + "\n" + "\n" + "\n" "
 "+tr("NRI")+""+QString().sprintf("%.2f",nri)+"
 "+tr("Leak Idx")+""+a.sprintf("%.2f",lki)+"
 "+tr("V.Snore")+""+QString().sprintf("%.2f",vsi)+"
 "+tr("Exh. Puff")+""+QString().sprintf("%.2f",exp)+"
 "+tr("NRI")+""+QString().sprintf("%.2f",nri)+"
 "+tr("Leak Idx")+""+a.sprintf("%.2f",lki)+"
 "+tr("V.Snore")+""+QString().sprintf("%.2f",vsi)+"
 "+tr("Exh. Puff")+""+QString().sprintf("%.2f",exp)+"
"; } @@ -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+=""+schema::channel[code].label()+""; + html+=""+schema::channel[code].label()+""; html+=""+a.sprintf("%.2f",cpap->Min(code)-suboffset); html+=""+a.sprintf("%.2f",cpap->wavg(code)-suboffset); html+=""+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+=""+schema::channel[code].label()+""; + html+=""+schema::channel[code].label()+""; html+=""+a.sprintf("%.2f",oxi->Min(code)); html+=""+a.sprintf("%.2f",oxi->wavg(code)); html+=""+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::iterator i=(*s)->settings.find("BrokenWaveform"); + QHash::iterator i=(*s)->settings.find(CPAP_BrokenWaveform); tooltip=cpap->machine->GetClass()+" "+tr("CPAP")+" "+QString().sprintf("%2ih %2im %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::iterator i=(*s)->settings.find("BrokenWaveform"); + QHash::iterator i=(*s)->settings.find(CPAP_BrokenWaveform); tooltip=oxi->machine->GetClass()+" "+tr("Oximeter")+" "+QString().sprintf("%2ih, %2im, %2is",h,m,s1); diff --git a/docs/channels.xml b/docs/channels.xml index 369f8f45..fb283cf9 100644 --- a/docs/channels.xml +++ b/docs/channels.xml @@ -20,7 +20,7 @@ One id code per item - + @@ -53,6 +53,7 @@ One id code per item + @@ -66,6 +67,12 @@ One id code per item + + + + + +