chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-17 19:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve Statistics printing

Browse Source 
Adjust font sizing and scaling algorithm to printe more uniform reports on different platforms
This commit is contained in:
Guy Scharf 2020-06-09 12:07:55 -07:00
parent e635bd9a0f
commit 488425df80
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
oscar/statistics.cpp
View File

@ -1320,6 +1320,8 @@ void Statistics::printReport(QWidget * parent) {
QTextDocument doc; QTextDocument doc;
QSizeF printArea = printer.pageRect(QPrinter::Point).size(); QSizeF printArea = printer.pageRect(QPrinter::Point).size();
printArea.setWidth(printArea.width()*2); // scale up for better font appearance
printArea.setHeight(printArea.height()*2);
doc.setPageSize(printArea); // Set document to print area, in pixels, removing default 2cm margins doc.setPageSize(printArea); // Set document to print area, in pixels, removing default 2cm margins
qDebug() << "print area (in points)" << printArea; qDebug() << "print area (in points)" << printArea;
@ -1327,12 +1329,12 @@ void Statistics::printReport(QWidget * parent) {
// Determine appropriate font and font size // Determine appropriate font and font size
QFont font = QFont("Helvetica"); QFont font = QFont("Helvetica");
float fontScalar = 11.5; float fontScalar = 12;
float printWidth = printArea.width(); float printWidth = printArea.width();
if (printWidth > 600) if (printWidth > 1000)
printWidth = 600 + (printWidth - 600) * 0.90; // Increase font for wide paper (landscape), but not linearly printWidth = 1000 + (printWidth - 1000) * 0.90; // Increase font for wide paper (landscape), but not linearly
float pointSize = roundf(printWidth / fontScalar) / 10.0; float pointSize = (printWidth / fontScalar) / 10.0;
font.setPointSizeF(pointSize); // Scale the font font.setPointSize(round(pointSize)); // Scale the font
doc.setDefaultFont(font); doc.setDefaultFont(font);
qDebug() << "Printer font set to" << font << "and printer default font is now" << doc.defaultFont(); qDebug() << "Printer font set to" << font << "and printer default font is now" << doc.defaultFont();