Stop weekends showing in red, plus added GraphView groups, also Pulse/SPO2/Plethy graphs

Graphs/gGraphView.cpp

@@ -142,7 +142,7 @@ EventDataType LayerGroup::Maxy()
 
 
 
-gGraph::gGraph(gGraphView *graphview,QString title,int height) :
+gGraph::gGraph(gGraphView *graphview,QString title,int height,short group) :
     m_graphview(graphview),
     m_title(title),
     m_height(height),
@@ -150,8 +150,9 @@ gGraph::gGraph(gGraphView *graphview,QString title,int height) :
 {
     m_min_height=50;
     m_layers.clear();
+
     if (graphview) {
-        graphview->AddGraph(this);
+        graphview->AddGraph(this,group);
     } else {
         qWarning() << "gGraph created without a gGraphView container.. Naughty programmer!! Bad!!!";
     }
@@ -357,7 +358,7 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
                     min_x=rmax_x-xx;
                 }
                 //if (a2>rmax_x) a2=rmax_x;
-                m_graphview->SetXBounds(min_x,max_x);
+                m_graphview->SetXBounds(min_x,max_x,m_group);
             } else {
                 qint64 qq=rmax_x-rmin_x;
                 xx=max_x-min_x;
@@ -374,7 +375,7 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
                     max_x=rmax_x;
                     min_x=rmax_x-xx;
                 }
-                m_graphview->SetXBounds(min_x,max_x);
+                m_graphview->SetXBounds(min_x,max_x,m_group);
 
             }
 
@@ -446,7 +447,7 @@ void gGraph::mouseReleaseEvent(QMouseEvent * event)
             qint64 a1=MIN(j1,j2)
             qint64 a2=MAX(j1,j2)
             if (a2>rmax_x) a2=rmax_x;
-            m_graphview->SetXBounds(a1,a2);
+            m_graphview->SetXBounds(a1,a2,m_group);
         } else {
             double xx=rmax_x-rmin_x;
             double xmult=xx/double(w);
@@ -455,7 +456,7 @@ void gGraph::mouseReleaseEvent(QMouseEvent * event)
             qint64 a1=MIN(j1,j2)
             qint64 a2=MAX(j1,j2)
             if (a2>rmax_x) a2=rmax_x;
-            m_graphview->SetXBounds(a1,a2);
+            m_graphview->SetXBounds(a1,a2,m_group);
         }
         return;
     }
@@ -528,7 +529,7 @@ void gGraph::ZoomX(double mult,int origin_px)
         max=rmax_x;
         min=max-q;
     }
-    m_graphview->SetXBounds(min,max);
+    m_graphview->SetXBounds(min,max,m_group);
     //updateSelectionTime(max-min);
 }
 
@@ -697,9 +698,11 @@ void gGraphView::DrawTextQue()
             painter.translate(-q.x, -q.y);
         }
         q.text.clear();
+        //q.text.squeeze();
     }
     painter.end();
     glPopAttrib();
+    qDebug() << "rendered" << m_textque_items << "text items";
     m_textque_items=0;
 }
 
@@ -718,9 +721,10 @@ void gGraphView::AddTextQue(QString & text, short x, short y, float angle, QColo
     m_textque_items++;
 }
 
