From fa9de24c38b657324c3f19584380bca0743c6e5b Mon Sep 17 00:00:00 2001 From: LoudSnorer Date: Tue, 27 Feb 2024 19:04:48 -0500 Subject: [PATCH] Fix Branch: Removed new feature added in beta. Restored daily.h/cpp to same as f4c612774 (beta 2) --- oscar/daily.cpp | 363 +++++++++++++++++++----------------------------- oscar/daily.h | 19 +-- 2 files changed, 146 insertions(+), 236 deletions(-) diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 6ea2943c..aa096dfe 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -1,7 +1,7 @@ /* Daily Panel * * Copyright (c) 2019-2024 The OSCAR Team - * Copyright (c) 2011-2018 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the source code @@ -10,9 +10,6 @@ #define TEST_MACROS_ENABLEDoff #include -#define CONFIGURE_MODE -#define COMBINE_MODE_3 - #include #include #include @@ -532,7 +529,6 @@ Daily::Daily(QWidget *parent,gGraphView * shared) // sleep(3); saveGraphLayoutSettings=nullptr; dailySearchTab = new DailySearchTab(this,ui->searchTab,ui->tabWidget); - htmlLsbSectionHeaderInit(false); } Daily::~Daily() @@ -660,9 +656,6 @@ void Daily::Link_clicked(const QUrl &url) } } else if (code=="graph") { qDebug() << "Select graph " << data; - } else if (code=="leftsidebarenable") { - leftSideBarEnable.toggleBit(data.toInt()); - LoadDate(previous_date); } else { qDebug() << "Clicked on" << code << data; } @@ -1007,14 +1000,13 @@ QString Daily::getSessionInformation(Day * day) QString html; if (!day) return html; - htmlLsbSectionHeader(html,tr("Session Information"),LSB_SESSION_INFORMATION ); - if (!leftSideBarEnable[LSB_SESSION_INFORMATION] ) { - html+="
"; // Have sep at the end of sections. - return html; - } - html+=""; + html="
"; + html+=QString(""); html+=""; QFontMetrics FM(*defaultfont); +// QRect r=FM.boundingRect('@'); + + // Machine * cpap = day->machine(MT_CPAP); QDateTime fd,ld; //bool corrupted_waveform=false; @@ -1111,7 +1103,6 @@ QString Daily::getSessionInformation(Day * day) } */ html+="
"+tr("Session Information")+"
 
"; - html+="
"; // Have sep at the end of sections. return html; } @@ -1120,16 +1111,20 @@ QString Daily::getMachineSettings(Day * day) { Machine * cpap = day->machine(MT_CPAP); if (cpap && day->hasEnabledSessions(MT_CPAP)) { - htmlLsbSectionHeader(html,tr("Device Settings"),LSB_DEVICE_SETTINGS ); - if (!leftSideBarEnable[LSB_DEVICE_SETTINGS] ) { - return html; - } - html+=""; + html="
"; + html+=QString("").arg(tr("Device Settings")); + if (day->noSettings(cpap)) { html+="\n"; } else { html+=""; } + /* + } else if ((day->settingExists(CPAP_BrokenSummary))) { + html+="
%1
"+tr("Please Note: All settings shown below are based on assumptions that nothing has changed since previous days.")+"
 
