From 575b9a5372895ec6898b3e7f0f2e56469da65392 Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Wed, 12 Jun 2019 13:32:22 -0700 Subject: [PATCH] More refactoring and re-organizing. --- oscar/mainwindow.cpp | 16 +++++++++---- oscar/mainwindow.h | 3 +++ oscar/statistics.cpp | 54 ++++++++++++++++++++------------------------ oscar/statistics.h | 3 ++- 4 files changed, 40 insertions(+), 36 deletions(-) diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index 143e6809..a1d5e7ee 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -1076,6 +1076,13 @@ void MainWindow::setRecBoxHTML(QString html) { ui->recordsBox->setHtml(html); } + +void MainWindow::setStatsHTML(QString html) +{ + ui->statisticsView->setHtml(html); +} + + /*** QString MainWindow::getWelcomeHTML() { @@ -2308,14 +2315,13 @@ void MainWindow::GenerateStatistics() ui->statEndDate->setMaximumDate(last); Statistics stats; - QString html = stats.GenerateHTML(); + QString htmlStats = stats.GenerateHTML(); + QString htmlRecords = stats.UpdateRecordsBox(); updateFavourites(); - //QWebFrame *frame=ui->statisticsView->page()->currentFrame(); - //frame->addToJavaScriptWindowObject("mainwin",this); - //ui->statisticsView->setHtml(html); - ui->statisticsView->setHtml(html); + setStatsHTML(htmlStats); + setRecBoxHTML(htmlRecords); } diff --git a/oscar/mainwindow.h b/oscar/mainwindow.h index 87c91448..25fe95bf 100644 --- a/oscar/mainwindow.h +++ b/oscar/mainwindow.h @@ -160,6 +160,9 @@ class MainWindow : public QMainWindow //! \brief Internal function to set Records Box html from statistics module void setRecBoxHTML(QString html); + //! \brief Internal function to set Statistics page html from statistics module + void setStatsHTML(QString html); + int importCPAP(ImportPath import, const QString &message); void startImportDialog() { on_action_Import_Data_triggered(); } diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp index b8e6cd59..545ea61f 100644 --- a/oscar/statistics.cpp +++ b/oscar/statistics.cpp @@ -23,7 +23,7 @@ extern MainWindow *mainwin; // HTML components that make up Statistics page and printed report -QString htmlPageHeader = ""; // Page header +QString htmlReportHeader = ""; // Page header QString htmlUsage = ""; // CPAP and Oximetry QString htmlMachineSettings = ""; // Machine (formerly Rx) changes QString htmlMachines = ""; // Machines used in this profile @@ -967,8 +967,8 @@ QString Statistics::getRDIorAHIText() { return STR_TR_AHI; } -// Create the HTML that will be the Statistics page. -QString Statistics::GenerateHTML() +// Create the HTML for CPAP and Oximetry usage +QString Statistics::GenerateCPAPUsage() { QList cpap_machines = p_profile->GetMachines(MT_CPAP); QList oximeters = p_profile->GetMachines(MT_OXIMETER); @@ -987,15 +987,11 @@ QString Statistics::GenerateHTML() } } - // Create HTML header and statement - htmlPageHeader = htmlHeader(havedata); QString html = ""; // If we don't have any data, return HTML that says that and we are done if (!havedata) { - html += htmlNoData(); - html += htmlFooter(havedata); - return htmlPageHeader + html; + return ""; } // Find first and last days with valid CPAP data @@ -1082,19 +1078,6 @@ QString Statistics::GenerateHTML() l = s.addDays(-1); } while ((l > first) && (j < number_periods)); -// for (; j < number_periods; ++j) { -// s=QDate(l.year(), l.month(), 1); -// if (s < first) { -// done = true; -// s = first; -// } -// if (p_profile->countDays(row.type, s, l) > 0) { -// periods.push_back(Period(s, l, s.toString("MMMM"))); -// } else { -// } -// l = s.addDays(-1); -// if (done || (l < first)) break; -// } for (; j < number_periods; ++j) { periods.push_back(Period(last,last, "")); } @@ -1188,19 +1171,29 @@ QString Statistics::GenerateHTML() html += ""; html += ""; - htmlUsage = html; + return html; +} + +// Create the HTML that will be the Statistics page. +QString Statistics::GenerateHTML() +{ + htmlReportHeader = htmlHeader(true); + htmlReportFooter = htmlFooter(true); + + htmlUsage = GenerateCPAPUsage(); + + if (htmlUsage == "") { + return htmlReportHeader + htmlNoData() + htmlReportFooter; + } htmlMachineSettings = GenerateRXChanges(); htmlMachines = GenerateMachineList(); UpdateRecordsBox(); - - QString htmlScript = ""; - //updateFavourites(); -// html += htmlFooter(); - return htmlPageHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlScript + htmlReportFooter; + + return htmlReportHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlScript + htmlReportFooter; } void Statistics::printReport(QWidget * parent) { @@ -1245,7 +1238,7 @@ void Statistics::printReport(QWidget * parent) { painter.begin(&printer); QRect rect = printer.pageRect(); - b.setHtml(htmlPageHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlReportFooter); + b.setHtml(htmlReportHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlReportFooter); b.resize(rect.width()/4, rect.height()/4); b.setFrameShape(QFrame::NoFrame); @@ -1262,7 +1255,7 @@ void Statistics::printReport(QWidget * parent) { } } -void Statistics::UpdateRecordsBox() +QString Statistics::UpdateRecordsBox() { QString html = "