From 77e92d4b16b8510ae32ffa57ece3c2e32c4e01c4 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sat, 24 Dec 2011 00:30:49 +1000 Subject: [PATCH] Hide Oximetry data from Summary, when no oximetry data available --- daily.cpp | 2 - mainwindow.cpp | 134 ++++++++++++++++++++++++------------------------- 2 files changed, 67 insertions(+), 69 deletions(-) diff --git a/daily.cpp b/daily.cpp index c14a34b1..79745ca3 100644 --- a/daily.cpp +++ b/daily.cpp @@ -684,8 +684,6 @@ void Daily::Load(QDate date) GraphView->setEmptyText(tr("Brick Machine :(")); isBrick=true; - } else { - } mode=(CPAPMode)(int)cpap->settings_max(CPAP_Mode); diff --git a/mainwindow.cpp b/mainwindow.cpp index a87a349b..20e23185 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -584,75 +584,75 @@ void MainWindow::on_summaryButton_clicked() if (oximeters.size()>0) { QDate lastoxi=p_profile->LastDay(MT_OXIMETER); QDate firstoxi=p_profile->FirstDay(MT_OXIMETER); - html+=QString("%1").arg(tr("Oximetry Summary")); int days=PROFILE.countDays(MT_OXIMETER,firstcpap,lastcpap); - if (!days) { - html+=QString("%1").arg(tr("No Oximetry data available.")); - } else if (days==1) { - html+=QString("%1").arg(QString(tr("%1 day of Oximetry Data, on %2.")).arg(days).arg(firstoxi.toString(Qt::SystemLocaleShortDate))); - } else { - html+=QString("%1").arg(QString(tr("%1 days of Oximetry Data, between %2 and %3")).arg(days).arg(firstoxi.toString(Qt::SystemLocaleShortDate)).arg(lastoxi.toString(Qt::SystemLocaleShortDate))); - } + if (days>0) { + html+=QString("%1").arg(tr("Oximetry Summary")); + if (days==1) { + html+=QString("%1").arg(QString(tr("%1 day of Oximetry Data, on %2.")).arg(days).arg(firstoxi.toString(Qt::SystemLocaleShortDate))); + } else { + html+=QString("%1").arg(QString(tr("%1 days of Oximetry Data, between %2 and %3")).arg(days).arg(firstoxi.toString(Qt::SystemLocaleShortDate)).arg(lastoxi.toString(Qt::SystemLocaleShortDate))); + } - html+=QString("%1%2%3%4%5%6") - .arg(tr("Details")).arg(tr("Most Recent")).arg(tr("Last 7 Days")).arg(tr("Last 30 Days")).arg(tr("Last 6 months")).arg(tr("Last Year")); - QDate oxiweek=lastcpap.addDays(-7); - QDate oximonth=lastcpap.addDays(-30); - QDate oxi6month=lastcpap.addMonths(-6); - QDate oxiyear=lastcpap.addYears(-12); - if (oxiweek%1%2%3%4%5%6") - .arg(tr("Average SpO2")) - .arg(p_profile->calcWavg(OXI_SPO2,MT_OXIMETER),0,'f',3) - .arg(p_profile->calcWavg(OXI_SPO2,MT_OXIMETER,oxiweek,lastoxi),0,'f',3) - .arg(p_profile->calcWavg(OXI_SPO2,MT_OXIMETER,oximonth,lastoxi),0,'f',3) - .arg(p_profile->calcWavg(OXI_SPO2,MT_OXIMETER,oxi6month,lastoxi),0,'f',3) - .arg(p_profile->calcWavg(OXI_SPO2,MT_OXIMETER,oxiyear,lastoxi),0,'f',3); - html+=QString("%1%2%3%4%5%6") - .arg(tr("Minimum SpO2")) - .arg(p_profile->calcMin(OXI_SPO2,MT_OXIMETER),0,'f',3) - .arg(p_profile->calcMin(OXI_SPO2,MT_OXIMETER,oxiweek,lastoxi),0,'f',3) - .arg(p_profile->calcMin(OXI_SPO2,MT_OXIMETER,oximonth,lastoxi),0,'f',3) - .arg(p_profile->calcMin(OXI_SPO2,MT_OXIMETER,oxi6month,lastoxi),0,'f',3) - .arg(p_profile->calcMin(OXI_SPO2,MT_OXIMETER,oxiyear,lastoxi),0,'f',3); - html+=QString("%1%2%3%4%5%6") - .arg(tr("SpO2 Events / Hour")) - .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER)/p_profile->calcHours(MT_OXIMETER),0,'f',3) - .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER,oxiweek,lastoxi)/p_profile->calcHours(MT_OXIMETER,oxiweek,lastoxi),0,'f',3) - .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER,oximonth,lastoxi)/p_profile->calcHours(MT_OXIMETER,oximonth,lastoxi),0,'f',3) - .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER,oxi6month,lastoxi)/p_profile->calcHours(MT_OXIMETER,oxi6month,lastoxi),0,'f',3) - .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER,oxiyear,lastoxi)/p_profile->calcHours(MT_OXIMETER,oxiyear,lastoxi),0,'f',3); - html+=QString("%1%2\%%3\%%4\%%5\%%6\%") - .arg(tr("% of time in SpO2 Events")) - .arg(100.0/p_profile->calcHours(MT_OXIMETER)*p_profile->calcSum(OXI_SPO2Drop,MT_OXIMETER)/3600.0,0,'f',3) - .arg(100.0/p_profile->calcHours(MT_OXIMETER,oxiweek,lastoxi)*p_profile->calcSum(OXI_SPO2Drop,MT_OXIMETER,oxiweek,lastoxi)/3600.0,0,'f',3) - .arg(100.0/p_profile->calcHours(MT_OXIMETER,oximonth,lastoxi)*p_profile->calcSum(OXI_SPO2Drop,MT_OXIMETER,oximonth,lastoxi)/3600.0,0,'f',3) - .arg(100.0/p_profile->calcHours(MT_OXIMETER,oxi6month,lastoxi)*p_profile->calcSum(OXI_SPO2Drop,MT_OXIMETER,oxi6month,lastoxi)/3600.0,0,'f',3) - .arg(100.0/p_profile->calcHours(MT_OXIMETER,oxiyear,lastoxi)*p_profile->calcSum(OXI_SPO2Drop,MT_OXIMETER,oxiyear,lastoxi)/3600.0,0,'f',3); - html+=QString("%1%2%3%4%5%6") - .arg(tr("Average Pulse Rate")) - .arg(p_profile->calcWavg(OXI_Pulse,MT_OXIMETER),0,'f',3) - .arg(p_profile->calcWavg(OXI_Pulse,MT_OXIMETER,oxiweek,lastoxi),0,'f',3) - .arg(p_profile->calcWavg(OXI_Pulse,MT_OXIMETER,oximonth,lastoxi),0,'f',3) - .arg(p_profile->calcWavg(OXI_Pulse,MT_OXIMETER,oxi6month,lastoxi),0,'f',3) - .arg(p_profile->calcWavg(OXI_Pulse,MT_OXIMETER,oxiyear,lastoxi),0,'f',3); - html+=QString("%1%2%3%4%5%6") - .arg(tr("Minimum Pulse Rate")) - .arg(p_profile->calcMin(OXI_Pulse,MT_OXIMETER),0,'f',3) - .arg(p_profile->calcMin(OXI_Pulse,MT_OXIMETER,oxiweek,lastoxi),0,'f',3) - .arg(p_profile->calcMin(OXI_Pulse,MT_OXIMETER,oximonth,lastoxi),0,'f',3) - .arg(p_profile->calcMin(OXI_Pulse,MT_OXIMETER,oxi6month,lastoxi),0,'f',3) - .arg(p_profile->calcMin(OXI_Pulse,MT_OXIMETER,oxiyear,lastoxi),0,'f',3); - html+=QString("%1%2%3%4%5%6") - .arg(tr("Maximum Pulse Rate")) - .arg(p_profile->calcMax(OXI_Pulse,MT_OXIMETER),0,'f',3) - .arg(p_profile->calcMax(OXI_Pulse,MT_OXIMETER,oxiweek,lastoxi),0,'f',3) - .arg(p_profile->calcMax(OXI_Pulse,MT_OXIMETER,oximonth,lastoxi),0,'f',3) - .arg(p_profile->calcMax(OXI_Pulse,MT_OXIMETER,oxi6month,lastoxi),0,'f',3) - .arg(p_profile->calcMax(OXI_Pulse,MT_OXIMETER,oxiyear,lastoxi),0,'f',3); + html+=QString("%1%2%3%4%5%6") + .arg(tr("Details")).arg(tr("Most Recent")).arg(tr("Last 7 Days")).arg(tr("Last 30 Days")).arg(tr("Last 6 months")).arg(tr("Last Year")); + QDate oxiweek=lastcpap.addDays(-7); + QDate oximonth=lastcpap.addDays(-30); + QDate oxi6month=lastcpap.addMonths(-6); + QDate oxiyear=lastcpap.addYears(-12); + if (oxiweek%1%2%3%4%5%6") + .arg(tr("Average SpO2")) + .arg(p_profile->calcWavg(OXI_SPO2,MT_OXIMETER),0,'f',3) + .arg(p_profile->calcWavg(OXI_SPO2,MT_OXIMETER,oxiweek,lastoxi),0,'f',3) + .arg(p_profile->calcWavg(OXI_SPO2,MT_OXIMETER,oximonth,lastoxi),0,'f',3) + .arg(p_profile->calcWavg(OXI_SPO2,MT_OXIMETER,oxi6month,lastoxi),0,'f',3) + .arg(p_profile->calcWavg(OXI_SPO2,MT_OXIMETER,oxiyear,lastoxi),0,'f',3); + html+=QString("%1%2%3%4%5%6") + .arg(tr("Minimum SpO2")) + .arg(p_profile->calcMin(OXI_SPO2,MT_OXIMETER),0,'f',3) + .arg(p_profile->calcMin(OXI_SPO2,MT_OXIMETER,oxiweek,lastoxi),0,'f',3) + .arg(p_profile->calcMin(OXI_SPO2,MT_OXIMETER,oximonth,lastoxi),0,'f',3) + .arg(p_profile->calcMin(OXI_SPO2,MT_OXIMETER,oxi6month,lastoxi),0,'f',3) + .arg(p_profile->calcMin(OXI_SPO2,MT_OXIMETER,oxiyear,lastoxi),0,'f',3); + html+=QString("%1%2%3%4%5%6") + .arg(tr("SpO2 Events / Hour")) + .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER)/p_profile->calcHours(MT_OXIMETER),0,'f',3) + .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER,oxiweek,lastoxi)/p_profile->calcHours(MT_OXIMETER,oxiweek,lastoxi),0,'f',3) + .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER,oximonth,lastoxi)/p_profile->calcHours(MT_OXIMETER,oximonth,lastoxi),0,'f',3) + .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER,oxi6month,lastoxi)/p_profile->calcHours(MT_OXIMETER,oxi6month,lastoxi),0,'f',3) + .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER,oxiyear,lastoxi)/p_profile->calcHours(MT_OXIMETER,oxiyear,lastoxi),0,'f',3); + html+=QString("%1%2\%%3\%%4\%%5\%%6\%") + .arg(tr("% of time in SpO2 Events")) + .arg(100.0/p_profile->calcHours(MT_OXIMETER)*p_profile->calcSum(OXI_SPO2Drop,MT_OXIMETER)/3600.0,0,'f',3) + .arg(100.0/p_profile->calcHours(MT_OXIMETER,oxiweek,lastoxi)*p_profile->calcSum(OXI_SPO2Drop,MT_OXIMETER,oxiweek,lastoxi)/3600.0,0,'f',3) + .arg(100.0/p_profile->calcHours(MT_OXIMETER,oximonth,lastoxi)*p_profile->calcSum(OXI_SPO2Drop,MT_OXIMETER,oximonth,lastoxi)/3600.0,0,'f',3) + .arg(100.0/p_profile->calcHours(MT_OXIMETER,oxi6month,lastoxi)*p_profile->calcSum(OXI_SPO2Drop,MT_OXIMETER,oxi6month,lastoxi)/3600.0,0,'f',3) + .arg(100.0/p_profile->calcHours(MT_OXIMETER,oxiyear,lastoxi)*p_profile->calcSum(OXI_SPO2Drop,MT_OXIMETER,oxiyear,lastoxi)/3600.0,0,'f',3); + html+=QString("%1%2%3%4%5%6") + .arg(tr("Average Pulse Rate")) + .arg(p_profile->calcWavg(OXI_Pulse,MT_OXIMETER),0,'f',3) + .arg(p_profile->calcWavg(OXI_Pulse,MT_OXIMETER,oxiweek,lastoxi),0,'f',3) + .arg(p_profile->calcWavg(OXI_Pulse,MT_OXIMETER,oximonth,lastoxi),0,'f',3) + .arg(p_profile->calcWavg(OXI_Pulse,MT_OXIMETER,oxi6month,lastoxi),0,'f',3) + .arg(p_profile->calcWavg(OXI_Pulse,MT_OXIMETER,oxiyear,lastoxi),0,'f',3); + html+=QString("%1%2%3%4%5%6") + .arg(tr("Minimum Pulse Rate")) + .arg(p_profile->calcMin(OXI_Pulse,MT_OXIMETER),0,'f',3) + .arg(p_profile->calcMin(OXI_Pulse,MT_OXIMETER,oxiweek,lastoxi),0,'f',3) + .arg(p_profile->calcMin(OXI_Pulse,MT_OXIMETER,oximonth,lastoxi),0,'f',3) + .arg(p_profile->calcMin(OXI_Pulse,MT_OXIMETER,oxi6month,lastoxi),0,'f',3) + .arg(p_profile->calcMin(OXI_Pulse,MT_OXIMETER,oxiyear,lastoxi),0,'f',3); + html+=QString("%1%2%3%4%5%6") + .arg(tr("Maximum Pulse Rate")) + .arg(p_profile->calcMax(OXI_Pulse,MT_OXIMETER),0,'f',3) + .arg(p_profile->calcMax(OXI_Pulse,MT_OXIMETER,oxiweek,lastoxi),0,'f',3) + .arg(p_profile->calcMax(OXI_Pulse,MT_OXIMETER,oximonth,lastoxi),0,'f',3) + .arg(p_profile->calcMax(OXI_Pulse,MT_OXIMETER,oxi6month,lastoxi),0,'f',3) + .arg(p_profile->calcMax(OXI_Pulse,MT_OXIMETER,oxiyear,lastoxi),0,'f',3); + } } html+="";