From ad8edfc1e734f7be45cbf042f738375f4760e418 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 15 Jul 2011 20:01:28 +1000 Subject: [PATCH] Pathetic initial attempt at CMS50 Live Plethy --- Graphs/gLineChart.cpp | 6 ++- Graphs/graphdata.h | 57 +++++++++++++---------- SleepLib/loader_plugins/prs1_loader.cpp | 8 +++- daily.cpp | 10 +++- docs/index.html | 5 +- mainwindow.cpp | 12 ++--- oximetry.cpp | 61 +++++++++++++++++++++---- 7 files changed, 113 insertions(+), 46 deletions(-) diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp index 8b6c311a..74fbf7cb 100644 --- a/Graphs/gLineChart.cpp +++ b/Graphs/gLineChart.cpp @@ -27,13 +27,17 @@ gLineChart::~gLineChart() // Time Domain Line Chart void gLineChart::Plot(gGraphWindow & w,float scrx,float scry) { - if (!m_visible) return; if (!data) return; if (!data->IsReady()) return; + if (w.Title()=="Plethysomogram") { + int q=0; + } else { +// qDebug() << w.Title(); + } int start_px=w.GetLeftMargin(), start_py=w.GetBottomMargin(); diff --git a/Graphs/graphdata.h b/Graphs/graphdata.h index f67969f7..26602fa4 100644 --- a/Graphs/graphdata.h +++ b/Graphs/graphdata.h @@ -21,45 +21,52 @@ public: gGraphData(int mp,gDataType t=gDT_Point); virtual ~gGraphData(); - virtual void Reload(Day *day=NULL) { day=day; }; + virtual void Reload(Day *day=NULL) { day=day; } virtual void Update(Day *day=NULL); - //inline wxRealPoint & operator [](int i) { return vpoint[seg][i]; }; - //inline vector & Vec(int i) { return yaxis[i]; }; + //inline wxRealPoint & operator [](int i) { return vpoint[seg][i]; } + //inline vector & Vec(int i) { return yaxis[i]; } - //virtual inline const int & NP(int i) { return vnp[i]; }; - //virtual inline const int & MP(int i) { return vsize[i]; }; - inline const gDataType & Type() { return type; }; + //virtual inline const int & NP(int i) { return vnp[i]; } + //virtual inline const int & MP(int i) { return vsize[i]; } + inline const gDataType & Type() { return type; } - virtual inline double MaxX() { return max_x; }; - virtual inline double MinX() { return min_x; }; - virtual inline double MaxY() { return max_y; }; - virtual inline double MinY() { return min_y; }; - virtual inline void SetMaxX(double v) { max_x=v; if (max_x>real_max_x) max_x=real_max_x; }; - virtual inline void SetMinX(double v) { min_x=v; if (min_xreal_max_y) max_y=real_max_y; }; - virtual inline void SetMinY(double v) { min_y=v; if (min_yreal_max_x) max_x=real_max_x; } + virtual inline void SetMinX(double v) { min_x=v; if (min_xreal_max_y) max_y=real_max_y; } + virtual inline void SetMinY(double v) { min_y=v; if (min_y np; vector maxsize; - bool IsReady() { return m_ready; }; + bool IsReady() { return m_ready; } + void SetReady(bool b) { m_ready=b; } bool isEmpty(); void AddLayer(gLayer *g); protected: - virtual void AddSegment(int max_points) { max_points=max_points; }; + virtual void AddSegment(int max_points) { max_points=max_points; } double real_min_x, real_max_x, real_min_y, real_max_y; double min_x, max_x, min_y, max_y; diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp index 1f668e08..da9f5164 100644 --- a/SleepLib/loader_plugins/prs1_loader.cpp +++ b/SleepLib/loader_plugins/prs1_loader.cpp @@ -612,10 +612,14 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,qint64 } break; case 0x0e: // Unknown - data[0]=buffer[pos++]; // << 8) | buffer[pos]; - data[1]=buffer[pos++]; + data[0]=buffer[pos++]; + data[1]=buffer[pos++]; //(buffer[pos+1] << 8) | buffer[pos]; + //data[0]/=10.0; + //pos+=2; data[2]=buffer[pos++]; session->AddEvent(new Event(t,cpapcode, data, 3)); + //tt-=data[1]*1000; + //session->AddEvent(new Event(t,CPAP_CSR, data, 2)); break; case 0x10: // Unknown data[0]=buffer[pos++]; // << 8) | buffer[pos]; diff --git a/daily.cpp b/daily.cpp index 9cd83fee..f7f988f8 100644 --- a/daily.cpp +++ b/daily.cpp @@ -518,7 +518,15 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day) } QStringList a; QDateTime d=QDateTime::fromMSecsSinceEpoch(t); - a.append(QString("#%1: %2").arg((int)++mccnt[code],(int)3,(int)10,QChar('0')).arg(d.toString("HH:mm:ss"))); + QString s=QString("#%1: %2").arg((int)++mccnt[code],(int)3,(int)10,QChar('0')).arg(d.toString("HH:mm:ss")); + if ((code==PRS1_Unknown0E) || (code==PRS1_Unknown10) || (code==PRS1_Unknown0B)) { + s.append(" "+QString::number((*(*e))[0])); + s.append(" "+QString::number((*(*e))[1])); + } + if ((code==PRS1_Unknown0E) || (code==PRS1_Unknown10)) { + s.append(" "+QString::number((*(*e))[2])); + } + a.append(s); a.append(d.toString("yyyy-MM-dd HH:mm:ss")); mcr->addChild(new QTreeWidgetItem(a)); } diff --git a/docs/index.html b/docs/index.html index ceab6c86..c9025c9c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -15,6 +15,7 @@ p,a,td,body { font-size: 14px }
  • Philips Respironics System One (Including ASV models)
  • ResMed S9 models (AutoSet and lower)
  • Contec CMS50 Oximeters
    • +

    This is a developer preview, features are missing and bugs will be plentyful.

    Project Website: http://sleepyhead.sourceforge.net
    About Sleep Apnea: http://en.wikipedia.org/wiki/Sleep_apnea
    CPAPTalk Forum: http://www.cpaptalk.com

    @@ -27,8 +28,8 @@ p,a,td,body { font-size: 14px }

    Copyright: ©2011 Mark Watkins (jedimark)

    -

    License: This software is released freely under the GNU Public License.

    -

    It would very unwise to rely solely on this software when making medical decisions. Talk to your doctor.

    +

    License: This software is released freely under the GNU Public License. +

    Do NOT rely on this softwares accuracy when making medical decisions. Talk to your doctor.

    diff --git a/mainwindow.cpp b/mainwindow.cpp index b9af67d9..4c6e7115 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -218,12 +218,12 @@ void MainWindow::on_webView_loadProgress(int progress) void MainWindow::on_action_About_triggered() { - QString msg=tr("

    SleepyHead v0.8.0

    \ -Copyright ©2011 Mark Watkins (jedimark)
    \n\ -http://sleepyhead.sourceforge.net
    \ -This software is released under the GNU Public License
    \ -This software comes with absolutely no warranty, either express of implied. It comes with no guarantee of fitness for any particular purpose. No guarantees are made regarding the accuracy of any data this program displays.\ -
    "); + QString msg=tr("

    SleepyHead v0.8.0

    " +"Copyright ©2011 Mark Watkins (jedimark)
    \n" +"http://sleepyhead.sourceforge.net
    " +"This software is released under the GNU Public License
    " +"This software comes with absolutely no warranty, either express of implied. It comes with no guarantee of fitness for any particular purpose. No guarantees are made regarding the accuracy of any data this program displays." +"
    "); QMessageBox msgbox(QMessageBox::Information,tr("About SleepyHead"),"",QMessageBox::Ok,this); msgbox.setTextFormat(Qt::RichText); msgbox.setText(msg); diff --git a/oximetry.cpp b/oximetry.cpp index 2ece7278..1a77213b 100644 --- a/oximetry.cpp +++ b/oximetry.cpp @@ -38,7 +38,7 @@ Oximetry::Oximetry(QWidget *parent) : PULSE->setMinimumHeight(150); AddData(spo2=new WaveData(OXI_SPO2)); - SPO2=new gGraphWindow(gSplitter,tr("SPO2"),(QGLWidget *)NULL); + SPO2=new gGraphWindow(gSplitter,tr("SPO2"),PULSE); SPO2->AddLayer(new gXAxis()); SPO2->AddLayer(new gYAxis()); SPO2->AddLayer(new gFooBar()); @@ -46,18 +46,23 @@ Oximetry::Oximetry(QWidget *parent) : SPO2->setMinimumHeight(150); AddData(plethy=new WaveData(OXI_Plethy)); - PLETHY=new gGraphWindow(gSplitter,tr("Plethysomogram"),(QGLWidget *)NULL); - PLETHY->AddLayer(new gXAxis()); + plethy->AddSegment(1000000); + plethy->np[0]=0; + plethy->SetMaxY(100); + plethy->SetMinY(0); + PLETHY=new gGraphWindow(gSplitter,tr("Plethysomogram"),PULSE); + //PLETHY->AddLayer(new gXAxis()); PLETHY->AddLayer(new gYAxis()); PLETHY->AddLayer(new gFooBar()); - PLETHY->AddLayer(new gLineChart(plethy,Qt::red,65536,false,false,false)); + PLETHY->AddLayer(new gLineChart(plethy,Qt::red,65536,true,false,false)); PLETHY->setMinimumHeight(150); + PLETHY->SetBlockZoom(true); portname=""; + gSplitter->addWidget(PLETHY); gSplitter->addWidget(PULSE); gSplitter->addWidget(SPO2); - gSplitter->addWidget(PLETHY); on_RefreshPortsButton_clicked(); } @@ -151,6 +156,44 @@ void Oximetry::onReadyRead() int a = port->bytesAvailable(); bytes.resize(a); port->read(bytes.data(), bytes.size()); + + static qint64 starttime=0; + static qint64 lasttime=0; + static int idx=0; + if (!lasttime) { + lasttime=QDateTime::currentMSecsSinceEpoch(); + starttime=lasttime; + + plethy->SetRealMinX(double(lasttime)/86400000.0); + plethy->SetRealMaxX(double(lasttime+1800000)/86400000.0); + plethy->SetMinX(double(lasttime)/86400000.0); + plethy->SetMaxX(double(lasttime+600000)/86400000.0); + plethy->SetRealMinY(0); + plethy->SetRealMaxY(120); + plethy->SetMaxY(120); + plethy->SetMinY(0); + PLETHY->MinX(); + PLETHY->MaxX(); + PLETHY->RealMinX(); + PLETHY->RealMaxX(); + PLETHY->MinY(); + PLETHY->MaxY(); + plethy->SetReady(true); + plethy->SetVC(1); + plethy->np[0]=600; + } + + if (bytes.size()==3) { + EventDataType d=bytes[1] & 0x7f; + plethy->point[0][idx].setX(double(lasttime)/86400000.0); + plethy->point[0][idx++].setY(d); + lasttime+=1000; + if (idx>600) { + idx=0; + lasttime=starttime; + } + PLETHY->updateGL(); + } /*if (portmode!=PM_RECORDING) { return; } @@ -169,11 +212,11 @@ void Oximetry::onReadyRead() lastspo2=bytes[1]; } else { qDebug() << "bytes read:" << bytes.size(); */ - QString aa; - for (int i=0;i