From 0358386cd314ce1d5b66b8ba8ac6e8a56d5fa42e Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Tue, 28 Jan 2020 14:07:58 -0500 Subject: [PATCH] Fix PRS1 tube diameter display. It was being parsed correctly, but the mapping to display was wrong. --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index 105fb4aa..c3cd1fc2 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -4239,7 +4239,7 @@ bool PRS1Import::ImportCompliance() CHECK_VALUE(e->m_value, 0); break; case PRS1_SETTING_HOSE_DIAMETER: - session->settings[PRS1_HoseDiam] = QObject::tr("%1mm").arg(e->m_value); + session->settings[PRS1_HoseDiam] = e->m_value; break; case PRS1_SETTING_AUTO_ON: session->settings[PRS1_AutoOn] = (bool) e->m_value; @@ -7462,7 +7462,7 @@ bool PRS1Import::ImportSummary() session->settings[PRS1_SysOneResistStat] = (bool) e->m_value; break; case PRS1_SETTING_HOSE_DIAMETER: - session->settings[PRS1_HoseDiam] = QObject::tr("%1mm").arg(e->m_value); + session->settings[PRS1_HoseDiam] = e->m_value; break; case PRS1_SETTING_AUTO_ON: session->settings[PRS1_AutoOn] = (bool) e->m_value; @@ -8506,8 +8506,6 @@ void PRS1Loader::initChannels() QObject::tr("PRS1 pressure relief mode."), QObject::tr("Flex Mode"), "", LOOKUP, Qt::green)); - - chan->addOption(FLEX_None, STR_TR_None); chan->addOption(FLEX_CFlex, QObject::tr("C-Flex")); chan->addOption(FLEX_CFlexPlus, QObject::tr("C-Flex+")); @@ -8604,8 +8602,9 @@ void PRS1Loader::initChannels() QObject::tr("Diameter of primary CPAP hose"), QObject::tr("Hose Diameter"), "", LOOKUP, Qt::green)); - chan->addOption(0, QObject::tr("22mm")); - chan->addOption(1, QObject::tr("15mm")); + chan->addOption(22, QObject::tr("22mm")); + chan->addOption(15, QObject::tr("15mm")); + chan->addOption(12, QObject::tr("12mm")); channel.add(GRP_CPAP, chan = new Channel(PRS1_SysOneResistStat = 0xe108, SETTING, MT_CPAP, SESSION, "SysOneLock",