"+tr("Device Settings Unavailable")+"
\n"; + return html; + } + */ QMap other; Session * sess = day->firstSession(MT_CPAP); @@ -1192,6 +1187,7 @@ QString Daily::getMachineSettings(Day * day) { .arg(schema::channel[code].label()) .arg(schema::channel[code].description()) .arg(data); +//qDebug() << QString::number( code, 16 ) << tmp; if (first_channels.contains(code)) { first[code] = tmp; } else { @@ -1209,6 +1205,34 @@ QString Daily::getMachineSettings(Day * day) { html += it.value(); } + /* ChannelID pr_level_chan = NoChannel; + ChannelID pr_mode_chan = NoChannel; + ChannelID hum_stat_chan = NoChannel; + ChannelID hum_level_chan = NoChannel; + CPAPLoader * loader = dynamic_cast(cpap->machine->loader()); + if (loader) { + pr_level_chan = loader->PresReliefLevel(); + pr_mode_chan = loader->PresReliefMode(); + hum_stat_chan = loader->HumidifierConnected(); + hum_level_chan = loader->HumidifierLevel(); + } + + if ((pr_level_chan != NoChannel) && (cpap->settingExists(pr_level_chan))) { + QString flexstr = cpap->getPressureRelief(); + + html+=QString("%1%2%3") + .arg(schema::channel[pr_mode_chan].label()) + .arg(schema::channel[pr_mode_chan].description()) + .arg(flexstr); + } + + + if (cpap->settingExists(hum_level_chan)) { + int humid=round(cpap->settings_wavg(hum_level_chan)); + html+=QString(""+schema::channel[hum_level_chan].label()+"%1%2") + .arg(schema::channel[hum_level_chan].description()) + .arg(humid == 0 ? STR_GEN_Off : "x"+QString::number(humid)); + } */ html+=""; html+="
\n"; } @@ -1220,11 +1244,8 @@ QString Daily::getOximeterInformation(Day * day) QString html; Machine * oxi = day->machine(MT_OXIMETER); if (oxi && day->hasEnabledSessions(MT_OXIMETER)) { - htmlLsbSectionHeader(html,tr("Oximeter Information"),LSB_OXIMETER_INFORMATION ); - if (!leftSideBarEnable[LSB_OXIMETER_INFORMATION] ) { - return html; - } - html+=""; + html="
"; + html+=QString("\n").arg(tr("Oximeter Information")); html+=""; html+="\n"; html+=""; @@ -1237,6 +1258,7 @@ QString Daily::getOximeterInformation(Day * day) } return html; } + QString Daily::getCPAPInformation(Day * day) { QString html; @@ -1247,15 +1269,12 @@ QString Daily::getCPAPInformation(Day * day) if (!cpap) return html; MachineInfo info = cpap->getInfo(); - htmlLsbSectionHeader(html , info.brand ,LSB_MACHINE_INFO ); - if (!leftSideBarEnable[LSB_MACHINE_INFO] ) { - return html; - } - html+="
%1
 
"+oxi->brand()+" "+oxi->model()+"
 
\n"; + + html="
\n"; QString tooltip=tr("Model %1 - %2").arg(info.modelnumber).arg(info.serial); tooltip=tooltip.replace(" "," "); - html+="\n"; + html+="\n"; html+="

"+info.model+"

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

"; html+=tr("PAP Mode: %1").arg(day->getCPAPModeStr())+"
"; @@ -1298,11 +1317,8 @@ QString Daily::getStatisticsInfo(Day * day) QString html; - htmlLsbSectionHeader(html,tr("Statistics"),LSB_STATISTICS ); - if (!leftSideBarEnable[LSB_STATISTICS] ) { - return html; - } html+="\n"; + html+=QString("\n").arg(tr("Statistics")); html+=QString("") .arg(STR_TR_Channel) .arg(STR_TR_Min) @@ -1452,15 +1468,6 @@ QString Daily::getSleepTime(Day * day) if (!day || (day->hours() < 0.0000001)) return html; -#ifndef COMBINE_MODE_3 - htmlLsbSectionHeader(html , tr("General") ,LSB_SLEEPTIME_INDICES ); - if (!leftSideBarEnable[LSB_SLEEPTIME_INDICES] ) { - return html; - } -#else - if (!leftSideBarEnable[LSB_MACHINE_INFO] ) return html; -#endif - html+="
%1
%1%2%3%4%5
\n"; html+=""; int tt=qint64(day->total_time(MT_CPAP))/1000L; @@ -1476,172 +1483,17 @@ QString Daily::getSleepTime(Day * day) .arg(date2.toString("HH:mm:ss")) .arg(QString::asprintf("%02i:%02i:%02i",h,m,s)); html+="
"+STR_TR_Date+""+tr("Start")+""+tr("End")+""+STR_UNIT_Hours+"
\n"; - html+="
"; +// html+="
"; return html; } - -QString Daily::getAHI(Day * day, bool isBrick) { - QString html; - - float hours=day->hours(MT_CPAP); - EventDataType ahi=day->count(AllAhiChannels); - if (p_profile->general->calculateRDI()) ahi+=day->count(CPAP_RERA); - ahi/=hours; - - html ="\n"; - - // Show application font, for debugging font issues - // QString appFont = QApplication::font().toString(); - // html +=QString("").arg(appFont); - - html +=""; - if (!isBrick) { - ChannelID ahichan=CPAP_AHI; - QString ahiname=STR_TR_AHI; - if (p_profile->general->calculateRDI()) { - ahichan=CPAP_RDI; - ahiname=STR_TR_RDI; - } - html +=QString("\n") - .arg("#F88017").arg(COLOR_Text.name()).arg(ahiname).arg(schema::channel[ahichan].fullname()).arg(ahi,0,'f',2); - } else { - html +=QString("\n") - .arg("#F88017").arg(tr("This CPAP device does NOT record detailed data")); - } - html +="\n"; - html +="
%1

