From aeffae09fc3bef6fa2d9441d8401456b6099263b Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Sun, 1 Sep 2019 22:14:36 -0700 Subject: [PATCH] Standard and Advanced graphs apparently working, still with lots of diagnostics. --- oscar/Graphs/gGraphView.cpp | 38 +++++++++++++++++++++++++ oscar/Graphs/gGraphView.h | 3 ++ oscar/Graphs/gSessionTimesChart.h | 2 +- oscar/SleepLib/day.cpp | 19 +++++++++++-- oscar/SleepLib/day.h | 3 +- oscar/SleepLib/schema.cpp | 1 - oscar/daily.cpp | 46 +++++++++++++++++++------------ oscar/reports.cpp | 2 +- oscar/statistics.cpp | 4 +-- 9 files changed, 93 insertions(+), 25 deletions(-) diff --git a/oscar/Graphs/gGraphView.cpp b/oscar/Graphs/gGraphView.cpp index 529b09f0..f7544802 100644 --- a/oscar/Graphs/gGraphView.cpp +++ b/oscar/Graphs/gGraphView.cpp @@ -3362,9 +3362,47 @@ void gGraphView::resetLayout() updateScale(); timedRedraw(0); } +// Reset order of current graphs to new order, remove pinning +void gGraphView::resetGraphOrder(bool pinFirst, const QList graphOrder) { + qDebug() << "gGraphView::resetGraphOrder new order" << graphOrder; + QList new_graphs; + QList old_graphs = m_graphs; + + // Create new_graphs in order specified by graphOrder + for (int i = 0; i < graphOrder.size(); ++i) { + QString nextGraph = graphOrder.at(i); + auto it = m_graphsbyname.find(nextGraph); + if (it == m_graphsbyname.end()) { + qDebug() << "resetGraphOrder could not find" << nextGraph; + continue; // should not happen + } + gGraph * graph = it.value(); + new_graphs.append(graph); + int idx = old_graphs.indexOf(graph); + old_graphs.removeAt(idx); + qDebug() << "resetGraphOrder added to new graphs" << nextGraph; + } + // If we didn't find everything, append anything extra we have + for (int i = 0; i < old_graphs.size(); i++) { + qDebug() << "resetGraphOrder added leftover" << old_graphs.at(i)->name(); + new_graphs.append(old_graphs.at(i)); + } + + m_graphs = new_graphs; + + for (auto & graph : m_graphs) { + if (!graph) continue; + if (graph->isSnapshot()) continue; + graph->setPinned(false); + } + if (pinFirst) + m_graphs[0]->setPinned(true); +} + // Reset order of current graphs to match defaults, remove pinning void gGraphView::resetGraphOrder(bool pinFirst) { m_graphs = m_default_graphs; + for (auto & graph : m_graphs) { if (!graph) continue; if (graph->isSnapshot()) continue; diff --git a/oscar/Graphs/gGraphView.h b/oscar/Graphs/gGraphView.h index 19a180db..57b0e896 100644 --- a/oscar/Graphs/gGraphView.h +++ b/oscar/Graphs/gGraphView.h @@ -379,6 +379,9 @@ class gGraphView //! \brief Reset the current graph order, heights, min & max Y values to match default values void resetGraphOrder(bool pinFirst); + //! \brief Reset the current graph order, heights, min & max Y values to match default values + void resetGraphOrder(bool pinFirst, const QList graphOrder); + //! \brief Returns the graph object matching the supplied name, nullptr if it does not exist. gGraph *findGraph(QString name); diff --git a/oscar/Graphs/gSessionTimesChart.h b/oscar/Graphs/gSessionTimesChart.h index f812f1c7..5e56c0d0 100644 --- a/oscar/Graphs/gSessionTimesChart.h +++ b/oscar/Graphs/gSessionTimesChart.h @@ -457,7 +457,7 @@ public: virtual void populate(Day * day, int idx); virtual QString tooltipData(Day * day, int idx) { - return day->getCPAPMode() + "\n" + day->getPressureSettings() + gSummaryChart::tooltipData(day, idx); + return day->getCPAPModeStr() + "\n" + day->getPressureSettings() + gSummaryChart::tooltipData(day, idx); } }; diff --git a/oscar/SleepLib/day.cpp b/oscar/SleepLib/day.cpp index 56117ae2..cc836075 100644 --- a/oscar/SleepLib/day.cpp +++ b/oscar/SleepLib/day.cpp @@ -1381,7 +1381,23 @@ void Day::removeMachine(Machine * mach) } } -QString Day::getCPAPMode() +int Day::getCPAPMode() +{ + Machine * mach = machine(MT_CPAP); + if (!mach) return 0; + + CPAPLoader * loader = qobject_cast(mach->loader()); + + ChannelID modechan = loader->CPAPModeChannel(); + +// schema::Channel & chan = schema::channel[modechan]; + + int mode = (CPAPMode)(int)qRound(settings_wavg(modechan)); + + return mode; +} + +QString Day::getCPAPModeStr() { Machine * mach = machine(MT_CPAP); if (!mach) return STR_MessageBox_Error; @@ -1396,7 +1412,6 @@ QString Day::getCPAPMode() return chan.option(mode); - // if (mode == MODE_CPAP) { // return QObject::tr("Fixed"); // } else if (mode == MODE_APAP) { diff --git a/oscar/SleepLib/day.h b/oscar/SleepLib/day.h index 0415d8c3..fada4561 100644 --- a/oscar/SleepLib/day.h +++ b/oscar/SleepLib/day.h @@ -235,7 +235,8 @@ class Day QList getSortedMachineChannels(MachineType type, quint32 chantype); // Some ugly CPAP specific stuff - QString getCPAPMode(); + int getCPAPMode(); + QString getCPAPModeStr(); QString getPressureRelief(); QString getPressureSettings(); diff --git a/oscar/SleepLib/schema.cpp b/oscar/SleepLib/schema.cpp index 7cfe71e3..f6b1633f 100644 --- a/oscar/SleepLib/schema.cpp +++ b/oscar/SleepLib/schema.cpp @@ -292,7 +292,6 @@ void init() ch->addOption(7, QObject::tr("ASV (Variable EPAP)")); ch->addOption(8, QObject::tr("AVAPS")); - ///////////////////////////////////////////////////////////////// // Old Journal system crap ///////////////////////////////////////////////////////////////// diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 2761ef02..51c9088b 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -64,22 +64,26 @@ inline QString channelInfo(ChannelID code) { // + (schema::channel[code].units() != "0" ? "\n("+schema::channel[code].units()+")" : ""); } +// Standard graph order +const QList standardGraphOrder = {STR_GRAPH_SleepFlags, STR_GRAPH_FlowRate, STR_GRAPH_Pressure, STR_GRAPH_LeakRate, STR_GRAPH_FlowLimitation, + STR_GRAPH_Snore, STR_GRAPH_TidalVolume, STR_GRAPH_MaskPressure, STR_GRAPH_RespRate, STR_GRAPH_MinuteVent, + STR_GRAPH_PTB, STR_GRAPH_RespEvent, STR_GRAPH_Ti, STR_GRAPH_Te, + STR_GRAPH_SleepStage, STR_GRAPH_Inclination, STR_GRAPH_Orientation, STR_GRAPH_TestChan1, + STR_GRAPH_Oxi_Pulse, STR_GRAPH_Oxi_SPO2, STR_GRAPH_Oxi_Perf, STR_GRAPH_Oxi_Plethy, + STR_GRAPH_AHI, STR_GRAPH_TAP + }; +// Advanced graph order +const QList advancedGraphOrder = {STR_GRAPH_SleepFlags, STR_GRAPH_FlowRate, STR_GRAPH_MaskPressure, STR_GRAPH_TidalVolume, STR_GRAPH_MinuteVent, + STR_GRAPH_Ti, STR_GRAPH_Te, STR_GRAPH_FlowLimitation, STR_GRAPH_Pressure, STR_GRAPH_LeakRate, STR_GRAPH_Snore, + STR_GRAPH_RespRate, STR_GRAPH_PTB, STR_GRAPH_RespEvent, + STR_GRAPH_Ti, STR_GRAPH_Te, STR_GRAPH_SleepStage, STR_GRAPH_Inclination, STR_GRAPH_Orientation, STR_GRAPH_TestChan1, + STR_GRAPH_Oxi_Pulse, STR_GRAPH_Oxi_SPO2, STR_GRAPH_Oxi_Perf, STR_GRAPH_Oxi_Plethy, + STR_GRAPH_AHI, STR_GRAPH_TAP + }; -const QString standardGraphOrder[] = {STR_GRAPH_SleepFlags, STR_GRAPH_FlowRate, STR_GRAPH_Pressure, STR_GRAPH_LeakRate, STR_GRAPH_FlowLimitation, STR_GRAPH_Snore, - STR_GRAPH_TidalVolume, STR_GRAPH_MaskPressure, STR_GRAPH_RespRate, STR_GRAPH_MinuteVent, STR_GRAPH_PTB, STR_GRAPH_RespEvent, - STR_GRAPH_Ti, STR_GRAPH_Te, STR_GRAPH_SleepStage, STR_GRAPH_Inclination, STR_GRAPH_Orientation, STR_GRAPH_TestChan1, - STR_GRAPH_Oxi_Pulse, STR_GRAPH_Oxi_SPO2, STR_GRAPH_Oxi_Perf, STR_GRAPH_Oxi_Plethy, - STR_GRAPH_AHI, STR_GRAPH_EventBreakdown, STR_GRAPH_TAP - }; - -const QString advancedGraphOrder[] = {STR_GRAPH_SleepFlags, STR_GRAPH_FlowRate, STR_GRAPH_MaskPressure, STR_GRAPH_TidalVolume, STR_GRAPH_MinuteVent, - STR_GRAPH_Ti, STR_GRAPH_Te, STR_GRAPH_FlowLimitation, STR_GRAPH_Pressure, STR_GRAPH_LeakRate, STR_GRAPH_Snore, - STR_GRAPH_RespRate, STR_GRAPH_PTB, STR_GRAPH_RespEvent, - STR_GRAPH_Ti, STR_GRAPH_Te, STR_GRAPH_SleepStage, STR_GRAPH_Inclination, STR_GRAPH_Orientation, STR_GRAPH_TestChan1, - STR_GRAPH_Oxi_Pulse, STR_GRAPH_Oxi_SPO2, STR_GRAPH_Oxi_Perf, STR_GRAPH_Oxi_Plethy, - STR_GRAPH_AHI, STR_GRAPH_EventBreakdown, STR_GRAPH_TAP - }; +// CPAP modes that should have Advanced graphs +const QList useAdvancedGraphs = {MODE_ASV, MODE_ASV_VARIABLE_EPAP, MODE_AVAPS}; void Daily::setCalendarVisible(bool visible) @@ -884,7 +888,15 @@ void Daily::ResetGraphLayout() } void Daily::ResetGraphOrder() { - GraphView->resetGraphOrder(true); + Day * day = p_profile->GetDay(previous_date,MT_CPAP); + + int cpapMode = day->getCPAPMode(); + qDebug() << "Daily::ResetGraphOrder cpapMode" << cpapMode; + + if (useAdvancedGraphs.contains(cpapMode)) + GraphView->resetGraphOrder(true, advancedGraphOrder); + else + GraphView->resetGraphOrder(true, standardGraphOrder); // Enable all graphs (make them not hidden) for (int i=0;igraphCombo->count();i++) { @@ -1059,7 +1071,7 @@ QString Daily::getMachineSettings(Day * day) { first[cpapmode] = QString("

