diff --git a/Graphs/gBarChart.cpp b/Graphs/gBarChart.cpp index 065dfaac..4422df3a 100644 --- a/Graphs/gBarChart.cpp +++ b/Graphs/gBarChart.cpp @@ -346,7 +346,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height) } } - w.renderText(z,left,top-1); + w.renderText(z,left,top-3); } bool SummaryChart::mouseMoveEvent(QMouseEvent *event) { diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index ca2d5bd8..83d33135 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -538,10 +538,10 @@ gGraph::gGraph(gGraphView *graphview,QString title,int height,short group) : } else { qWarning() << "gGraph created without a gGraphView container.. Naughty programmer!! Bad!!!"; } - m_margintop=10; + m_margintop=12; m_marginbottom=5; - m_marginleft=5; - m_marginright=10; + m_marginleft=10; + m_marginright=15; m_selecting_area=m_blockzoom=false; m_lastx23=0; diff --git a/docs/template_overview.sht b/docs/template_overview.sht index 7d97baad..4c87aa69 100644 --- a/docs/template_overview.sht +++ b/docs/template_overview.sht @@ -6,20 +6,20 @@ - +
-

CPAP Overview

+

CPAP Overview

-
- + -
+ - +
Name:{{profile.FirstName}} {{profile.LastName}}
Address:{{profile.Address}}
Address:{{profile.Address}}
Phone:{{profile.Phone}}
Email:{{profile.EmailAddress}}
 - +
+ @@ -27,16 +27,16 @@
Gender:{{profile.Gender}}
Age:{{local.Age}} years
Height:{{profile.Height}}{{local.DistanceMeasure}}
- 		- -
{{pref.AppName}} v{{pref.VersionString}} + 		+ {{logo}} +
SleepyHead v{{pref.VersionString}}
http://sleepyhead.sf.net
Reporting from {{local.start}} to {{local.end}} -
+
diff --git a/overview.cpp b/overview.cpp index 23180de9..18515e91 100644 --- a/overview.cpp +++ b/overview.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include "overview.h" #include "ui_overview.h" #include "Graphs/gXAxis.h" @@ -226,14 +227,14 @@ void Overview::on_toolButton_clicked() GraphView->SetXBounds(d1,d2); } -void Overview::on_printButton_clicked() +QString Overview::GetHTML() { - if (!report) { report=new Report(this,profile,m_shared,this); report->hide(); } + QString html; if (report) { bc->deselect(); uc->deselect(); @@ -243,14 +244,30 @@ void Overview::on_printButton_clicked() report->ReloadGraphs(); QString reportname="overview"; - if (report->GenerateReport(reportname,ui->dateStart->date(),ui->dateEnd->date())) { - report->Print(); - } else { + html=report->GenerateReport(reportname,ui->dateStart->date(),ui->dateEnd->date()); + if (html.isEmpty()) { qDebug() << "Faulty Report" << reportname; } } + return html; +} +void Overview::on_printButton_clicked() +{ + + report->Print(GetHTML()); } -void Overview::readyToPrint(bool) +void Overview::on_htmlButton_clicked() { + 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(); + } + } diff --git a/overview.h b/overview.h index ba5eac01..94eeaf26 100644 --- a/overview.h +++ b/overview.h @@ -54,7 +54,8 @@ private slots: void on_toolButton_clicked(); - void readyToPrint(bool); + void on_htmlButton_clicked(); + private: Ui::Overview *ui; Profile *profile; @@ -67,6 +68,9 @@ private: void UpdateHTML(); void UpdateCalendarDay(QDateEdit * calendar,QDate date); + + QString GetHTML(); + //SessionTimes *session_times; //,*PRESSURE,*LEAK,*SESSTIMES; diff --git a/overview.ui b/overview.ui index 81a07a6d..d7e8ec5a 100644 --- a/overview.ui +++ b/overview.ui @@ -119,8 +119,21 @@ + + + + Save a HTML report + + + HTML + + + + + Send a Report to your Printer + &Print diff --git a/report.cpp b/report.cpp index 0f78c581..9770013e 100644 --- a/report.cpp +++ b/report.cpp @@ -156,13 +156,21 @@ QString Report::ParseTemplate(QString input) QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray buffer.open(QIODevice::WriteOnly); pixmap.save(&buffer, "PNG"); - //html += "
\n"; // - output += "
\n"; + //output += "
\n"; + output += "
\n"; } } else { qDebug() << "Graph not found" << key << "in template"; } + } else if (code=="logo") { + QPixmap pixmap(":/docs/sheep.png"); + QByteArray byteArray; + QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray + buffer.open(QIODevice::WriteOnly); + pixmap.save(&buffer, "PNG"); + output += ""; + } pos+=rx.matchedLength(); lastpos=pos; @@ -172,13 +180,13 @@ QString Report::ParseTemplate(QString input) } -bool Report::GenerateReport(QString templ,QDate start, QDate end) +QString Report::GenerateReport(QString templ,QDate start, QDate end) { //if (!m_ready) return; - //startDate=start; - //endDate=end; + startDate=start; + endDate=end; - QString filename=pref.Get("{home}/reports"); + QString filename=pref.Get("{home}/Reports"); QDir dir(filename); if (!dir.exists()) { dir.mkdir(filename); @@ -195,7 +203,7 @@ bool Report::GenerateReport(QString templ,QDate start, QDate end) } else { QString f2=":/docs/template_"+templ+".sht"; file.setFileName(f2); - if (!file.exists()) return false; + if (!file.exists()) return ""; file.open(QIODevice::ReadOnly); input=file.readAll(); file.close(); @@ -228,15 +236,14 @@ bool Report::GenerateReport(QString templ,QDate start, QDate end) //QFile file(":/docs/template_overview.sht"); //file.open(QIODevice::ReadOnly); //QString html=file.readAll(); - - QString output=ParseTemplate(html); - - ui->webView->setHtml(output); - return true; + //ui->webView->setHtml(output); + return ParseTemplate(html); } -void Report::Print() +void Report::Print(QString html) { + if (html.isEmpty()) return; + ui->webView->setHtml(html); QPrinter printer; #ifdef Q_WS_X11 printer.setPrinterName("Print to File (PDF)"); diff --git a/report.h b/report.h index 1ed13eaa..e261decf 100644 --- a/report.h +++ b/report.h @@ -11,8 +11,8 @@ namespace Ui { class Report; } -const int graph_print_width=1280; -const int graph_print_height=256; +const int graph_print_width=1024; +const int graph_print_height=150; class Daily; class Overview; @@ -23,12 +23,12 @@ class Report : public QWidget public: explicit Report(QWidget *parent, Profile * _profile, gGraphView * shared, Overview * overview); ~Report(); - bool GenerateReport(QString templ,QDate start, QDate end); + QString GenerateReport(QString templ,QDate start, QDate end); void ReloadGraphs(); QString ParseTemplate(QString input); QPixmap Snapshot(gGraph * graph); - void Print(); + void Print(QString html); private: Ui::Report *ui;