From 6e64731b1fb9e006b0c2b91c23dd29e9dbac0221 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sat, 3 Dec 2011 00:36:40 +1000 Subject: [PATCH] Added Printer Dialog, variable cleanup --- daily.cpp | 8 ++------ daily.h | 2 -- mainwindow.cpp | 37 +++++++++++++++++++++++++++++-------- mainwindow.h | 2 +- overview.cpp | 39 ++++----------------------------------- overview.h | 2 -- overview.ui | 10 ---------- oximetry.cpp | 7 ++++--- 8 files changed, 40 insertions(+), 67 deletions(-) diff --git a/daily.cpp b/daily.cpp index 580e082b..03fff294 100644 --- a/daily.cpp +++ b/daily.cpp @@ -945,7 +945,6 @@ void Daily::Unload(QDate date) journal->settings["ZombieMeter"]=ui->ZombieMeter->value(); journal->SetChanged(true); } - bool ok; if (BookmarksChanged) { QVariantList start; QVariantList end; @@ -1155,6 +1154,7 @@ void Daily::RedrawGraphs() void Daily::on_treeWidget_itemClicked(QTreeWidgetItem *item, int column) { + Q_UNUSED(column); QDateTime d; if (!item->text(1).isEmpty()) { d=d.fromString(item->text(1),"yyyy-MM-dd HH:mm:ss"); @@ -1315,10 +1315,6 @@ void Daily::on_bookmarkTable_itemClicked(QTableWidgetItem *item) GraphView->updateGL(); } -void Daily::on_bookmarkTable_itemActivated(QTableWidgetItem *item) -{ -} - void Daily::on_addBookmarkButton_clicked() { qint64 st,et; @@ -1350,8 +1346,8 @@ void Daily::on_removeBookmarkButton_clicked() void Daily::on_ZombieMeter_actionTriggered(int action) { + Q_UNUSED(action); ZombieMeterMoved=true; - qDebug() << "ZombieMeter" << action; } //void Daily::on_EnergySlider_sliderMoved(int position) diff --git a/daily.h b/daily.h index f1e4cb1f..4ef8c8c6 100644 --- a/daily.h +++ b/daily.h @@ -82,8 +82,6 @@ private slots: void on_removeBookmarkButton_clicked(); - void on_bookmarkTable_itemActivated(QTableWidgetItem *item); - void on_bookmarkTable_itemClicked(QTableWidgetItem *item); void on_bookmarkTable_itemChanged(QTableWidgetItem *item); diff --git a/mainwindow.cpp b/mainwindow.cpp index d1daf145..bc391916 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -662,16 +663,36 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date) } QString username=PROFILE.Get("_{Username}_"); - QString filename=QFileDialog::getSaveFileName(this,"Select filename to save PDF report to",PREF.Get("{home}/"+name+username+date.toString(Qt::ISODate)+".pdf"),"PDF Files (*.pdf)"); - if (filename.isEmpty()) - return; - - Notify("Saving "+name+" report as \""+filename+"\"."); - //QString filename=PREF.Get("{home}/"+name+"_{user}.pdf"); - QPrinter printer(QPrinter::ScreenResolution); //QPrinter::HighResolution); //QPrinter::ScreenResolution); - printer.setOutputFileName(filename); + QPrinter printer(QPrinter::ScreenResolution); +#ifdef Q_WS_X11 + printer.setPrinterName("Print to File (PDF)"); + printer.setOutputFormat(QPrinter::PdfFormat); +#endif + printer.setPrintRange(QPrinter::AllPages); printer.setOrientation(QPrinter::Portrait); + printer.setFullPage(false); // This has nothing to do with scaling + printer.setNumCopies(1); + QString filename=PREF.Get("{home}/"+name+username+date.toString(Qt::ISODate)+".pdf");//QFileDialog::getSaveFileName(this,"Select filename to save PDF report to",,"PDF Files (*.pdf)"); + + printer.setOutputFileName(filename); + //printer.setPageMargins(10,10,10,10,QPrinter::Millimeter); + QPrintDialog *dialog = new QPrintDialog(&printer); + //printer.setOutputFileName("printYou.pdf"); + if ( dialog->exec() != QDialog::Accepted) { + return; + } + + + + //if (filename.isEmpty()) + // return; + + //Notify("Saving "+name+" report as \""+filename+"\"."); + //QString filename=PREF.Get("{home}/"+name+"_{user}.pdf"); + //QPrinter printer(QPrinter::ScreenResolution); //QPrinter::HighResolution); //QPrinter::ScreenResolution); + //printer.setOutputFileName(filename); + //printer.setOrientation(QPrinter::Portrait); QPainter painter; painter.begin(&printer); diff --git a/mainwindow.h b/mainwindow.h index 7a86ea94..9bceebfe 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -50,6 +50,7 @@ public: Overview *getOverview() { return overview; } Oximetry *getOximetry() { return oximetry; } void JumpDaily(); + void PrintReport(gGraphView *gv,QString name, QDate date=QDate::currentDate()); private slots: void on_action_Import_Data_triggered(); @@ -114,7 +115,6 @@ private slots: void on_action_Rebuild_Oximetry_Index_triggered(); private: - void PrintReport(gGraphView *gv,QString name, QDate date=QDate::currentDate()); Ui::MainWindow *ui; Daily * daily; diff --git a/overview.cpp b/overview.cpp index 54f5f342..39abb6f1 100644 --- a/overview.cpp +++ b/overview.cpp @@ -22,8 +22,8 @@ #include "Graphs/gYAxis.h" #include "Graphs/gSessionTime.h" -//#include "mainwindow.h" -//extern MainWindow * mainwin; +#include "mainwindow.h" +extern MainWindow * mainwin; //extern QProgressBar * qprogress; Overview::Overview(QWidget *parent,gGraphView * shared) : @@ -348,41 +348,10 @@ QString Overview::GetHTML() } void Overview::on_printButton_clicked() { - report->Print(GetHTML()); + mainwin->PrintReport(GraphView,"Overview"); + //report->Print(GetHTML()); } -void Overview::on_htmlButton_clicked() -{ - QString filename; - - for (int i=0;isize();i++) { - gGraph *g=(*GraphView)[i]; - if (g->isEmpty()) continue; - if (!g->visible()) continue; - - g->deselect(); - QPixmap pm=g->renderPixmap(1024,512); - filename=PREF.Get("{home}/graph_"+g->title()+".png"); - pm.save(filename,"png"); - } - - //QString filename=QFileDialog::getSaveFileName(this,tr("Save PNG Test"),PREF.Get("{home}"),tr("PNG Pictures(*.png)")); - //if (!filename.isEmpty()) { -// pm.save(filename,"png"); -// } - - /*QString html=GetHTML(); - QString filename=QFileDialog::getSaveFileName(this,tr("Save HTML Report"),PREF.Get("{home}"),tr("HTML Documents (*.html)")); - if (!filename.isEmpty()) { - QFile file(filename); - file.open(QIODevice::WriteOnly); - QByteArray ba; - ba.append(html); - file.write(ba); - file.close(); - } */ - -} void Overview::ResetGraphLayout() { GraphView->resetLayout(); diff --git a/overview.h b/overview.h index 37915719..d374344f 100644 --- a/overview.h +++ b/overview.h @@ -61,8 +61,6 @@ private slots: void on_toolButton_clicked(); - void on_htmlButton_clicked(); - private: Ui::Overview *ui; gGraphView *GraphView; diff --git a/overview.ui b/overview.ui index a865a152..fdb7fc82 100644 --- a/overview.ui +++ b/overview.ui @@ -114,16 +114,6 @@ - - - - Save a HTML report - - - HTML - - - diff --git a/oximetry.cpp b/oximetry.cpp index a3080aab..be441794 100644 --- a/oximetry.cpp +++ b/oximetry.cpp @@ -165,7 +165,7 @@ void SerialOximeter::onReadyRead() void SerialOximeter::addPulse(qint64 time, EventDataType pr) { static EventDataType lastpr=0; - EventDataType min=0,max=0; + //EventDataType min=0,max=0; if (pr>0) { if (lastpr==0) { if (pulse->count()==0) @@ -195,7 +195,7 @@ void SerialOximeter::addPulse(qint64 time, EventDataType pr) void SerialOximeter::addSpO2(qint64 time, EventDataType o2) { static EventDataType lasto2=0; - EventDataType min=0,max=0; + //EventDataType min=0,max=0; if (o2>0) { if (lasto2==0) { if (spo2->count()==0) @@ -385,6 +385,7 @@ void CMS50Serial::on_import_process() bool first=true; while (i<(size-3)) { a=data.at(i++); + Q_UNUSED(a); pl=data.at(i++) ^ 0x80; o2=data.at(i++); if (pl!=0) { @@ -581,7 +582,7 @@ void CMS50Serial::onReadyRead() } } } - static unsigned char b1[6]={0xf5,0xf5,0xf5,0xf5,0xf5,0xf5}; + //static unsigned char b1[6]={0xf5,0xf5,0xf5,0xf5,0xf5,0xf5}; if (import_mode && waitf6 && (cntf6==0)) { failcnt++;