-void gGraphView::AddGraph(gGraph *g)
+void gGraphView::AddGraph(gGraph *g,short group)
 {
     if (!m_graphs.contains(g)) {
+        g->setGroup(group);
         m_graphs.push_back(g);
 
         updateScrollBar();
@@ -770,18 +774,20 @@ void gGraphView::scrollbarValueChanged(int val)
     m_offsetY=val;
     updateGL(); // do this on a timer?
 }
-void gGraphView::ResetBounds()
+void gGraphView::ResetBounds(short group)
 {
     for (int i=0;i<m_graphs.size();i++) {
-        m_graphs[i]->ResetBounds();
+        if (m_graphs[i]->group()==group)
+            m_graphs[i]->ResetBounds();
     }
     updateScale();
 }
 
-void gGraphView::SetXBounds(qint64 minx, qint64 maxx)
+void gGraphView::SetXBounds(qint64 minx, qint64 maxx,short group)
 {
     for (int i=0;i<m_graphs.size();i++) {
-        m_graphs[i]->SetXBounds(minx,maxx);
+        if (m_graphs[i]->group()==group)
+            m_graphs[i]->SetXBounds(minx,maxx);
     }
     updateGL();
 }

Graphs/gGraphView.h

@@ -112,7 +112,7 @@ class gGraph
 {
     friend class gGraphView;
 public:
-    gGraph(gGraphView * graphview=NULL, QString title="",int height=100);
+    gGraph(gGraphView * graphview=NULL, QString title="",int height=100,short group=0);
     virtual ~gGraph();
 
     void setVisible(bool b) { m_visible=b; }
@@ -160,6 +160,9 @@ public:
     void setBlockZoom(bool b) { m_blockzoom=b; }
     int flipY(int y); // flip GL coordinates
 
+    short group() { return m_group; }
+    void setGroup(short group) { m_group=group; }
+
 protected:
     virtual void paint(int originX, int originY, int width, int height);
     void invalidate();
@@ -190,6 +193,7 @@ protected:
     QRect m_selection;
     bool m_selecting_area;
     QPoint m_current;
+    short m_group;
 };
 
 class gGraphView : public QGLWidget
@@ -198,7 +202,7 @@ class gGraphView : public QGLWidget
 public:
     explicit gGraphView(QWidget *parent = 0);
     virtual ~gGraphView();
-    void AddGraph(gGraph *g);
+    void AddGraph(gGraph *g,short group=0);
 
     void setScrollBar(MyScrollBar *sb);
     MyScrollBar * scrollBar() { return m_scrollbar; }
@@ -209,8 +213,8 @@ public:
 
     float scaleY() { return m_scaleY; }
 
-    void ResetBounds();
+    void ResetBounds(short group=0);
-    void SetXBounds(qint64 minx, qint64 maxx);
+    void SetXBounds(qint64 minx, qint64 maxx, short group=0);
 
     bool hasGraphs() { return m_graphs.size()>0; }
 

daily.cpp

@@ -76,6 +76,11 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw)
     FLG=new gGraph(GraphView,"Flow Limitation",180);
     PTB=new gGraph(GraphView,"Patient Trig. Breath",180);
 
+    PULSE=new gGraph(GraphView,"Pulse",180,1);
+    SPO2=new gGraph(GraphView,"SPO2",180,1);
+    PLETHY=new gGraph(GraphView,"Plethy",180,1);
+
+
     gFlagsGroup *fg=new gFlagsGroup();
     fg->AddLayer((new gFlagsLine(CPAP_CSR,QColor("light green"),"CSR",false,FT_Span)));
     fg->AddLayer((new gFlagsLine(CPAP_ClearAirway,QColor("purple"),"CA",true)));
@@ -163,6 +168,23 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw)
     FLG->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
     FLG->AddLayer(new gXAxis(),LayerBottom,0,20);
 
+
+    PULSE->AddLayer(new gXGrid());
+    PULSE->AddLayer(AddOXI(new gLineChart(OXI_Pulse,Qt::red,true)));
+    PULSE->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
+    PULSE->AddLayer(new gXAxis(),LayerBottom,0,20);
+
+    SPO2->AddLayer(new gXGrid());
+    SPO2->AddLayer(AddOXI(new gLineChart(OXI_SPO2,Qt::blue,true)));
+    SPO2->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
+    SPO2->AddLayer(new gXAxis(),LayerBottom,0,20);
+
+    PLETHY->AddLayer(new gXGrid());
+    PLETHY->AddLayer(AddOXI(new gLineChart(OXI_Plethysomogram,Qt::darkBlue,false)));
+    PLETHY->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
+    PLETHY->AddLayer(new gXAxis(),LayerBottom,0,20);
+
+
     //AddGraph(SF);
     //AddGraph(FRW);
     //AddGraph(PRD);
@@ -177,6 +199,13 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw)
 
     layout->layout();
 
+    QTextCharFormat format = ui->calendar->weekdayTextFormat(Qt::Saturday);
+    format.setForeground(QBrush(Qt::black, Qt::SolidPattern));
+    ui->calendar->setWeekdayTextFormat(Qt::Saturday, format);
+    ui->calendar->setWeekdayTextFormat(Qt::Sunday, format);
+
+    ui->tabWidget->setCurrentWidget(ui->details);
+
 
 /*    scrollArea=new MyScrollArea(ui->graphMainArea,this);
 =======
@@ -529,12 +558,6 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw)
     //splitter->update();
 
 
-    QTextCharFormat format = ui->calendar->weekdayTextFormat(Qt::Saturday);
-    format.setForeground(QBrush(Qt::black, Qt::SolidPattern));
-    ui->calendar->setWeekdayTextFormat(Qt::Saturday, format);
-    ui->calendar->setWeekdayTextFormat(Qt::Sunday, format);
-
-    ui->tabWidget->setCurrentWidget(ui->details);
 
     if (mainwin) {
         show_graph_menu=mainwin->CreateMenu("Graphs");

mainwindow.ui

@@ -566,7 +566,7 @@
      <x>0</x>
      <y>0</y>
      <width>930</width>
-     <height>25</height>
+     <height>24</height>
     </rect>
    </property>
    <property name="sizePolicy">