%1

%3") .arg(chan.label()) .arg(chan.description()) - .arg(day->getCPAPMode()); + .arg(day->getCPAPModeStr()); if (sess) for (; it != it_end; ++it) { ChannelID code = it.key(); @@ -1189,7 +1201,7 @@ QString Daily::getCPAPInformation(Day * day) html+="

"+info.brand+"
"+info.model+"

\n"; html+=""; - html+=tr("PAP Mode: %1").arg(day->getCPAPMode())+"
"; + html+=tr("PAP Mode: %1").arg(day->getCPAPModeStr())+"
"; html+= day->getPressureSettings(); html+="\n"; if (day->noSettings(cpap)) { diff --git a/oscar/reports.cpp b/oscar/reports.cpp index 1b9cd597..9f69c466 100644 --- a/oscar/reports.cpp +++ b/oscar/reports.cpp @@ -200,7 +200,7 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date) } cpapinfo += "\n"; - cpapinfo += STR_TR_Mode + ": " + day->getCPAPMode() + "\n"; + cpapinfo += STR_TR_Mode + ": " + day->getCPAPModeStr() + "\n"; cpapinfo += day->getPressureSettings() + "\n"; QString pressurerelief = day->getPressureRelief(); if (pressurerelief.compare(STR_TR_None)) { diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp index 867ba34b..0a5dbbef 100644 --- a/oscar/statistics.cpp +++ b/oscar/statistics.cpp @@ -223,7 +223,7 @@ void Statistics::updateRXChanges() // Generate the pressure/mode/relief strings QString relief = day->getPressureRelief(); - QString mode = day->getCPAPMode(); + QString mode = day->getCPAPModeStr(); QString pressure = day->getPressureSettings(); // Do this days settings match this rx cache entry? @@ -405,7 +405,7 @@ void Statistics::updateRXChanges() // Generate pressure/mode/`strings QString relief = day->getPressureRelief(); - QString mode = day->getCPAPMode(); + QString mode = day->getCPAPModeStr(); QString pressure = day->getPressureSettings(); // Now scan the rxcache to find the most previous entry, and the right place to insert