From 34699f2720dcc2fcbf462856a1c863eb88ff2496 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sun, 18 Dec 2011 03:56:16 +1000 Subject: [PATCH] PRS1Flex was mixed up with Humidifier Status --- Graphs/gSummaryChart.cpp | 3 +++ SleepLib/loader_plugins/prs1_loader.cpp | 2 +- SleepLib/machine_common.h | 2 +- overview.cpp | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp index 6c92ee62..0aec3114 100644 --- a/Graphs/gSummaryChart.cpp +++ b/Graphs/gSummaryChart.cpp @@ -133,6 +133,9 @@ void SummaryChart::SetDay(Day * nullday) type==ST_SESSIONS || day->settingExists(code) || day->hasData(code,type); + if (code==PRS1_FlexSet) { + int i=5; + } if (hascode) { m_days[dn]=day; diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp index c810ab64..772aba52 100644 --- a/SleepLib/loader_plugins/prs1_loader.cpp +++ b/SleepLib/loader_plugins/prs1_loader.cpp @@ -471,7 +471,7 @@ bool PRS1Loader::ParseSummary(Machine *mach, qint32 sequence, quint32 timestamp, } else session->settings[PRS1_FlexMode]=(int)PR_CFLEX; } else session->settings[PRS1_FlexMode]=(int)PR_NONE; - session->settings[PRS1_FlexSet]=(int)data[offset+0x08] & 3; + session->settings[PRS1_FlexSet]=(int)(data[offset+0x08] & 3); session->settings[PRS1_HumidSetting]=(int)data[offset+0x09]&0x0f; session->settings[PRS1_HumidStatus]=(data[offset+0x09]&0x80)==0x80; session->settings["SysLock"]=(data[offset+0x0a]&0x80)==0x80; diff --git a/SleepLib/machine_common.h b/SleepLib/machine_common.h index e3dd2466..0e21e7d9 100644 --- a/SleepLib/machine_common.h +++ b/SleepLib/machine_common.h @@ -110,7 +110,7 @@ const QString PRS1_10="PRS1_10"; const QString PRS1_12="PRS1_12"; const QString PRS1_FlexMode="FlexMode"; const QString PRS1_FlexSet="FlexSet"; -const QString PRS1_HumidStatus="FlexSet"; +const QString PRS1_HumidStatus="HumidStat"; const QString PRS1_HumidSetting="HumidSet"; const QString OXI_Pulse="Pulse"; diff --git a/overview.cpp b/overview.cpp index 5a345c53..1dbd0ea2 100644 --- a/overview.cpp +++ b/overview.cpp @@ -170,8 +170,8 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : set=new SummaryChart("",GT_LINE); //set->addSlice("SysOneResistSet",QColor("grey"),ST_SETAVG); - set->addSlice("HumidSet",QColor("blue"),ST_SETWAVG,true); - set->addSlice("FlexSet",QColor("red"),ST_SETWAVG,true); + 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->setRecMinY(0);