From b22007358fad52c26f6b8bebf5f2cb83c1be64d5 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 28 Jun 2011 19:19:35 +1000 Subject: [PATCH] Foobar removed from all Daily graphs bar Event Flags --- Graphs/gFooBar.cpp | 1 + Graphs/gXAxis.cpp | 6 +++++- Graphs/gXAxis.h | 2 +- Graphs/graphwindow.cpp | 27 ++++++++++----------------- daily.cpp | 19 +++++++++++-------- daily.ui | 2 +- docs/index.html | 2 +- 7 files changed, 30 insertions(+), 29 deletions(-) diff --git a/Graphs/gFooBar.cpp b/Graphs/gFooBar.cpp index c6a6d13d..969d641f 100644 --- a/Graphs/gFooBar.cpp +++ b/Graphs/gFooBar.cpp @@ -32,6 +32,7 @@ void gFooBar::Plot(gGraphWindow & w,float scrx,float scry) QColor & col1=color[0]; QColor & col2=color[1]; + glDisable(GL_DEPTH_TEST); float h=m_offset; glColor4ub(col1.red(),col1.green(),col1.blue(),col1.alpha()); diff --git a/Graphs/gXAxis.cpp b/Graphs/gXAxis.cpp index 5778f808..d5554cef 100644 --- a/Graphs/gXAxis.cpp +++ b/Graphs/gXAxis.cpp @@ -126,10 +126,14 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry) int hour,minute,second,millisecond; QDateTime d; + // Need to use Qpainter clipping.. + // messy. :( glScissor(w.GetLeftMargin()-20,0,width+20,w.GetBottomMargin()); glEnable(GL_SCISSOR_TEST); - for (double i=st; i<=maxx+min_tick/10.0; i+=min_tick) { + //const double extra=min_tick/10.0; + const double extra=0; + for (double i=st; i<=maxx+extra; i+=min_tick) { d=QDateTime::fromMSecsSinceEpoch(i*86400000.0); if (show_time) { diff --git a/Graphs/gXAxis.h b/Graphs/gXAxis.h index 104436c7..24fd51f0 100644 --- a/Graphs/gXAxis.h +++ b/Graphs/gXAxis.h @@ -14,7 +14,7 @@ class gXAxis:public gLayer gXAxis(QColor col=QColor("black")); virtual ~gXAxis(); virtual void Plot(gGraphWindow & w,float scrx,float scry); - static const int Margin=40; // How much room does this take up. (Bottom margin) + static const int Margin=25; // How much room does this take up. (Bottom margin) void SetShowMinorLines(bool b) { m_show_minor_lines=b; }; void SetShowMajorLines(bool b) { m_show_major_lines=b; }; bool ShowMinorLines() { return m_show_minor_lines; }; diff --git a/Graphs/graphwindow.cpp b/Graphs/graphwindow.cpp index de618eda..5344c630 100644 --- a/Graphs/graphwindow.cpp +++ b/Graphs/graphwindow.cpp @@ -36,9 +36,7 @@ gGraphWindow::gGraphWindow(QWidget *parent, const QString & title, QGLContext * m_scrX = m_scrY = 100; m_title=title; m_mouseRDown=m_mouseLDown=false; - //SetBackgroundColour( *wxWHITE ); SetMargins(10, 15, 0, 0); - //m_block_move=false; m_block_zoom=false; m_drag_foobar=false; m_foobar_pos=0; @@ -50,17 +48,12 @@ gGraphWindow::gGraphWindow(QWidget *parent, const QString & title, QGLContext * if (!title.isEmpty()) { AddLayer(new gTitle(title)); } - //SetBackgroundStyle(wxBG_STYLE_CUSTOM); - } + gGraphWindow::~gGraphWindow() { for (list::iterator l=layers.begin();l!=layers.end();l++) delete (*l); layers.clear(); - /* if (shared_context) { - delete shared_context; - shared_context=NULL; - }*/ } #include "gXAxis.h" @@ -73,7 +66,8 @@ void gGraphWindow::AddLayer(gLayer *l) { qWarning("Can only have one gXAxis per graph"); return; } - if (m_marginBottom(l)) { @@ -81,7 +75,8 @@ void gGraphWindow::AddLayer(gLayer *l) { qWarning("Can only have one gFooBar per graph"); return; } - if (m_marginBottom(l)) { @@ -89,7 +84,8 @@ void gGraphWindow::AddLayer(gLayer *l) { qWarning("Can only have one gYAxis per graph"); return; } - if (m_marginLeft(l)) { @@ -97,7 +93,8 @@ void gGraphWindow::AddLayer(gLayer *l) { qWarning("Can only have one gGraphTitle per graph"); return; } - if (m_marginLeftNotifyGraphWindow(this); @@ -135,11 +132,7 @@ void gGraphWindow::ZoomXPixels(int x1, int x2) } } - //if (m_block_zoom) { - // Refresh(false); //Rect(m_mouseRBrect,false); - //} else { - SetXBounds(rx1,rx2); - //} + SetXBounds(rx1,rx2); } void gGraphWindow::ZoomXPixels(int x1,int x2,double &rx1,double &rx2) { diff --git a/daily.cpp b/daily.cpp index d1a06833..0afd54bb 100644 --- a/daily.cpp +++ b/daily.cpp @@ -65,13 +65,15 @@ Daily::Daily(QWidget *parent,QGLContext *context) : AddCPAPData(flags[7]=new FlagData(PRS1_PressurePulse,1)); AddCPAPData(flags[8]=new FlagData(PRS1_VSnore2,1)); AddCPAPData(flags[9]=new FlagData(PRS1_Unknown0E,1)); - AddCPAPData(frw=new WaveData(CPAP_FlowRate)); + AddGraph(SF=new gGraphWindow(gSplitter,tr("Event Flags"),(QGLWidget *)NULL)); - int sfc=7; + SF->SetLeftMargin(SF->GetLeftMargin()+gYAxis::Margin); SF->SetBlockZoom(true); SF->AddLayer(new gXAxis()); + bool extras=true; + int sfc=7; if (extras) { sfc+=2; SF->AddLayer(new gFlagsLine(flags[9],QColor("dark green"),"U0E",8,sfc)); @@ -94,7 +96,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) : AddGraph(PRD=new gGraphWindow(gSplitter,tr("Pressure"),SF)); PRD->AddLayer(new gXAxis()); PRD->AddLayer(new gYAxis()); - PRD->AddLayer(new gFooBar()); + //PRD->AddLayer(new gFooBar()); PRD->AddLayer(new gLineChart(prd,QColor("dark green"),4096,false,false,true)); PRD->AddLayer(new gLineChart(pressure_iap,Qt::blue,4096,false,true,true)); PRD->AddLayer(new gLineChart(pressure_eap,Qt::red,4096,false,true,true)); @@ -106,14 +108,15 @@ Daily::Daily(QWidget *parent,QGLContext *context) : AddGraph(LEAK=new gGraphWindow(gSplitter,tr("Leaks"),SF)); LEAK->AddLayer(new gXAxis()); LEAK->AddLayer(new gYAxis()); - LEAK->AddLayer(new gFooBar()); + //LEAK->AddLayer(new gFooBar()); LEAK->AddLayer(new gLineChart(leakdata,QColor("purple"),4096,false,false,false)); LEAK->setMinimumHeight(150); + AddCPAPData(frw=new WaveData(CPAP_FlowRate)); AddGraph(FRW=new gGraphWindow(gSplitter,tr("Flow Rate"),SF)); - FRW->AddLayer(new gFooBar()); + //FRW->AddLayer(new gFooBar()); FRW->AddLayer(new gYAxis()); FRW->AddLayer(new gXAxis()); FRW->AddLayer(new gLineOverlayBar(flags[0],QColor("light green"),"CSR")); @@ -139,7 +142,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) : AddGraph(SNORE=new gGraphWindow(gSplitter,tr("Snore"),SF)); SNORE->AddLayer(new gXAxis()); SNORE->AddLayer(new gYAxis()); - SNORE->AddLayer(new gFooBar()); + //SNORE->AddLayer(new gFooBar()); SNORE->AddLayer(new gLineChart(snore,Qt::black,4096,false,false,true)); SNORE->setMinimumHeight(150); @@ -150,7 +153,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) : AddGraph(PULSE=new gGraphWindow(gSplitter,tr("Pulse"),SF)); PULSE->AddLayer(new gXAxis()); PULSE->AddLayer(new gYAxis()); - PULSE->AddLayer(new gFooBar()); + // PULSE->AddLayer(new gFooBar()); PULSE->AddLayer(new gLineChart(pulse,Qt::red,65536,false,false,true)); PULSE->setMinimumHeight(150); @@ -161,7 +164,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) : AddGraph(SPO2=new gGraphWindow(gSplitter,tr("SpO2"),SF)); SPO2->AddLayer(new gXAxis()); SPO2->AddLayer(new gYAxis()); - SPO2->AddLayer(new gFooBar()); + // SPO2->AddLayer(new gFooBar()); SPO2->AddLayer(new gLineChart(spo2,Qt::blue,65536,false,false,true)); SPO2->setMinimumHeight(150); SPO2->LinkZoom(PULSE); diff --git a/daily.ui b/daily.ui index ffe21a21..9d60de03 100644 --- a/daily.ui +++ b/daily.ui @@ -263,7 +263,7 @@ - U + u diff --git a/docs/index.html b/docs/index.html index e3c56989..93fb3cc2 100644 --- a/docs/index.html +++ b/docs/index.html @@ -11,7 +11,7 @@ p,a,td,body { font-size: 14px }  
-

This software assists you in reviewing data at home for your CPAP Machine, Oximeter, Sleep Stage monitors, as well as help you track general issues related to sleep health.

+

This software is designed to assist you in reviewing data for your CPAP Machine, Oximeter, and Sleep Stage monitors, as well as help you track general issues related to sleep health.

Currenly supports the following machines:

  • Philips Respironics System One
  • Contec CMS50 Oximeters