diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp index b36afa6e..a7f7274e 100644 --- a/oscar/statistics.cpp +++ b/oscar/statistics.cpp @@ -24,6 +24,7 @@ extern MainWindow *mainwin; // HTML components that make up Statistics page and printed report QString htmlReportHeader = ""; // Page header +QString htmlReportHeaderPrint = ""; // Page header QString htmlUsage = ""; // CPAP and Oximetry QString htmlMachineSettings = ""; // Machine (formerly Rx) changes QString htmlMachines = ""; // Machines used in this profile @@ -624,17 +625,53 @@ QString Statistics::getUserInfo () { const QString table_width = "width=99%"; // Create the page header in HTML. Includes everything from through -QString Statistics::generateHeader(bool showheader) +QString Statistics::generateHeader(bool onScreen) { QString html = QString("")+ + "" + + "" + + "" + "" ""; QPixmap logoPixmap(":/icons/logo-lg.png"); - if (showheader) { - html += "
" + html += "
" "" "" "" "
" + getUserInfo() + "" @@ -646,7 +683,7 @@ QString Statistics::generateHeader(bool showheader) "
" "
"; - } + return html; } @@ -1182,6 +1219,7 @@ QString Statistics::GenerateCPAPUsage() QString Statistics::GenerateHTML() { htmlReportHeader = generateHeader(true); + htmlReportHeaderPrint = generateHeader(false); htmlReportFooter = generateFooter(true); htmlUsage = GenerateCPAPUsage(); @@ -1230,12 +1268,13 @@ void Statistics::printReport(QWidget * parent) { doc.setPageSize(printArea); // Set document to print area, removing default 2cm margins qDebug() << "print area" << printArea; - QFont font = doc.defaultFont(); +// QFont font = doc.defaultFont(); + QFont font = QFont("Helvetica"); font.setPointSize(10 * (printArea.width()/1200.0)); // Scale the font doc.setDefaultFont(font); qDebug() << "selected printer font is" << doc.defaultFont(); - doc.setHtml(htmlReportHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlReportFooter); + doc.setHtml(htmlReportHeaderPrint + htmlUsage + htmlMachineSettings + htmlMachines + htmlReportFooter); doc.print(&printer); }