%3

  %5		%2
\n"; - - return html; -} - -QString Daily::getIndices(Day * day, QHash& values ) { - QString html; - float hours=day->hours(MT_CPAP); - - html = "\n"; - - quint32 zchans = schema::SPAN | schema::FLAG; - bool show_minors = false; // true; - if (p_profile->general->showUnknownFlags()) zchans |= schema::UNKNOWN; - - if (show_minors) zchans |= schema::MINOR_FLAG; - QList available = day->getSortedMachineChannels(zchans); - - EventDataType val; - for (int i=0; i < available.size(); ++i) { - ChannelID code = available.at(i); - schema::Channel & chan = schema::channel[code]; -// if (!chan.enabled()) continue; - QString data; - if ( - ( code == CPAP_UserFlag1 || code == CPAP_UserFlag2) && - ( ( !p_profile->cpap->userEventFlagging()) || (p_profile->cpap->clinicalMode())) ){ - continue; - } - float channelHours = hours; - if (chan.machtype() != MT_CPAP) { - // Use device type hours (if available) rather than CPAP hours, since - // might have Oximetry (for example) longer or shorter than CPAP - channelHours = day->hours(chan.machtype()); - if (channelHours <= 0) { - channelHours = hours; - } - } - if (chan.type() == schema::SPAN) { - val = (100.0 / channelHours)*(day->sum(code)/3600.0); - data = QString("%1%").arg(val,0,'f',2); - } else if (code == CPAP_VSnore2) { // TODO: This should be generalized rather than special-casing a single channel here. - val = day->sum(code) / channelHours; - data = QString("%1").arg(val,0,'f',2); - } else { - val = day->count(code) / channelHours; - data = QString("%1").arg(val,0,'f',2); - } - // TODO: percentage would be another useful option here for things like - // percentage of patient-triggered breaths, which is much more useful - // than the duration of timed breaths per hour. - values[code] = val; - QString tooltip=schema::channel[code].description(); - tooltip.replace("'", "'"); - QColor altcolor = (brightness(chan.defaultColor()) < 0.3) ? Qt::white : Qt::black; // pick a contrasting color - html+=QString("") - .arg(chan.defaultColor().name()) - .arg(altcolor.name()) - .arg(chan.fullname()) - .arg(data) - .arg(code) - .arg(tooltip); - } - - html+="
%3%4
"; - -#ifndef COMBINE_MODE_3 - if (!leftSideBarEnable[LSB_SLEEPTIME_INDICES] ) -#else - if (!leftSideBarEnable[LSB_MACHINE_INFO] ) -#endif - { - return QString(); // must calculate values first for pie chart. - } - - return html; -} - - -void Daily::htmlLsbSectionHeaderInit (bool section) { - if (!section) { - leftSideBarEnable.fill(true); // turn all sections On - //leftSideBarEnable.fill(false); // turn all sections off for testing - } - htmlLsbPrevSectionHeader = true; -} - -void Daily::htmlLsbSectionHeader (QString&html , const QString& name,LEFT_SIDEBAR checkBox) { - QString handle = "leftsidebarenable"; - bool on = leftSideBarEnable[checkBox]; // this section is enabled - bool prev = htmlLsbPrevSectionHeader; // prev section will be displayed - // only false when just section name is display - // true when full section should be displayed. - htmlLsbPrevSectionHeader = on; - - if ( (!prev) && on) { - html+="
"; - } - // DEBUGFC Q(checkBox) O(prev) O("==>") O(on) O(name) ; - - html += QString( - "" - "" - "" - "" - "
" - #ifdef CONFIGURE_MODE - "" "" - #else - " " - #endif - "" - "" - "%1" - "
\n" - ) - .arg(name) - .arg(on ? "on" : "off") - .arg(checkBox); -} - QString Daily::getPieChart (float values, Day * day) { - QString pieChartName = tr("Event Breakdown"); - QString html ; - htmlLsbSectionHeader(html , pieChartName,LSB_PIE_CHART ); - if (!leftSideBarEnable[LSB_PIE_CHART] ) { - return html; - } - html += ""; +// qDebug() << "Daily:getPieChart, values" << values; + QString html = "
"; if (values > 0) { - html += QString("").arg(""); +// html += ""; + html += QString("").arg(tr("Event Breakdown")); eventBreakdownPie()->setShowTitle(false); int w=155; @@ -1652,12 +1504,7 @@ QString Daily::getPieChart (float values, Day * day) { QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray buffer.open(QIODevice::WriteOnly); pixmap.save(&buffer, "PNG"); - // Close section where pie chart is pressed - html += QString("\n") - .arg("leftsidebarenable=%1").arg(LSB_PIE_CHART) - ; + html += "\n"; } else { html += "\n"; } @@ -1808,9 +1655,10 @@ void Daily::Load(QDate date) // TODO: Eventually we should get isBrick from the loader, since some summary days // on a non-brick might legitimately have no graph data. bool gotsome = false; - for (int i = 0; i < ahiChannels.size() && !gotsome ; i++) { - gotsome = p_profile->hasChannel(ahiChannels.at(i)); - } + for (int i = 0; i < ahiChannels.size(); i++) + gotsome = gotsome || p_profile->hasChannel(ahiChannels.at(i)); + +// if (!p_profile->hasChannel(CPAP_Obstructive) && !p_profile->hasChannel(CPAP_Hypopnea) && !p_profile->hasChannel(CPAP_AllApnea) && !p_profile->hasChannel(CPAP_ClearAirway)) { if (!gotsome) { GraphView->setEmptyText(STR_Empty_Brick); @@ -1825,22 +1673,99 @@ void Daily::Load(QDate date) modestr=schema::channel[CPAP_Mode].m_options[mode]; + EventDataType ahi=day->count(AllAhiChannels); + if (p_profile->general->calculateRDI()) ahi+=day->count(CPAP_RERA); + ahi/=hours; + if (hours>0) { - htmlLeftAHI= getAHI(day,isBrick); + htmlLeftAHI="
%1
 
