From a628e2a9ff1caee1eecb58b2e285e36443bfe27d Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Tue, 11 Jun 2019 16:43:13 -0700 Subject: [PATCH] Move statistics printing code from mainwindow.cpp to statistics.cpp. Abandon printing of Help subsystem pages. --- oscar/mainwindow.cpp | 66 +++----------------------------------------- oscar/statistics.cpp | 64 ++++++++++++++++++++++++++++++++++++++++++ oscar/statistics.h | 3 ++ 3 files changed, 71 insertions(+), 62 deletions(-) diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index f4f9b634..143e6809 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -1404,70 +1404,12 @@ void MainWindow::on_actionPrint_Report_triggered() Report::PrintReport(overview->graphView(), STR_TR_Overview); } else if (ui->tabWidget->currentWidget() == daily) { Report::PrintReport(daily->graphView(), STR_TR_Daily, daily->getDate()); - } else { - QPrinter printer(QPrinter::HighResolution); -#ifdef Q_WS_X11 - printer.setPrinterName("Print to File (PDF)"); - printer.setOutputFormat(QPrinter::PdfFormat); - QString name; - QString datestr; - - if (ui->tabWidget->currentWidget() == ui->statisticsTab) { - name = "Statistics"; - datestr = QDate::currentDate().toString(Qt::ISODate); - } else if (ui->tabWidget->currentWidget() == ui->helpTab) { - name = "Help"; - datestr = QDateTime::currentDateTime().toString(Qt::ISODate); - } else { name = "Unknown"; } - - QString filename = p_pref->Get("{home}/" + name + "_" + p_profile->user->userName() + "_" + datestr + ".pdf"); - - printer.setOutputFileName(filename); -#endif - printer.setPrintRange(QPrinter::AllPages); -// if (ui->tabWidget->currentWidget() == ui->statisticsTab) { -// printer.setOrientation(QPrinter::Landscape); -// } else { - printer.setOrientation(QPrinter::Portrait); - //} - printer.setFullPage(false); // This has nothing to do with scaling - printer.setNumCopies(1); - printer.setResolution(1200); - //printer.setPaperSize(QPrinter::A4); - //printer.setOutputFormat(QPrinter::PdfFormat); - printer.setPageMargins(5, 5, 5, 5, QPrinter::Millimeter); - QPrintDialog pdlg(&printer, this); - - if (pdlg.exec() == QPrintDialog::Accepted) { - - if (ui->tabWidget->currentWidget() == ui->statisticsTab) { - - QTextBrowser b; - QPainter painter; - painter.begin(&printer); - - QRect rect = printer.pageRect(); - b.setHtml(ui->statisticsView->toHtml()); - b.resize(rect.width()/4, rect.height()/4); - b.setFrameShape(QFrame::NoFrame); - - double xscale = printer.pageRect().width()/double(b.width()); - double yscale = printer.pageRect().height()/double(b.height()); - double scale = qMin(xscale, yscale); - painter.translate(printer.paperRect().x() + printer.pageRect().width()/2, printer.paperRect().y() + printer.pageRect().height()/2); - painter.scale(scale, scale); - painter.translate(-b.width()/2, -b.height()/2); - - b.render(&painter, QPoint(0,0)); - painter.end(); - + } else if (ui->tabWidget->currentWidget() == ui->statisticsTab) { + Statistics::printReport(this); #ifndef helpless - } else if (ui->tabWidget->currentWidget() == help) { - help->print(&printer); + } else if (ui->tabWidget->currentWidget() == help) { + help->print(&printer); // **** THIS DID NOT SURVIVE REFACTORING STATISTICS PRINT #endif - } - - } } } diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp index 7e187e42..b8e6cd59 100644 --- a/oscar/statistics.cpp +++ b/oscar/statistics.cpp @@ -12,6 +12,11 @@ #include #include +#include +#include +#include +#include + #include "mainwindow.h" #include "statistics.h" @@ -1198,6 +1203,65 @@ QString Statistics::GenerateHTML() return htmlPageHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlScript + htmlReportFooter; } +void Statistics::printReport(QWidget * parent) { + + QPrinter printer(QPrinter::HighResolution); +#ifdef Q_WS_X11 + printer.setPrinterName("Print to File (PDF)"); + printer.setOutputFormat(QPrinter::PdfFormat); + QString name; + QString datestr; + + if (ui->tabWidget->currentWidget() == ui->statisticsTab) { + name = "Statistics"; + datestr = QDate::currentDate().toString(Qt::ISODate); + } else if (ui->tabWidget->currentWidget() == ui->helpTab) { + name = "Help"; + datestr = QDateTime::currentDateTime().toString(Qt::ISODate); + } else { name = "Unknown"; } + + QString filename = p_pref->Get("{home}/" + name + "_" + p_profile->user->userName() + "_" + datestr + ".pdf"); + + printer.setOutputFileName(filename); +#endif + printer.setPrintRange(QPrinter::AllPages); +// if (ui->tabWidget->currentWidget() == ui->statisticsTab) { +// printer.setOrientation(QPrinter::Landscape); +// } else { + printer.setOrientation(QPrinter::Portrait); + //} + printer.setFullPage(false); // This has nothing to do with scaling + printer.setNumCopies(1); + printer.setResolution(1200); + //printer.setPaperSize(QPrinter::A4); + //printer.setOutputFormat(QPrinter::PdfFormat); + printer.setPageMargins(5, 5, 5, 5, QPrinter::Millimeter); + QPrintDialog pdlg(&printer, parent); + + if (pdlg.exec() == QPrintDialog::Accepted) { + + QTextBrowser b; + QPainter painter; + painter.begin(&printer); + + QRect rect = printer.pageRect(); + b.setHtml(htmlPageHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlReportFooter); + b.resize(rect.width()/4, rect.height()/4); + b.setFrameShape(QFrame::NoFrame); + + double xscale = printer.pageRect().width()/double(b.width()); + double yscale = printer.pageRect().height()/double(b.height()); + double scale = qMin(xscale, yscale); + painter.translate(printer.paperRect().x() + printer.pageRect().width()/2, printer.paperRect().y() + printer.pageRect().height()/2); + painter.scale(scale, scale); + painter.translate(-b.width()/2, -b.height()/2); + + b.render(&painter, QPoint(0,0)); + painter.end(); + + } +} + void Statistics::UpdateRecordsBox() { QString html = "