Properly Free graph objects in Reports

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;i<m_layers.size();i++) {
+        if (m_layers[i]->unref())
+            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(); }

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.

docs/template_overview.sht

@@ -13,23 +13,23 @@
                 <tr>
                     <td valign=top width=50%>
                         <table rules=none border=0 cell_padding=0 cell_spacing=0 width=100%>
-                            <tr><td>Name:</td><td>{{Profile.FirstName}} {{Profile.LastName}}</td></tr>
-                            <tr><td valign=top>Address:</td><td valign=top>{{Profile.Address}}</td></tr>
-                            <tr><td>Phone:</td><td>{{Profile.Phone}}</td></tr>
-                            <tr><td>Email:</td><td>{{Profile.EmailAddress}}</td></tr>
+                            <tr><td>Name:</td><td>{{profile.FirstName}} {{profile.LastName}}</td></tr>
+                            <tr><td valign=top>Address:</td><td valign=top>{{profile.Address}}</td></tr>
+                            <tr><td>Phone:</td><td>{{profile.Phone}}</td></tr>
+                            <tr><td>Email:</td><td>{{profile.EmailAddress}}</td></tr>
                         </table></td>
                     <td valign=top width=50%>
                         <table width=100% height=100% rules=none border=0>
-                            <tr><td>Gender:</td><td>{{Profile.Gender}}</td></tr>
+                            <tr><td>Gender:</td><td>{{profile.Gender}}</td></tr>
                             <tr><td>Age:</td><td>{{local.Age}} years</td></tr>
-                            <tr><td>Height:</td><td>{{Profile.Height}}{{local.DistanceMeasure}}</td></tr>
+                            <tr><td>Height:</td><td>{{profile.Height}}{{local.DistanceMeasure}}</td></tr>
                         </table>
                     </td>
                 </tr>
             </table>
         <td valign=center align=center>
             <img src='qrc:/docs/sheep.png' width=100px height=100px'>
-            <br/>SleepyHead v{{pref.VersionString}}
+            <br/>{{pref.AppName}} v{{pref.VersionString}}
             <br/>http://sleepyhead.sf.net
         </td>
     </tr>

overview.cpp

@@ -242,8 +242,12 @@ void Overview::on_printButton_clicked()
         npb->deselect();
 
         report->ReloadGraphs();
-        report->GenerateReport(ui->dateStart->date(),ui->dateEnd->date());
+        QString reportname="overview";
+        if (report->GenerateReport(reportname,ui->dateStart->date(),ui->dateEnd->date())) {
             report->Print();
+        } else {
+            qDebug() << "Faulty Report" << reportname;
+        }
     }
 }
 

report.cpp

@@ -9,6 +9,7 @@
 #include <QPrintDialog>
 #include <QRegExp>
 #include <QFile>
+#include <QDir>
 
 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<QString,gGraph *>::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);

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);