Make Graph preferences, heights and orders persistant

Graphs/gGraphView.cpp

@@ -10,6 +10,7 @@
 #include "SleepLib/profiles.h"
 #include <QTimer>
 #include <QLabel>
+#include <QDir>
 
 #ifdef Q_WS_MAC
 #define USE_RENDERTEXT
@@ -896,10 +897,8 @@ gGraph::gGraph(gGraphView *graphview,QString title,int height,short group) :
     m_quad=new GLShortBuffer(64,GL_QUADS);
     m_quad->forceAntiAlias(true);
     f_miny=f_maxy=0;
-    m_forceMinY=m_forceMaxY=false;
+    m_enforceMinY=m_enforceMaxY=false;
     rec_miny=rec_maxy=0;
-    m_recMinY=true;
-    m_recMaxY=false;
 }
 gGraph::~gGraph()
 {
@@ -1507,7 +1506,7 @@ EventDataType gGraph::MinY()
 {
     bool first=true;
     EventDataType val=0,tmp;
-    if (m_forceMinY) return rmin_y=f_miny;
+    if (m_enforceMinY) return rmin_y=f_miny;
     for (QVector<Layer *>::iterator l=m_layers.begin();l!=m_layers.end();l++) {
         if ((*l)->isEmpty()) continue;
         tmp=(*l)->Miny();
@@ -1526,7 +1525,7 @@ EventDataType gGraph::MaxY()
 {
     bool first=true;
     EventDataType val=0,tmp;
-    if (m_forceMaxY) return rmax_y=f_maxy;
+    if (m_enforceMaxY) return rmax_y=f_maxy;
     for (QVector<Layer *>::iterator l=m_layers.begin();l!=m_layers.end();l++) {
         if ((*l)->isEmpty()) continue;
         tmp=(*l)->Maxy();
@@ -1599,17 +1598,24 @@ void gGraph::ToolTip(QString text, int x, int y, int timeout)
 
 void gGraph::roundY(EventDataType &miny, EventDataType &maxy)
 {
-    int m;
+    int m,t;
-    if (m_recMinY) {
+    if (rec_miny!=rec_maxy) {
-        if (miny>rec_miny)
+        miny=rec_miny;
-            miny=rec_miny;
+        maxy=rec_maxy;
-    }
+        return;
-    if (m_recMaxY) {
-        if (maxy<rec_maxy) {
-           maxy=rec_maxy;
-           return;
-        }
     }
+    if (maxy==miny) {
+        m=ceil(maxy/2.0);
+        t=m*2;
+        if (maxy==t) t+=2;
+        maxy=t;
+
+        m=floor(miny/2.0);
+        t=m*2;
+        if (miny==t) t-=2;
+        miny=t;
+        return;
+    } else
     if (maxy>500) {
         m=ceil(maxy/100.0);
         maxy=m*100;
@@ -1633,10 +1639,13 @@ void gGraph::roundY(EventDataType &miny, EventDataType &maxy)
         //if(m<0) m--;
         //miny=m*10;
     } else if (maxy>=5) {
+        if (maxy==miny) {
+            int i=maxy;
+        }
         m=ceil(maxy/5.0)+1;
         maxy=m*5;
-        //m=floor(miny/5.0);
+        m=floor(miny/5.0);
-        //miny=m*5;
+        miny=m*5;
     } else {
         if (maxy==miny && maxy==0) {
             maxy=0.5;
@@ -1649,10 +1658,9 @@ void gGraph::roundY(EventDataType &miny, EventDataType &maxy)
             miny/=4.0;
         }
     }
-    //if (m_forceMinY && miny<f_miny) miny=f_miny;
+
-    //if (m_forceMaxY && maxy>f_maxy) maxy=f_maxy;
+    if (m_enforceMinY) { miny=f_miny; }
-    if (m_forceMinY) miny=f_miny;
+    if (m_enforceMaxY) { maxy=f_maxy; }
-    if (m_forceMaxY) maxy=f_maxy;
 }
 
 gGraphView::gGraphView(QWidget *parent, gGraphView * shared) :
@@ -1801,7 +1809,11 @@ void gGraphView::addGraph(gGraph *g,short group)
     if (!m_graphs.contains(g)) {
         g->setGroup(group);
         m_graphs.push_back(g);
-
+        if (!m_graphsbytitle.contains(g->title())) {
+            m_graphsbytitle[g->title()]=g;
+        } else {
+            qDebug() << "Can't have to graphs with the same title in one GraphView!!";
+        }
        // updateScrollBar();
     }
 }
@@ -2482,3 +2494,93 @@ void MyScrollBar::SendWheelEvent(QWheelEvent * e)
 {
     wheelEvent(e);
 }
+
+const quint32 gvmagic=0x41756728;
+const quint16 gvversion=0;
+
+void gGraphView::SaveSettings(QString title)
+{
+    QString filename=PROFILE.Get("{DataFolder}")+QDir::separator()+title.toLower()+".shg";
+    QFile f(filename);
+    f.open(QFile::WriteOnly);
+    QDataStream out(&f);
+    out.setVersion(QDataStream::Qt_4_6);
+    out.setByteOrder(QDataStream::LittleEndian);
+
+    out << (quint32)gvmagic;
+    out << (quint16)gvversion;
+
+    out << (qint16)size();
+    for (qint16 i=0;i<size();i++) {
+        out << m_graphs[i]->title();
+        out << m_graphs[i]->height();
+        out << m_graphs[i]->visible();
+        out << m_graphs[i]->RecMinY();
+        out << m_graphs[i]->RecMaxY();
+    }
+
+    f.close();
+}
+
+bool gGraphView::LoadSettings(QString title)
+{
+    QString filename=PROFILE.Get("{DataFolder}")+QDir::separator()+title.toLower()+".shg";
+    QFile f(filename);
+    if (!f.exists()) return false;
+
+    f.open(QFile::ReadOnly);
+    QDataStream in(&f);
+    in.setVersion(QDataStream::Qt_4_6);
+    in.setByteOrder(QDataStream::LittleEndian);
+
+    quint32 t1;
+    quint16 t2;
+
+    in >> t1;
+    if (t1!=gvmagic) {
+        qDebug() << "gGraphView" << title << "settings magic doesn't match" << t1 << gvmagic;
+        return false;
+    }
+    in >> t2;
+    if (t2!=gvversion) {
+        qDebug() << "gGraphView" << title << "version doesn't match";
+        return false;
+    }
+
+    qint16 siz;
+    in >> siz;
+    QString name;
+    float hght;
+    bool vis;
+    EventDataType recminy,recmaxy;
+
+    QVector<gGraph *> neworder;
+    QHash<QString,gGraph *>::iterator gi;
+
+    for (int i=0;i<siz;i++) {
+        in >> name;
+        in >> hght;
+        in >> vis;
+        in >> recminy;
+        in >> recmaxy;
+        gi=m_graphsbytitle.find(name);
+        if (gi==m_graphsbytitle.end()) {
+            qDebug() << "Graph" << name << "has been renamed or removed";
+        } else {
+            gGraph *g=gi.value();
+            neworder.push_back(g);
+            g->setHeight(hght);
+            g->setVisible(vis);
+            g->setRecMinY(recminy);
+            g->setRecMaxY(recmaxy);
+        }
+    }
+
+    if (neworder.size()==m_graphs.size()) {
+        m_graphs=neworder;
+    }
+
+    f.close();
+    return true;
+}
+

Graphs/gGraphView.h

@@ -307,17 +307,21 @@ public:
     virtual void SetMaxX(qint64 v);
     virtual void SetMinY(EventDataType v);
     virtual void SetMaxY(EventDataType v);
-    virtual void forceMinY(EventDataType v) { f_miny=v; m_forceMinY=true; }
+    virtual void setForceMinY(EventDataType v) { f_miny=v; m_enforceMinY=true; }
-    virtual void forceMaxY(EventDataType v) { f_maxy=v; m_forceMaxY=true; }
+    virtual void setForceMaxY(EventDataType v) { f_maxy=v; m_enforceMaxY=true; }
-    virtual void recMinY(EventDataType v) { rec_miny=v; m_recMinY=true; }
+    virtual EventDataType forceMinY() { return rec_miny; }
-    virtual void recMaxY(EventDataType v) { rec_maxy=v; m_recMaxY=true; }
+    virtual EventDataType forceMaxY() { return rec_maxy; }
+    virtual void setRecMinY(EventDataType v) { rec_miny=v; }
+    virtual void setRecMaxY(EventDataType v) { rec_maxy=v; }
+    virtual EventDataType RecMinY() { return rec_miny; }
+    virtual EventDataType RecMaxY() { return rec_maxy; }
 
     void resize(int width, int height);      // margin recalcs..
 
     qint64 max_x,min_x,rmax_x,rmin_x;
     EventDataType max_y,min_y,rmax_y,rmin_y, f_miny, f_maxy, rec_miny, rec_maxy;
-    void unforceMinY() { m_forceMinY=false; }
+    void setEnforceMinY(bool b) { m_enforceMinY=b; }
-    void unforceMaxY() { m_forceMaxY=false; }
+    void setEnforceMaxY(bool b) { m_enforceMaxY=b; }
     bool blockZoom() { return m_blockzoom; }
     void setBlockZoom(bool b) { m_blockzoom=b; }
     int flipY(int y); // flip GL coordinates
@@ -373,8 +377,7 @@ protected:
     short m_lastx23;
     Day * m_day;
     GLBuffer * m_quad;
-    bool m_forceMinY,m_forceMaxY;
+    bool m_enforceMinY,m_enforceMaxY;
-    bool m_recMinY,m_recMaxY;
 signals:
 
 protected slots:
@@ -398,6 +401,10 @@ public:
 
     void ResetBounds(bool refresh=true); //short group=0);
     void SetXBounds(qint64 minx, qint64 maxx, short group=0,bool refresh=true);
+    void SaveSettings(QString title);
+    bool LoadSettings(QString title);
+
+    int findGraph(QString name);
 
     //bool hasGraphs() { return m_graphs.size()>0; }
 
@@ -468,6 +475,7 @@ protected:
 
     gGraphView *m_shared;       // convenient link to daily's graphs.
     QVector<gGraph *> m_graphs;
+    QHash<QString,gGraph*> m_graphsbytitle;
 
     int m_offsetY,m_offsetX;          // Scroll Offsets
     float m_scaleY;

daily.cpp

@@ -89,8 +89,8 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
     TE=new gGraph(GraphView,"Te",default_height);
     TI=new gGraph(GraphView,"Ti",default_height);
     TgMV=new gGraph(GraphView,"TgMV",default_height);
-    INTPULSE=new gGraph(GraphView,"Pulse",default_height,1);
+    INTPULSE=new gGraph(GraphView,"R-Pulse",default_height,1);
-    INTSPO2=new gGraph(GraphView,"SPO2",default_height,1);
+    INTSPO2=new gGraph(GraphView,"R-SPO2",default_height,1);
     PULSE=new gGraph(GraphView,"Pulse",default_height,1);
     SPO2=new gGraph(GraphView,"SPO2",default_height,1);
     PLETHY=new gGraph(GraphView,"Plethy",default_height,1);
@@ -204,14 +204,17 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
     SPO2->AddLayer(AddOXI(new gLineChart(OXI_SPO2,Qt::blue,square)));
     PLETHY->AddLayer(AddOXI(new gLineChart(OXI_Plethy,Qt::darkBlue,false)));
 
-    SPO2->forceMaxY(100);
+    //FRW->setRecMinY(-120);
-    SPO2->forceMinY(75);
+    //FRW->setRecMaxY(0);
-    PULSE->forceMinY(40);
 
-    LEAK->recMinY(0);
+    /*SPO2->setRecMaxY(100);
-    LEAK->recMaxY(80);
+    SPO2->setRecMinY(75);
-    PRD->recMinY(4.0);
+    PULSE->setRecMinY(40);
-    PRD->recMaxY(15.0);
+
+    LEAK->setRecMinY(0);
+    LEAK->setRecMaxY(80);
+    PRD->setRecMinY(4.0);
+    PRD->setRecMaxY(15.0); */
     for (int i=0;i<ng;i++){
         graphs[i]->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
         graphs[i]->AddLayer(new gXAxis(),LayerBottom,0,20);
@@ -240,12 +243,16 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
     ui->evViewSlider->setValue(ews);
     ui->evViewLCD->display(ews);
 
+    GraphView->LoadSettings("Daily");
+
     // TODO: Add preference to hide do this for Widget Haters..
     //ui->calNavWidget->hide();
 }
 
 Daily::~Daily()
 {
+    GraphView->SaveSettings("Daily");
+
     disconnect(ui->webView,SIGNAL(linkClicked(QUrl)),this,SLOT(on_Link_clicked(QUrl)));
     // Save any last minute changes..
     if (previous_date.isValid())

docs/channels.xml

@@ -48,7 +48,7 @@ One id code per item
   <channel id="0x1115" class="data" name="MaxLeak" details="Maximum Leak" label="MaxLeaks" unit="L/min" color="dark red"/>
   <channel id="0x1116" class="data" name="LeakFlag" details="Leak Event" label="L" unit="" color="dark blue"/>
   <channel id="0x1117" class="data" name="NRI" details="Non Responding Event" label="NRI" unit="" color="orange"/>
-  <channel id="0x1118" class="data" name="EP" details="Exhale Puff" label="EP" unit="" color="dark purple"/>
+  <channel id="0x1118" class="data" name="EP" details="Exhale Puff" label="EP" unit="" color="dark magenta"/>
 
   <channel id="0x1150" class="data" name="PRS1_00" details="Unknown 00" label="U00" unit="" color="black"/>
   <channel id="0x1151" class="data" name="PRS1_01" details="Unknown 01" label="U01" unit="" color="black"/>

docs/release_notes.html

@@ -13,8 +13,10 @@
 <li>Complete rewrite of Oximetery Tab, it's now (hopefully) working much better</li>
 <li>Sync problems with Live serial CMS50 recording fixed.</li>
 <li>Preference option to Skip Login Window</li>
-<li>Can change how much data is shown around events selected in the Event List.</li>
+<li>Can now change how much data is shown around events selected in the Event List.</li>
 <li>Import now remembers your locations.. There is a preferences tab to edit common locations</li>
+<li>New Respiratory Rate graph for PRS1 users</li>
+<li>New Graph tab in Preferences for changing individual graph settings</li>
 <li>Quite a few other little bugfixes I've forgotten about.</li>
 <br/>
 <b>What's still missing/broken?</b><br/>

overview.cpp

@@ -108,13 +108,13 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
     set->addSlice("HumidSet",QColor("blue"),ST_SETWAVG);
     set->addSlice("FlexSet",QColor("red"),ST_SETWAVG);
     //set->addSlice("PAPMode",QColor("red"),ST_SETAVG);
-    SET->forceMinY(0);
+    SET->setRecMinY(0);
-    SET->forceMaxY(5);
+    SET->setRecMaxY(5);
     SET->AddLayer(set);
 
     pr=new SummaryChart("cmH2O",GT_LINE);
-    PR->forceMinY(4.0);
+    //PR->setRecMinY(4.0);
-    //PR->forceMaxY(12.0);
+    //PR->setRecMaxY(12.0);
     pr->addSlice(CPAP_Pressure,QColor("dark green"),ST_WAVG);
     pr->addSlice(CPAP_Pressure,QColor("orange"),ST_MIN);
     pr->addSlice(CPAP_Pressure,QColor("red"),ST_MAX);
@@ -135,9 +135,12 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
     // <--- The code to the previous marker is crap
 
     report=NULL;
+
+    GraphView->LoadSettings("Overview");
 }
 Overview::~Overview()
 {
+    GraphView->SaveSettings("Overview");
     disconnect(this,SLOT(dateStart_currentPageChanged(int,int)));
     disconnect(this,SLOT(dateEnd_currentPageChanged(int,int)));
     if (report) {

oximetry.cpp

@@ -628,10 +628,12 @@ Oximetry::Oximetry(QWidget *parent,gGraphView * shared) :
     ui->RunButton->setChecked(false);
 
     ui->saveButton->setEnabled(false);
+    GraphView->LoadSettings("Oximetry");
 }
 
 Oximetry::~Oximetry()
 {
+    GraphView->SaveSettings("Oximetry");
     delete ui;
 }
 
@@ -741,12 +743,12 @@ void Oximetry::on_RunButton_toggled(bool checked)
         PULSE->SetMinX(f);
         SPO2->SetMinX(f);
 
-        PLETHY->forceMinY(0);
+        PLETHY->setForceMinY(0);
-        PLETHY->forceMaxY(128);
+        PLETHY->setForceMaxY(128);
-        PULSE->forceMinY(30);
+        PULSE->setForceMinY(30);
-        PULSE->forceMaxY(180);
+        PULSE->setForceMaxY(180);
-        SPO2->forceMinY(50);
+        SPO2->setForceMinY(50);
-        SPO2->forceMaxY(100);
+        SPO2->setForceMaxY(100);
 
         connect(oximeter,SIGNAL(dataChanged()),this,SLOT(onDataChanged()));
         connect(oximeter,SIGNAL(updatePulse(float)),this,SLOT(onPulseChanged(float)));
@@ -899,12 +901,12 @@ void Oximetry::on_import_complete(Session * session)
     PULSE->SetMaxX(l);
     SPO2->SetMaxX(l);
 
-    PLETHY->forceMinY(0);
+    PLETHY->setForceMinY(0);
-    PLETHY->forceMaxY(128);
+    PLETHY->setForceMaxY(128);
-    PULSE->forceMinY(30);
+    PULSE->setForceMinY(30);
-    PULSE->forceMaxY(180);
+    PULSE->setForceMaxY(180);
-    SPO2->forceMinY(50);
+    SPO2->setForceMinY(50);
-    SPO2->forceMaxY(100);
+    SPO2->setForceMaxY(100);
 
     PULSE->setDay(day);
     SPO2->setDay(day);

preferencesdialog.cpp

@@ -474,7 +474,7 @@ void PreferencesDialog::on_graphModel_changed(QStandardItem * item)
             ui->graphView->update();
         }  else {
             if ((val < graph->rec_maxy) || (val==0)) {
-                graph->recMinY(val);
+                graph->setRecMinY(val);
             } else {
                 graphModel->setData(index,QString::number(graph->rec_miny,'f',1));
                 ui->graphView->update();
@@ -487,7 +487,7 @@ void PreferencesDialog::on_graphModel_changed(QStandardItem * item)
             ui->graphView->update();
         }  else {
             if ((val > graph->rec_miny) || (val==0)) {
-                graph->recMaxY(val);
+                graph->setRecMaxY(val);
             } else {
                 graphModel->setData(index,QString::number(graph->rec_maxy,'f',1));
                 ui->graphView->update();
@@ -617,8 +617,8 @@ void PreferencesDialog::on_resetGraphButton_clicked()
             if (gv[j]!=NULL) {
                 for (int i=0;i<gv[j]->size();i++) {
                     gGraph *g=(*(gv[j]))[i];
-                    g->recMaxY(0);
+                    g->setRecMaxY(0);
-                    g->recMinY(0);
+                    g->setRecMinY(0);
                     g->setVisible(true);
                 }
             }