%1
" - "" - "
"+tr("Unable to display Pie Chart on this system")+"
\n"; + + // Show application font, for debugging font issues + // QString appFont = QApplication::font().toString(); + // htmlLeftAHI+=QString("").arg(appFont); + + htmlLeftAHI+=""; + if (!isBrick) { + ChannelID ahichan=CPAP_AHI; + QString ahiname=STR_TR_AHI; + if (p_profile->general->calculateRDI()) { + ahichan=CPAP_RDI; + ahiname=STR_TR_RDI; + } + htmlLeftAHI+=QString("\n") + .arg("#F88017").arg(COLOR_Text.name()).arg(ahiname).arg(schema::channel[ahichan].fullname()).arg(ahi,0,'f',2); + } else { + htmlLeftAHI+=QString("\n") + .arg("#F88017").arg(tr("This CPAP device does NOT record detailed data")); + } + htmlLeftAHI+="\n"; + htmlLeftAHI+="
%1

%3

  %5		%2
\n"; htmlLeftMachineInfo = getCPAPInformation(day); - htmlLsbSectionHeaderInit(); - htmlLeftSleepTime = getSleepTime(day); + htmlLeftIndices = "\n"; + + quint32 zchans = schema::SPAN | schema::FLAG; + bool show_minors = false; // true; + if (p_profile->general->showUnknownFlags()) zchans |= schema::UNKNOWN; + + if (show_minors) zchans |= schema::MINOR_FLAG; + QList available = day->getSortedMachineChannels(zchans); + + EventDataType val; QHash values; - htmlLeftIndices = getIndices(day,values); + for (int i=0; i < available.size(); ++i) { + ChannelID code = available.at(i); + schema::Channel & chan = schema::channel[code]; +// if (!chan.enabled()) continue; + QString data; + if ( + ( code == CPAP_UserFlag1 || code == CPAP_UserFlag2) && + ( ( !p_profile->cpap->userEventFlagging()) || (p_profile->cpap->clinicalMode())) ){ + continue; + } + float channelHours = hours; + if (chan.machtype() != MT_CPAP) { + // Use device type hours (if available) rather than CPAP hours, since + // might have Oximetry (for example) longer or shorter than CPAP + channelHours = day->hours(chan.machtype()); + if (channelHours <= 0) { + channelHours = hours; + } + } + if (chan.type() == schema::SPAN) { + val = (100.0 / channelHours)*(day->sum(code)/3600.0); + data = QString("%1%").arg(val,0,'f',2); + } else if (code == CPAP_VSnore2) { // TODO: This should be generalized rather than special-casing a single channel here. + val = day->sum(code) / channelHours; + data = QString("%1").arg(val,0,'f',2); + } else { + val = day->count(code) / channelHours; + data = QString("%1").arg(val,0,'f',2); + } + // TODO: percentage would be another useful option here for things like + // percentage of patient-triggered breaths, which is much more useful + // than the duration of timed breaths per hour. + values[code] = val; + QString tooltip=schema::channel[code].description(); + tooltip.replace("'", "'"); + QColor altcolor = (brightness(chan.defaultColor()) < 0.3) ? Qt::white : Qt::black; // pick a contrasting color + htmlLeftIndices+=QString("") + .arg(chan.defaultColor().name()) + .arg(altcolor.name()) + .arg(chan.fullname()) + .arg(data) + .arg(code) + .arg(tooltip); + } + + htmlLeftIndices+="
%3%4
"; htmlLeftPieChart = getPieChart((values[CPAP_Obstructive] + values[CPAP_Hypopnea] + values[CPAP_AllApnea] + values[CPAP_ClearAirway] + values[CPAP_Apnea] + values[CPAP_RERA] + values[CPAP_FlowLimit] + values[CPAP_SensAwake]), day); - htmlLsbSectionHeaderInit(); } else { // No hours htmlLeftNoHours+="\n"; @@ -1861,7 +1786,7 @@ void Daily::Load(QDate date) htmlLeftNoHours+="\n"; } htmlLeftNoHours+="\n"; - htmlLeftNoHours+="
"+tr("Complain to your Equipment Provider!")+"
 
