diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index b49aaf84..ca2d5bd8 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -338,6 +338,7 @@ Layer::Layer(ChannelID code) m_width=m_height=0; m_X=m_Y=0; m_position=LayerCenter; + m_refcount=0; } Layer::~Layer() @@ -416,6 +417,7 @@ void LayerGroup::SetDay(Day * d) void LayerGroup::AddLayer(Layer *l) { layers.push_back(l); + l->addref(); } qint64 LayerGroup::Minx() @@ -548,6 +550,11 @@ gGraph::gGraph(gGraphView *graphview,QString title,int height,short group) : } gGraph::~gGraph() { + for (int i=0;iunref()) + delete m_layers[i]; + } + m_layers.clear(); delete m_quad; } @@ -733,6 +740,7 @@ void gGraph::AddLayer(Layer * l,LayerPosition position, short width, short heigh l->setLayout(position,width,height,order); l->setMovable(movable); l->setPos(x,y); + l->addref(); m_layers.push_back(l); } void gGraph::redraw() { m_graphview->updateGL(); } diff --git a/Graphs/gGraphView.h b/Graphs/gGraphView.h index e2d9dc9b..0cba50c5 100644 --- a/Graphs/gGraphView.h +++ b/Graphs/gGraphView.h @@ -129,6 +129,9 @@ public: virtual void drawGLBuf(); + short m_refcount; + void addref() { m_refcount++; } + bool unref() { m_refcount--; if (m_refcount<=0) return true; return false; } protected: void addGLBuf(GLBuffer *buf) { mgl_buffers.push_back(buf); } //QRect bounds; // bounds, relative to top of individual graph. diff --git a/docs/template_overview.sht b/docs/template_overview.sht index 11e6287f..7d97baad 100644 --- a/docs/template_overview.sht +++ b/docs/template_overview.sht @@ -13,23 +13,23 @@ - - - - + + + +
Name:{{Profile.FirstName}} {{Profile.LastName}}
Address:{{Profile.Address}}
Phone:{{Profile.Phone}}
Email:{{Profile.EmailAddress}}
Name:{{profile.FirstName}} {{profile.LastName}}
Address:{{profile.Address}}
Phone:{{profile.Phone}}
Email:{{profile.EmailAddress}}
- + - +
Gender:{{Profile.Gender}}
Gender:{{profile.Gender}}
Age:{{local.Age}} years
Height:{{Profile.Height}}{{local.DistanceMeasure}}
Height:{{profile.Height}}{{local.DistanceMeasure}}
-
SleepyHead v{{pref.VersionString}} +
{{pref.AppName}} v{{pref.VersionString}}
http://sleepyhead.sf.net diff --git a/overview.cpp b/overview.cpp index fd53c74d..23180de9 100644 --- a/overview.cpp +++ b/overview.cpp @@ -242,8 +242,12 @@ void Overview::on_printButton_clicked() npb->deselect(); report->ReloadGraphs(); - report->GenerateReport(ui->dateStart->date(),ui->dateEnd->date()); - report->Print(); + QString reportname="overview"; + if (report->GenerateReport(reportname,ui->dateStart->date(),ui->dateEnd->date())) { + report->Print(); + } else { + qDebug() << "Faulty Report" << reportname; + } } } diff --git a/report.cpp b/report.cpp index fc3d7042..0f78c581 100644 --- a/report.cpp +++ b/report.cpp @@ -9,6 +9,7 @@ #include #include #include +#include Report::Report(QWidget *parent, Profile * _profile, gGraphView * shared, Overview * overview) : QWidget(parent), @@ -62,6 +63,7 @@ Report::Report(QWidget *parent, Profile * _profile, gGraphView * shared, Overvie Report::~Report() { + GraphView->TrashGraphs(); for (QHash::iterator g=graphs.begin();g!=graphs.end();g++) { delete g.value(); } @@ -170,14 +172,42 @@ QString Report::ParseTemplate(QString input) } -void Report::GenerateReport(QDate start, QDate end) +bool Report::GenerateReport(QString templ,QDate start, QDate end) { - if (!m_ready) return; - startDate=start; - endDate=end; + //if (!m_ready) return; + //startDate=start; + //endDate=end; - locals["start"]=startDate; - locals["end"]=endDate; + QString filename=pref.Get("{home}/reports"); + QDir dir(filename); + if (!dir.exists()) { + dir.mkdir(filename); + } + filename+="/"+templ+".sht"; + QFile file; + file.setFileName(filename); + + QByteArray input; + if (file.exists()) { + file.open(QIODevice::ReadOnly); + input=file.readAll(); + file.close(); + } else { + QString f2=":/docs/template_"+templ+".sht"; + file.setFileName(f2); + if (!file.exists()) return false; + file.open(QIODevice::ReadOnly); + input=file.readAll(); + file.close(); + file.setFileName(filename); + file.open(QIODevice::WriteOnly); + file.write(input); + file.close(); + } + QString html=input; + + locals["start"]=start; + locals["end"]=end; locals["width"]=graph_print_width-10; if ((*profile).Exists("DOB") && !(*profile)["DOB"].toString().isEmpty()) { @@ -195,20 +225,23 @@ void Report::GenerateReport(QDate start, QDate end) locals["DistanceMeasure"]="cm"; else locals["DistanceMeasure"]="inches"; } - QFile file(":/docs/template_overview.sht"); - file.open(QIODevice::ReadOnly); - QString html=file.readAll(); + //QFile file(":/docs/template_overview.sht"); + //file.open(QIODevice::ReadOnly); + //QString html=file.readAll(); QString output=ParseTemplate(html); ui->webView->setHtml(output); + return true; } void Report::Print() { QPrinter printer; - //printer.setPrinterName("Print to File (PDF)"); - //printer.setOutputFormat(QPrinter::PdfFormat); +#ifdef Q_WS_X11 + printer.setPrinterName("Print to File (PDF)"); + printer.setOutputFormat(QPrinter::PdfFormat); +#endif printer.setPrintRange(QPrinter::AllPages); printer.setOrientation(QPrinter::Portrait); //printer.setPaperSize(QPrinter::A4); diff --git a/report.h b/report.h index 09455904..1ed13eaa 100644 --- a/report.h +++ b/report.h @@ -23,7 +23,7 @@ class Report : public QWidget public: explicit Report(QWidget *parent, Profile * _profile, gGraphView * shared, Overview * overview); ~Report(); - void GenerateReport(QDate start, QDate end); + bool GenerateReport(QString templ,QDate start, QDate end); void ReloadGraphs(); QString ParseTemplate(QString input);