chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

More refactoring and re-organizing.

Browse Source
This commit is contained in:
Seeker4 2019-06-12 13:32:22 -07:00
parent a628e2a9ff
commit 575b9a5372
4 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
oscar/mainwindow.cpp
View File

@ -1076,6 +1076,13 @@ void MainWindow::setRecBoxHTML(QString html)
{ {
ui->recordsBox->setHtml(html); ui->recordsBox->setHtml(html);
} }
void MainWindow::setStatsHTML(QString html)
{
ui->statisticsView->setHtml(html);
}
/*** /***
QString MainWindow::getWelcomeHTML() QString MainWindow::getWelcomeHTML()
{ {
@ -2308,14 +2315,13 @@ void MainWindow::GenerateStatistics()
ui->statEndDate->setMaximumDate(last); ui->statEndDate->setMaximumDate(last);
Statistics stats; Statistics stats;
QString html = stats.GenerateHTML(); QString htmlStats = stats.GenerateHTML();
QString htmlRecords = stats.UpdateRecordsBox();
updateFavourites(); updateFavourites();
//QWebFrame *frame=ui->statisticsView->page()->currentFrame(); setStatsHTML(htmlStats);
//frame->addToJavaScriptWindowObject("mainwin",this); setRecBoxHTML(htmlRecords);
//ui->statisticsView->setHtml(html);
ui->statisticsView->setHtml(html);
} }

3
oscar/mainwindow.h
View File

@ -160,6 +160,9 @@ class MainWindow : public QMainWindow
//! \brief Internal function to set Records Box html from statistics module //! \brief Internal function to set Records Box html from statistics module
void setRecBoxHTML(QString html); 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); int importCPAP(ImportPath import, const QString &message);
void startImportDialog() { on_action_Import_Data_triggered(); } void startImportDialog() { on_action_Import_Data_triggered(); }

54
oscar/statistics.cpp
View File

@ -23,7 +23,7 @@
extern MainWindow *mainwin; extern MainWindow *mainwin;
// HTML components that make up Statistics page and printed report // HTML components that make up Statistics page and printed report
QString htmlPageHeader = ""; // Page header QString htmlReportHeader = ""; // Page header
QString htmlUsage = ""; // CPAP and Oximetry QString htmlUsage = ""; // CPAP and Oximetry
QString htmlMachineSettings = ""; // Machine (formerly Rx) changes QString htmlMachineSettings = ""; // Machine (formerly Rx) changes
QString htmlMachines = ""; // Machines used in this profile QString htmlMachines = ""; // Machines used in this profile
@ -967,8 +967,8 @@ QString Statistics::getRDIorAHIText() {
return STR_TR_AHI; return STR_TR_AHI;
} }
// Create the HTML that will be the Statistics page. // Create the HTML for CPAP and Oximetry usage
QString Statistics::GenerateHTML() QString Statistics::GenerateCPAPUsage()
{ {
QList<Machine *> cpap_machines = p_profile->GetMachines(MT_CPAP); QList<Machine *> cpap_machines = p_profile->GetMachines(MT_CPAP);
QList<Machine *> oximeters = p_profile->GetMachines(MT_OXIMETER); QList<Machine *> oximeters = p_profile->GetMachines(MT_OXIMETER);
@ -987,15 +987,11 @@ QString Statistics::GenerateHTML()
} }
} }
// Create HTML header and <body> statement
htmlPageHeader = htmlHeader(havedata);
QString html = ""; QString html = "";
// If we don't have any data, return HTML that says that and we are done // If we don't have any data, return HTML that says that and we are done
if (!havedata) { if (!havedata) {
html += htmlNoData(); return "";
html += htmlFooter(havedata);
return htmlPageHeader + html;
} }
// Find first and last days with valid CPAP data // Find first and last days with valid CPAP data
@ -1082,19 +1078,6 @@ QString Statistics::GenerateHTML()
l = s.addDays(-1); l = s.addDays(-1);
} while ((l > first) && (j < number_periods)); } 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) { for (; j < number_periods; ++j) {
periods.push_back(Period(last,last, "")); periods.push_back(Period(last,last, ""));
} }
@ -1188,19 +1171,29 @@ QString Statistics::GenerateHTML()
html += "</table>"; html += "</table>";
html += "</div>"; html += "</div>";
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(); htmlMachineSettings = GenerateRXChanges();
htmlMachines = GenerateMachineList(); htmlMachines = GenerateMachineList();
UpdateRecordsBox(); UpdateRecordsBox();
QString htmlScript = "<script type='text/javascript' language='javascript' src='qrc:/docs/script.js'></script>"; QString htmlScript = "<script type='text/javascript' language='javascript' src='qrc:/docs/script.js'></script>";
//updateFavourites();
// html += htmlFooter(); return htmlReportHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlScript + htmlReportFooter;
return htmlPageHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlScript + htmlReportFooter;
} }
void Statistics::printReport(QWidget * parent) { void Statistics::printReport(QWidget * parent) {
@ -1245,7 +1238,7 @@ void Statistics::printReport(QWidget * parent) {
painter.begin(&printer); painter.begin(&printer);
QRect rect = printer.pageRect(); 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.resize(rect.width()/4, rect.height()/4);
b.setFrameShape(QFrame::NoFrame); b.setFrameShape(QFrame::NoFrame);
@ -1262,7 +1255,7 @@ void Statistics::printReport(QWidget * parent) {
} }
} }
void Statistics::UpdateRecordsBox() QString Statistics::UpdateRecordsBox()
{ {
QString html = "<html><head><style type='text/css'>" QString html = "<html><head><style type='text/css'>"
"p,a,td,body { font-family: '" + QApplication::font().family() + "'; }" "p,a,td,body { font-family: '" + QApplication::font().family() + "'; }"
@ -1547,7 +1540,8 @@ void Statistics::UpdateRecordsBox()
html += "</body></html>"; html += "</body></html>";
mainwin->setRecBoxHTML(html);
return html;
} }

3
oscar/statistics.h
View File

@ -169,8 +169,9 @@ class Statistics : public QObject
QString GenerateHTML(); QString GenerateHTML();
QString GenerateMachineList(); QString GenerateMachineList();
QString GenerateRXChanges(); QString GenerateRXChanges();
QString GenerateCPAPUsage();
void UpdateRecordsBox(); QString UpdateRecordsBox();
static void printReport(QWidget *parent = nullptr); static void printReport(QWidget *parent = nullptr);