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

Fix tiny x-axis font when printing, allow printing again on Mac with Qt versions > 4.8.5

Browse Source
This commit is contained in:
Mark Watkins 2013-09-14 19:36:04 +10:00
parent fd7e20b957
commit 387e250c6f
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Graphs/gGraphView.cpp
View File

@ -2034,6 +2034,9 @@ QPixmap gGraph::renderPixmap(int w, int h, bool printing)
if (!sg) if (!sg)
return QPixmap(); return QPixmap();
// Pixmap caching screws up font sizes when printing
sg->setUsePixmapCache(false);
QFont * _defaultfont=defaultfont; QFont * _defaultfont=defaultfont;
QFont * _mediumfont=mediumfont; QFont * _mediumfont=mediumfont;
QFont * _bigfont=bigfont; QFont * _bigfont=bigfont;

2
Graphs/gXAxis.cpp
View File

@ -51,6 +51,8 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
QPainter painter; // Only need this for pixmap caching QPainter painter; // Only need this for pixmap caching
// pixmap caching screws font size when printing
bool usepixmap=w.graphView()->usePixmapCache(); // Whether or not to use pixmap caching bool usepixmap=w.graphView()->usePixmapCache(); // Whether or not to use pixmap caching
if (!usepixmap || (usepixmap && w.invalidate_xAxisImage)) { if (!usepixmap || (usepixmap && w.invalidate_xAxisImage)) {

4
mainwindow.cpp
View File

@ -1668,8 +1668,8 @@ void MainWindow::updatestatusBarMessage (const QString & text)
void MainWindow::on_actionPrint_Report_triggered() void MainWindow::on_actionPrint_Report_triggered()
{ {
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
#if ((QT_VERSION <= QT_VERSION_CHECK(5, 0, 0)) && (QT_VERSION >= QT_VERSION_CHECK(4, 8, 0))) #if ((QT_VERSION <= QT_VERSION_CHECK(4, 8, 4)))
QMessageBox::information(this,tr("Printing Broken"),tr("Sorry.. Printing is currently broken on the Mac platform :-(\n\nWe are currently waiting on a Qt Library bugfix"),QMessageBox::Ok); QMessageBox::information(this,tr("Printing Disabled"),tr("Please rebuild SleepyHead with Qt 4.8.5 or greater, as printing causes a crash with this version of Qt"),QMessageBox::Ok);
return; return;
#endif #endif
#endif #endif