Added Graph snapshot feature

sleepyhead/Graphs/gGraph.cpp

@@ -120,7 +120,7 @@ gGraph::gGraph(QString name, gGraphView *graphview, QString title, QString units
     if (height == 0) {
         height = p_profile->appearance->graphHeight();
     }
-    if (graphview->contains(name)) {
+    if (graphview && graphview->contains(name)) {
         qDebug() << "Trying to duplicate " << name << " when a graph with the same name already exists";
         name+="-1";
     }
@@ -144,7 +144,9 @@ gGraph::gGraph(QString name, gGraphView *graphview, QString title, QString units
         timer = new QTimer(graphview);
         connect(timer, SIGNAL(timeout()), SLOT(Timeout()));
     } else {
-        qWarning() << "gGraph created without a gGraphView container.. Naughty programmer!! Bad!!!";
+        timer = nullptr;
+        // know what I'm doing now.. ;)
+     //   qWarning() << "gGraph created without a gGraphView container.. Naughty programmer!! Bad!!!";
     }
 
     m_margintop = 14;
@@ -174,9 +176,11 @@ gGraph::~gGraph()
 
     m_layers.clear();
 
-    timer->stop();
+    if (timer) {
-    disconnect(timer, 0, 0, 0);
+        timer->stop();
-    delete timer;
+        disconnect(timer, 0, 0, 0);
+        delete timer;
+    }
 }
 void gGraph::Trigger(int ms)
 {
@@ -212,6 +216,8 @@ bool gGraph::isSelected()
 
 bool gGraph::isEmpty()
 {
+    if (m_issnapshot) return false;
+
     bool empty = true;
 
     for (QVector<Layer *>::iterator l = m_layers.begin(); l != m_layers.end(); l++) {
@@ -285,10 +291,11 @@ void gGraph::paint(QPainter &painter, const QRegion &region)
 
     //m_marginbottom=5;
 
-    //glColor4f(0,0,0,1);
     left = marginLeft(), right = marginRight(), top = marginTop(), bottom = marginBottom();
     int x = 0, y = 0;
 
+
+
     if (m_showTitle) {
         int title_x, yh;
 
@@ -302,12 +309,33 @@ void gGraph::paint(QPainter &painter, const QRegion &region)
         title_x = float(yh) * 1.5;
 
         QString & txt = title();
-        graphView()->AddTextQue(txt, marginLeft() + title_x + 4, originY + height / 2 - y / 2, 90, Qt::black, mediumfont);
+        if (!m_issnapshot) {
+             graphView()->AddTextQue(txt, marginLeft() + title_x + 4, originY + height / 2 - y / 2, 90, Qt::black, mediumfont);
+        }
 
         left += title_x;
     } else { left = 0; }
 
-    //#define DEBUG_LAYOUT
+
+    if (m_issnapshot) {
+        painter.drawPixmap(0, originY, m_snapshot);
+        QLinearGradient linearGrad(QPointF(100, 100), QPointF(width / 2, 100));
+        linearGrad.setColorAt(0, QColor(255, 150, 150,30));
+        linearGrad.setColorAt(1, QColor(255,255,255,20));
+
+        painter.fillRect(m_rect, QBrush(linearGrad));
+        painter.setFont(*defaultfont);
+        painter.setPen(QColor(0,0,0,255));
+
+        QString t = name().section(";", -1);
+
+        painter.drawText(m_rect, Qt::AlignHCenter | Qt::AlignTop, QObject::tr("Snapshot %1").arg(t));
+
+        return;
+    }
+
+
+  //  #define DEBUG_LAYOUT
 #ifdef DEBUG_LAYOUT
     QColor col = Qt::red;
     painter.setPen(col);
@@ -316,7 +344,7 @@ void gGraph::paint(QPainter &painter, const QRegion &region)
 #endif
     int tmp;
 
-    left = 0;
+   // left = 0;
 
     for (int i = 0; i < m_layers.size(); i++) {
         Layer *ll = m_layers[i];
@@ -336,7 +364,9 @@ void gGraph::paint(QPainter &painter, const QRegion &region)
 
         if (!ll->visible()) { continue; }
 
-        tmp = ll->Width() * m_graphview->printScaleX();
+        tmp = ll->Width();
+        tmp *= m_graphview->printScaleX();
+        tmp *= m_graphview->devicePixelRatio();
 
         if (ll->position() == LayerLeft) {
             QRect rect(originX + left, originY + top, tmp, height - top - bottom);
@@ -1409,3 +1439,12 @@ void gGraph::dumpInfo() {
         }
     }
 }
+
+void gGraph::setSnapshot(QPixmap &pixmap)
+{
+    m_snapshot = pixmap;
+//    m_snapshot = renderPixmap(m_rect.width(), m_rect.height(), false);
+    m_issnapshot = true;
+}
+
+

sleepyhead/Graphs/gGraph.h

@@ -282,6 +282,9 @@ class gGraph : public QObject
     bool isPinned() { return m_pinned; }
     void setPinned(bool b) { m_pinned = b; }
 
+    bool isSnapshot() { return m_issnapshot; }
+    void setSnapshot(QPixmap &pixmap);
+
     short left, right, top, bottom; // dirty magin hacks..
 
     Layer *getLineChart();
@@ -379,6 +382,9 @@ class gGraph : public QObject
 
     QString m_selDurString;
 
+    QPixmap m_snapshot;
+    bool m_issnapshot;
+
   protected slots:
     //! \brief Deselects any highlights, and schedules a main gGraphView redraw
     void Timeout();

sleepyhead/Graphs/gGraphView.cpp

@@ -353,6 +353,8 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
     context_menu = new QMenu(this);
     pin_action = context_menu->addAction(QString(), this, SLOT(togglePin()));
     pin_icon = QPixmap(":/icons/pushpin.png");
+
+    snap_action = context_menu->addAction(QString(), this, SLOT(onSnapshotGraphToggle()));
     context_menu->addSeparator();
 
     QAction * action = context_menu->addAction(tr("100% zoom level"), this, SLOT(resetZoom()));
@@ -443,9 +445,9 @@ gGraphView::~gGraphView()
 #endif
 
     // Note: This will cause a crash if two graphs accidentally have the same name
-    for (int i = 0; i < m_graphs.size(); i++) {
+    for (QList<gGraph *>::iterator g = m_graphs.begin(); g!= m_graphs.end(); ++g) {
-        delete m_graphs[i];
+        gGraph * graph = *g;
-        m_graphs[i]=NULL;
+        delete graph;
     }
 
     delete m_tooltip;
@@ -1103,7 +1105,7 @@ bool gGraphView::renderGraphs(QPainter &painter)
 
         if ((py + h + graphSpacer) >= 0) {
             w = width();
-            int tw = (g->showTitle() ? titleWidth : 0);
+            int tw = 0; // (g->showTitle() ? titleWidth : 0);
 
             queGraph(g, px + tw, py, width() - tw, h);
 
@@ -1164,7 +1166,7 @@ bool gGraphView::renderGraphs(QPainter &painter)
 
         if ((py + h + graphSpacer) >= 0) {
             w = width();
-            int tw = (g->showTitle() ? titleWidth : 0);
+            int tw = 0; //(g->showTitle() ? titleWidth : 0);
 
             queGraph(g, px + tw, py, width() - tw, h);
 
@@ -1834,6 +1836,15 @@ void gGraphView::populateMenu(gGraph * graph)
 {
     QAction * action;
 
+    if (graph->isSnapshot()) {
+        snap_action->setText(tr("Remove Snapshot"));
+        snap_action->setData(graph->name()+"|remove");
+    } else {
+        snap_action->setText(tr("Snapshot Graph"));
+        snap_action->setData(graph->name()+"|snapshot");
+    }
+
+
     // Menu title fonts
     QFont font = QApplication::font();
     font.setBold(true);
@@ -2064,6 +2075,43 @@ void gGraphView::populateMenu(gGraph * graph)
     }
 }
 
+void gGraphView::onSnapshotGraphToggle()
+{
+    QString name = snap_action->data().toString().section("|",0,0);
+    QString cmd = snap_action->data().toString().section("|",-1).toLower();
+    QHash<QString, gGraph *>::iterator it = m_graphsbyname.find(name);
+    if (it == m_graphsbyname.end()) return;
+
+    gGraph * graph = it.value();
+
+    if (cmd == "snapshot") {
+        QString newname = name+";"+QDateTime::fromMSecsSinceEpoch(graph->min_x).toString(Qt::ISODate)+" "+QDateTime::fromMSecsSinceEpoch(graph->max_x).toString(Qt::ISODate);
+
+        it = m_graphsbyname.find(newname);
+        if (it != m_graphsbyname.end()) {
+            // already a snapshot.. :-/
+            return;
+        }
+
+        QPixmap pm = graph->renderPixmap(width(), graph->m_rect.height(), false);
+        gGraph * newgraph = new gGraph(newname, nullptr, graph->title(), graph->units(), graph->height(), graph->group());
+        newgraph->setSnapshot(pm);
+        newgraph->setHeight(pm.height());
+
+        m_graphs.insert(m_graphs.indexOf(graph)+1, newgraph);
+        m_graphsbyname[newname] = newgraph;
+        newgraph->m_graphview = this;
+
+//        addGraph(newgraph);
+        updateScale();
+    } else if (cmd == "remove") {
+        m_graphsbyname.remove(graph->name());
+        m_graphs.removeAll(it.value());
+        delete graph;
+    }
+    qDebug() << cmd << name;
+}
+
 void gGraphView::onPlotsClicked(QAction *action)
 {
     QString name = action->data().toString().section("|",0,0);
@@ -3007,7 +3055,7 @@ bool gGraphView::LoadSettings(QString title)
 
     short zoomy = 0;
 
-    QVector<gGraph *> neworder;
+    QList<gGraph *> neworder;
     QHash<QString, gGraph *>::iterator gi;
 
     for (int i = 0; i < siz; i++) {

sleepyhead/Graphs/gGraphView.h

@@ -570,7 +570,7 @@ class gGraphView
     gGraphView *m_shared;
 
     //! \brief List of all graphs contained in this area
-    QVector<gGraph *> m_graphs;
+    QList<gGraph *> m_graphs;
 
     //! \brief List of all graphs contained, indexed by title
     QHash<QString, gGraph *> m_graphsbyname;
@@ -642,6 +642,8 @@ class gGraphView
     QPixmap pin_icon;
     gGraph *pin_graph;
 
+    QAction * snap_action;
+
   signals:
     void updateCurrentTime(double);
     void updateRange(double,double);
@@ -668,6 +670,7 @@ protected slots:
     void onLinesClicked(QAction *);
     void onPlotsClicked(QAction *);
     void onOverlaysClicked(QAction *);
+    void onSnapshotGraphToggle();
 };
 
 #endif // GGRAPHVIEW_H

sleepyhead/Graphs/gLineChart.cpp

@@ -425,10 +425,6 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
     EventDataType miny = m_physminy;
     EventDataType maxy = m_physmaxy;
 
-    if (m_codes[0] == CPAP_Pressure) {
-        int i=5; Q_UNUSED(i);
-    }
-
     w.roundY(miny, maxy);