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

Report layout fixes

Browse Source
This commit is contained in:
Mark Watkins 2011-12-03 14:42:59 +10:00
parent c42ef53669
commit d206e98008
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mainwindow.cpp
View File

@ -676,7 +676,7 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
printer.setOrientation(QPrinter::Portrait); printer.setOrientation(QPrinter::Portrait);
printer.setFullPage(false); // This has nothing to do with scaling printer.setFullPage(false); // This has nothing to do with scaling
printer.setNumCopies(1); printer.setNumCopies(1);
//printer.setPageMargins(10,10,10,10,QPrinter::Millimeter); printer.setPageMargins(10,10,10,10,QPrinter::Millimeter);
QPrintDialog *dialog = new QPrintDialog(&printer); QPrintDialog *dialog = new QPrintDialog(&printer);
if ( dialog->exec() != QDialog::Accepted) { if ( dialog->exec() != QDialog::Accepted) {
return; return;
@ -712,16 +712,15 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
QRectF bounds=painter.boundingRect(QRectF(0,0,res.width(),50),title,QTextOption(Qt::AlignCenter)); QRectF bounds=painter.boundingRect(QRectF(0,0,res.width(),50),title,QTextOption(Qt::AlignCenter));
painter.drawText(bounds,title,QTextOption(Qt::AlignCenter)); painter.drawText(bounds,title,QTextOption(Qt::AlignCenter));
painter.setFont(*defaultfont); painter.setFont(*defaultfont);
top+=50;
if (!PROFILE["FirstName"].toString().isEmpty()) { if (!PROFILE["FirstName"].toString().isEmpty()) {
QString userinfo="Name:\t"+PROFILE["LastName"].toString()+", "+PROFILE["FirstName"].toString()+"\n"; QString userinfo="Name:\t"+PROFILE["LastName"].toString()+", "+PROFILE["FirstName"].toString()+"\n";
userinfo+="DOB:\t"+PROFILE["DOB"].toString()+"\n"; userinfo+="DOB:\t"+PROFILE["DOB"].toString()+"\n";
userinfo+="Phone:\t"+PROFILE["Phone"].toString()+"\n"; userinfo+="Phone:\t"+PROFILE["Phone"].toString()+"\n";
userinfo+="Email:\t"+PROFILE["EmailAddress"].toString()+"\n"; userinfo+="Email:\t"+PROFILE["EmailAddress"].toString()+"\n";
if (!PROFILE["Address"].toString().isEmpty()) userinfo+="\nAddress:\n"+PROFILE["Address"].toString()+"\n"; if (!PROFILE["Address"].toString().isEmpty()) userinfo+="\nAddress:\n"+PROFILE["Address"].toString()+"\n";
QRectF bounds=painter.boundingRect(QRectF(0,50,res.width(),200),userinfo,QTextOption(Qt::AlignLeft)); QRectF bounds=painter.boundingRect(QRectF(0,50,res.width(),150),userinfo,QTextOption(Qt::AlignLeft));
painter.drawText(bounds,userinfo,QTextOption(Qt::AlignLeft)); painter.drawText(bounds,userinfo,QTextOption(Qt::AlignLeft));
top=header_height;
} }
if (name=="Daily") { if (name=="Daily") {
QString cpapinfo="Date: "+date.toString(Qt::SystemLocaleLongDate)+"\n"; QString cpapinfo="Date: "+date.toString(Qt::SystemLocaleLongDate)+"\n";
@ -779,6 +778,8 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
QRectF bounds=painter.boundingRect(QRectF(250,50,res.width()-250,200),ovinfo,QTextOption(Qt::AlignLeft)); QRectF bounds=painter.boundingRect(QRectF(250,50,res.width()-250,200),ovinfo,QTextOption(Qt::AlignLeft));
painter.drawText(bounds,ovinfo,QTextOption(Qt::AlignLeft)); painter.drawText(bounds,ovinfo,QTextOption(Qt::AlignLeft));
} }
top+=150;
//top=header_height;
const int footer_height=40; const int footer_height=40;
bool first=true; bool first=true;
@ -803,7 +804,7 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
painter.drawPixmap(0,top,pm.width(),pm.height(),pm); painter.drawPixmap(0,top,pm.width(),pm.height(),pm);
top+=pm.height(); top+=pm.height();
gcnt++; gcnt++;
if ((gcnt>=graphs_per_page) || (top>(res.height()-footer_height-header_height))) { //top+pm.height()>res.height()) { if ((gcnt>=graphs_per_page) || (top+gh>(res.height()-footer_height))) { //top+pm.height()>res.height()) {
top=0; top=0;
gcnt=0; gcnt=0;
header_height=0; header_height=0;