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

Daily report tinkering

Browse Source
This commit is contained in:
Mark Watkins 2011-12-12 13:39:00 +10:00
parent bb66402c21
commit 9e3553f709
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daily.cpp
View File

@ -1494,3 +1494,11 @@ void Daily::on_ouncesSpinBox_valueChanged(int arg1)
}
journal->SetChanged(true);
}
QString Daily::GetDetailsText()
{
ui->webView->triggerPageAction(QWebPage::SelectAll);
QString text=ui->webView->page()->selectedText();
ui->webView->triggerPageAction(QWebPage::MoveToEndOfDocument);
ui->webView->triggerPageAction(QWebPage::SelectEndOfDocument);
return text;
}

1
daily.h
View File

@ -48,6 +48,7 @@ public:
void PrintReport();
void UnitsChanged();
Session * GetJournalSession(QDate date);
QString GetDetailsText();
private slots:

30
mainwindow.cpp
View File

@ -689,14 +689,15 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
return;
}
bool print_bookmarks=false;
QString username=PROFILE.Get("_{Username}_");
QStringList booknotes;
bool print_bookmarks=false;
if (name=="Daily") {
QVariantList book_start;
journal=getDaily()->GetJournalSession(getDaily()->getDate());
if (journal && journal->settings.contains("BookmarkNotes")) {
booknotes=journal->settings["BookmarkNotes"].toStringList();
if (booknotes.size()>0) {
if (journal && journal->settings.contains("BookmarkStart")) {
book_start=journal->settings["BookmarkStart"].toList();
if (book_start.size()>0) {
if (QMessageBox::question(this,"Bookmarks","Would you like to show bookmarked areas in this report?",QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes) {
print_bookmarks=true;
}
@ -707,14 +708,15 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
QPrinter * zprinter;
bool highres;
bool aa_setting=PROFILE.ExistsAndTrue("UseAntiAliasing");
#ifdef Q_WS_MAC
highres=true;
PROFILE["HighResPrinting"]=true; // forced on
bool force_antialiasing=true;
zprinter=new QPrinter(QPrinter::HighResolution);
#else
bool force_antialiasing=PROFILE.ExistsAndTrue("UseAntiAliasing");
#endif
if (PROFILE.ExistsAndTrue("HighResPrinting")) {
zprinter=new QPrinter(QPrinter::HighResolution);
highres=true;
@ -722,12 +724,8 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
zprinter=new QPrinter(QPrinter::ScreenResolution);
highres=false;
}
bool force_antialiasing=PROFILE.ExistsAndTrue("UseAntiAliasing");
#endif
QPrinter & printer=*zprinter;;
//QPrinter printer(QPrinter::HighResolution);
#ifdef Q_WS_X11
printer.setPrinterName("Print to File (PDF)");
printer.setOutputFormat(QPrinter::PdfFormat);
@ -889,8 +887,16 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
painter.drawText(bounds,ovinfo,QTextOption(Qt::AlignLeft));
if (bounds.height()>maxy) maxy=bounds.height();
}
top+=maxy;
/*if (name=="Daily") {
QString text=getDaily()->GetDetailsText();
QRectF bounds=painter.boundingRect(QRectF(0,top,res.width(),0),text,QTextOption(Qt::AlignLeft));
painter.drawText(bounds,text,QTextOption(Qt::AlignLeft));
top+=bounds.height();
}*/
// top+=15*yscale; //spacer
//top=header_height;