\n"; + htmlLeftNoHours+="
\n"; } } // if (!CPAP) diff --git a/oscar/daily.h b/oscar/daily.h index 8c6edf2b..1ef8efc3 100644 --- a/oscar/daily.h +++ b/oscar/daily.h @@ -21,7 +21,6 @@ #include #include #include -#include #include "SleepLib/profiles.h" #include "mainwindow.h" @@ -323,7 +322,7 @@ private: DailySearchTab* dailySearchTab = nullptr; - QString getAHI (Day * day, bool isBrick); + //QString getLeftAHI (Day * day); QString getSessionInformation(Day *); QString getMachineSettings(Day *); QString getStatisticsInfo(Day *); @@ -331,7 +330,7 @@ private: QString getOximeterInformation(Day *); QString getEventBreakdown(Day *); QString getPieChart(float values, Day *); - QString getIndices(Day * day, QHash& values ); + //QString getIndicesAndPie(Day *, float hours, bool isBrick); QString getSleepTime(Day *); QString getLeftSidebar (bool honorPieChart); @@ -376,20 +375,6 @@ private: bool BookmarksChanged; SaveGraphLayoutSettings* saveGraphLayoutSettings=nullptr; - - enum LEFT_SIDEBAR { LSB_FIRST , - LSB_MACHINE_INFO , - LSB_SLEEPTIME_INDICES , - LSB_PIE_CHART , - LSB_STATISTICS , - LSB_OXIMETER_INFORMATION , - LSB_DEVICE_SETTINGS , - LSB_SESSION_INFORMATION , - LSB_END_SIZE }; - QBitArray leftSideBarEnable = QBitArray(LSB_END_SIZE,true); - void htmlLsbSectionHeader (QString& html, const QString& name,LEFT_SIDEBAR checkBox) ; - void htmlLsbSectionHeaderInit (bool section=true) ; - bool htmlLsbPrevSectionHeader = true; }; #endif // DAILY_H