From 7f0699d4266906caca65f70a1867027238baea94 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 29 Aug 2011 17:13:58 +1000 Subject: [PATCH] Ported Oximetry to new graphing system --- Graphs/gGraphView.cpp | 42 ++--- Graphs/gGraphView.h | 14 +- Graphs/gYAxis.cpp | 9 +- Graphs/glcommon.cpp | 5 +- SleepLib/event.h | 7 +- SleepLib/loader_plugins/resmed_loader.cpp | 7 +- daily.cpp | 17 +- daily.h | 4 +- daily.ui | 2 +- mainwindow.cpp | 6 +- mainwindow.ui | 6 +- oximetry.cpp | 139 ++++++++++------ oximetry.h | 19 ++- oximetry.ui | 193 ++++++++++------------ 14 files changed, 262 insertions(+), 208 deletions(-) diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index 403ff7fb..1d1f59a9 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -718,16 +718,18 @@ void gGraph::ResetBounds() } -gGraphView::gGraphView(QWidget *parent) : - QGLWidget(parent), +gGraphView::gGraphView(QWidget *parent, gGraphView * shared) : + QGLWidget(parent,shared), m_offsetY(0),m_offsetX(0),m_scaleY(1.0),m_scrollbar(NULL) { + m_shared=shared; m_sizer_index=m_graph_index=0; m_textque_items=0; m_button_down=m_graph_dragging=m_sizer_dragging=false; m_lastypos=m_lastxpos=0; m_horiz_travel=0; this->setMouseTracking(true); + m_emptytext=QObject::tr("No Data"); InitGraphs(); } gGraphView::~gGraphView() @@ -802,7 +804,7 @@ float gGraphView::totalHeight() { float th=0; for (int i=0;iisEmpty()) continue; + if (m_graphs[i]->isEmpty() || (!m_graphs[i]->visible())) continue; th += m_graphs[i]->height() + graphSpacer; } return ceil(th); @@ -812,7 +814,7 @@ float gGraphView::findTop(gGraph * graph) float th=-m_offsetY; for (int i=0;iisEmpty()) continue; + if (m_graphs[i]->isEmpty() || (!m_graphs[i]->visible())) continue; th += m_graphs[i]->height()*m_scaleY + graphSpacer; } //th-=m_offsetY; @@ -822,7 +824,7 @@ float gGraphView::scaleHeight() { float th=0; for (int i=0;iisEmpty()) continue; + if (m_graphs[i]->isEmpty() || (!m_graphs[i]->visible())) continue; th += m_graphs[i]->height() * m_scaleY + graphSpacer; } return ceil(th); @@ -884,7 +886,7 @@ void gGraphView::updateScrollBar() float h=height(); // height of main widget float vis=0; - for (int i=0;iisEmpty() ? 0 : 1; + for (int i=0;iisEmpty() || (!m_graphs[i]->visible()) ? 0 : 1; if (thisEmpty()) continue; + for (int i=0;iisEmpty() || !m_graphs[i]->visible()) continue; + numgraphs++; h=m_graphs[i]->height() * m_scaleY; // set clipping? @@ -997,7 +996,12 @@ void gGraphView::paintGL() py+=graphSpacer; py=ceil(py); } - + if (!numgraphs) { + QColor col=Qt::black; + float x,y; + GetTextExtent(m_emptytext,x,y,bigfont); + AddTextQue(m_emptytext,(width()/2)-x/2,(height()/2)+y/2,0.0,col,bigfont); + } DrawTextQue(); //glDisable(GL_TEXTURE_2D); //glDisable(GL_DEPTH_TEST); @@ -1050,7 +1054,7 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event) if (y < yy) { for (int i=m_graph_index-1;i>=0;i--) { - empty=m_graphs[i]->isEmpty(); + empty=m_graphs[i]->isEmpty() || (!m_graphs[i]->visible()); // swapping upwards. int yy2=yy-graphSpacer-m_graphs[i]->height()*m_scaleY; yy2+=m_graphs[m_graph_index]->height()*m_scaleY; @@ -1072,7 +1076,7 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event) // swapping downwards //qDebug() << "Graph Reorder" << m_graph_index; for (int i=m_graph_index+1;iisEmpty(); + empty=m_graphs[i]->isEmpty() || (!m_graphs[i]->visible()); p=m_graphs[m_graph_index]; m_graphs[m_graph_index]=m_graphs[i]; m_graphs[i]=p; @@ -1092,7 +1096,7 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event) for (int i=0; i < m_graphs.size(); i++) { - if (m_graphs[i]->isEmpty()) continue; + if (m_graphs[i]->isEmpty() || (!m_graphs[i]->visible())) continue; h=m_graphs[i]->height() * m_scaleY; if (py > height()) @@ -1133,7 +1137,7 @@ void gGraphView::mousePressEvent(QMouseEvent * event) for (int i=0;iisEmpty()) continue; + if (m_graphs[i]->isEmpty() || (!m_graphs[i]->visible())) continue; h=m_graphs[i]->height()*m_scaleY; if (py>height()) @@ -1250,7 +1254,7 @@ void gGraphView::wheelEvent(QWheelEvent * event) for (int i=0;iisEmpty()) continue; + if (m_graphs[i]->isEmpty() || (!m_graphs[i]->visible())) continue; h=m_graphs[i]->height()*m_scaleY; if (py>height()) diff --git a/Graphs/gGraphView.h b/Graphs/gGraphView.h index 7034789a..68af8206 100644 --- a/Graphs/gGraphView.h +++ b/Graphs/gGraphView.h @@ -201,7 +201,7 @@ class gGraphView : public QGLWidget { Q_OBJECT public: - explicit gGraphView(QWidget *parent = 0); + explicit gGraphView(QWidget *parent = 0,gGraphView * shared=0); virtual ~gGraphView(); void AddGraph(gGraph *g,short group=0); @@ -229,6 +229,13 @@ public: void AddTextQue(QString & text, short x, short y, float angle, QColor & color, QFont * font); int horizTravel() { return m_horiz_travel; } void DrawTextQue(); + + int size() { return m_graphs.size(); } + gGraph * operator[](int i) { return m_graphs[i]; } + + void updateScrollBar(); + void updateScale(); // update scale & Scrollbar + void setEmptyText(QString s) { m_emptytext=s; } protected: @@ -251,9 +258,8 @@ protected: virtual void wheelEvent(QWheelEvent * event); virtual void keyPressEvent(QKeyEvent * event); - void updateScrollBar(); - void updateScale(); // update scale & Scrollbar + gGraphView *m_shared; // convenient link to daily's graphs. QVector m_graphs; int m_offsetY,m_offsetX; // Scroll Offsets float m_scaleY; @@ -275,6 +281,8 @@ protected: TextQue m_textque[textque_max]; int m_textque_items; int m_lastxpos,m_lastypos; + + QString m_emptytext; signals: diff --git a/Graphs/gYAxis.cpp b/Graphs/gYAxis.cpp index 4ca81855..b4a12d14 100644 --- a/Graphs/gYAxis.cpp +++ b/Graphs/gYAxis.cpp @@ -35,6 +35,8 @@ void gXGrid::paint(gGraph & w,int left,int top, int width, int height) } double dy=maxy-miny; if (dy<=0) { + if ((maxy==0) && (miny==0)) + return; //miny=miny; maxy++; dy=1; @@ -137,8 +139,11 @@ void gXGrid::paint(gGraph & w,int left,int top, int width, int height) minorvertarray[minorvertcnt++]=left+width; minorvertarray[minorvertcnt++]=g; } + if (minorvertcnt>=maxverts) { + break; + } } - if (vertcnt>=maxverts) { + if ((majorvertcnt>=maxverts)||(minorvertcnt>=maxverts)) { qWarning() << "vertarray bounds exceeded in gYAxis for " << w.title() << "graph" << "MinY =" <setStyleHint(QFont::SansSerif,QFont::OpenGLCompatible); mediumfont->setStyleHint(QFont::SansSerif,QFont::OpenGLCompatible); - bigfont->setStyleHint(QFont::SansSerif,QFont::OpenGLCompatible); + bigfont->setStyleHint(QFont::Serif ,QFont::OpenGLCompatible); for (int i=0;im_data.size()) { + int i=0; + } + return m_count; + } void setCount(int count) { m_count=count; } inline EventStoreType raw(int i) { return m_data[i]; } diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp index f1ec23d6..d10b8783 100644 --- a/SleepLib/loader_plugins/resmed_loader.cpp +++ b/SleepLib/loader_plugins/resmed_loader.cpp @@ -785,8 +785,11 @@ bool ResmedLoader::LoadPLD(Session *sess,EDFParser &edf) a=NULL; } if (a) { - sess->setMin(code,a->min()); - sess->setMax(code,a->max()); + double min=floor(a->min()), max=ceil(a->max()); + if (min==max) max+=1; + + sess->setMin(code,min); + sess->setMax(code,max); a->setDimension(es.physical_dimension); } } diff --git a/daily.cpp b/daily.cpp index 87aea559..bf0146fe 100644 --- a/daily.cpp +++ b/daily.cpp @@ -31,7 +31,7 @@ const int min_height=150; const int default_height=150; -Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw) +Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw) :QWidget(parent),mainwin(mw), ui(new Ui::Daily) { ui->setupUi(this); @@ -197,10 +197,10 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw) NoData=new QLabel(tr("No data"),ui->graphMainArea); NoData->setAlignment(Qt::AlignCenter); - QFont font("FreeSans",20); //NoData->font(); + QFont font("Sans Serif",20); //NoData->font(); //font.setBold(true); NoData->setFont(font); - layout->addWidget(NoData,1); + layout->addWidget(NoData,0); NoData->hide(); layout->layout(); @@ -781,18 +781,17 @@ void Daily::Load(QDate date) GraphView->ResetBounds(); //GraphView->ResetBounds(1); - GraphView->updateGL(); + //GraphView->setEmptyText(tr("No Data")); //tr("No data for ")+date.toString(Qt::SystemLocaleLongDate)); if (!cpap && !oxi) { //splitter->setMinimumHeight(0); scrollbar->hide(); - GraphView->hide(); - NoData->setText(tr("No data for ")+date.toString(Qt::SystemLocaleLongDate)); - NoData->show(); + // GraphView->hide(); } else { - NoData->hide(); - GraphView->show(); + //NoData->hide(); + // GraphView->show(); scrollbar->show(); } + GraphView->updateGL(); //RedrawGraphs(); diff --git a/daily.h b/daily.h index ff928a00..8aa805f2 100644 --- a/daily.h +++ b/daily.h @@ -36,11 +36,11 @@ class Daily : public QWidget Q_OBJECT public: - explicit Daily(QWidget *parent,QGLWidget *shared,MainWindow *mw); + explicit Daily(QWidget *parent,gGraphView *shared,MainWindow *mw); ~Daily(); void ReloadGraphs(); void ResetGraphLayout(); - QGLWidget *SharedWidget() { return GraphView; } + gGraphView *SharedWidget() { return GraphView; } void RedrawGraphs(); private slots: diff --git a/daily.ui b/daily.ui index 3cdf91e6..65e54fa7 100644 --- a/daily.ui +++ b/daily.ui @@ -6,7 +6,7 @@ 0 0 - 1036 + 840 622 diff --git a/mainwindow.cpp b/mainwindow.cpp index c9dc0cb1..e4cf2b4b 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -123,10 +123,10 @@ MainWindow::MainWindow(QWidget *parent) : //overview=new Overview(ui->tabWidget,daily->SharedWidget()); //ui->tabWidget->insertTab(2,overview,tr("Overview")); - oximetry=NULL; + //oximetry=NULL; //overview=NULL; - // oximetry=new Oximetry(ui->tabWidget,daily->SharedWidget()); - //ui->tabWidget->insertTab(3,oximetry,tr("Oximetry")); + oximetry=new Oximetry(ui->tabWidget,daily->SharedWidget()); + ui->tabWidget->insertTab(3,oximetry,tr("Oximetry")); ui->tabWidget->setCurrentWidget(ui->welcome); diff --git a/mainwindow.ui b/mainwindow.ui index 84f4b371..b6a5e10a 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -6,7 +6,7 @@ 0 0 - 930 + 668 540 @@ -565,8 +565,8 @@ 0 0 - 930 - 24 + 668 + 25 diff --git a/oximetry.cpp b/oximetry.cpp index 8696a7ec..c7b1bc84 100644 --- a/oximetry.cpp +++ b/oximetry.cpp @@ -12,14 +12,14 @@ #include "Graphs/gBarChart.h" #include "Graphs/gLineChart.h" #include "Graphs/gYAxis.h" -#include "Graphs/gFooBar.h" -Oximetry::Oximetry(QWidget *parent,QGLWidget * shared) : +Oximetry::Oximetry(QWidget *parent,gGraphView * shared) : QWidget(parent), ui(new Ui::Oximetry) { + m_shared=shared; ui->setupUi(this); -/* port=NULL; + port=NULL; portname=""; QString prof=pref["Profile"].toString(); profile=Profiles::Get(prof); @@ -41,11 +41,44 @@ Oximetry::Oximetry(QWidget *parent,QGLWidget * shared) : session=new Session(mach,0); day->AddSession(session); - splitter=ui->graphLayout; - //splitter=new QSplitter(Qt::Vertical,ui->scrollArea); - //gSplitter->setStyleSheet("QSplitter::handle { background-color: 'dark grey'; }"); - //gSplitter->setHandleWidth(2); - //ui->graphLayout->addWidget(splitter); + layout=new QHBoxLayout(ui->graphArea); + layout->setSpacing(0); + layout->setMargin(0); + layout->setContentsMargins(0,0,0,0); + ui->graphArea->setLayout(layout); + ui->graphArea->setAutoFillBackground(false); + + GraphView=new gGraphView(ui->graphArea,m_shared); + GraphView->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding); + + scrollbar=new MyScrollBar(ui->graphArea); + scrollbar->setOrientation(Qt::Vertical); + scrollbar->setSizePolicy(QSizePolicy::Maximum,QSizePolicy::Expanding); + scrollbar->setMaximumWidth(20); + + GraphView->setScrollBar(scrollbar); + layout->addWidget(GraphView,1); + layout->addWidget(scrollbar,0); + + layout->layout(); + + PLETHY=new gGraph(GraphView,tr("Plethy"),120); + CONTROL=new gGraph(GraphView,tr("Control"),75); + PULSE=new gGraph(GraphView,tr("Pulse Rate"),120); + SPO2=new gGraph(GraphView,tr("SPO2"),120); + foobar=new gShadowArea(); + CONTROL->AddLayer(foobar); + Layer *cl=new gLineChart(OXI_Plethysomogram); + CONTROL->AddLayer(cl); + cl->SetDay(day); + CONTROL->setBlockZoom(true); + + for (int i=0;isize();i++) { + gGraph *g=(*GraphView)[i]; + g->AddLayer(new gXAxis(),LayerBottom,0,gXAxis::Margin); + g->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin); + g->AddLayer(new gXGrid()); + } // Create the Event Lists to store / import data ev_plethy=new EventList(OXI_Plethysomogram,EVL_Waveform,1,0,0,0,1000.0/50.0); @@ -57,41 +90,27 @@ Oximetry::Oximetry(QWidget *parent,QGLWidget * shared) : ev_spo2=new EventList(OXI_SPO2,EVL_Event,1); session->eventlist[OXI_SPO2].push_back(ev_spo2); - QWidget * parental=ui->scrollArea; plethy=new gLineChart(OXI_Plethysomogram,Qt::black,false,true); - AddGraph(PLETHY=new gGraphWindow(parental,tr("Plethysomogram"),shared)); plethy->SetDay(day); + CONTROL->AddLayer(plethy); //new gLineChart(OXI_Plethysomogram)); + + pulse=new gLineChart(OXI_Pulse,Qt::red,true); - AddGraph(PULSE=new gGraphWindow(parental,tr("Pulse Rate"),shared)); pulse->SetDay(day); spo2=new gLineChart(OXI_SPO2,Qt::blue,true); - AddGraph(SPO2=new gGraphWindow(parental,tr("SPO2"),shared)); spo2->SetDay(day); - for (int i=0;iLinkZoom(Graphs[j]); - } - Graphs[i]->AddLayer(new gYAxis()); - Graphs[i]->AddLayer(new gXAxis()); - //Graphs[i]->AddLayer(new gFooBar()); - - splitter->addWidget(Graphs[i]); - } PLETHY->AddLayer(plethy); - PLETHY->AddLayer(new gFooBar()); + PULSE->AddLayer(pulse); SPO2->AddLayer(spo2); - for (int i=0;isetMinimumHeight(150); - Graphs[i]->SetSplitter(splitter); - } + GraphView->updateGL(); + + on_RefreshPortsButton_clicked(); - on_RefreshPortsButton_clicked(); */ } Oximetry::~Oximetry() @@ -148,9 +167,7 @@ void Oximetry::on_RefreshPortsButton_clicked() } void Oximetry::RedrawGraphs() { - for (QVector::iterator g=Graphs.begin();g!=Graphs.end();g++) { - (*g)->updateGL(); - } + GraphView->updateGL(); } void Oximetry::on_RunButton_toggled(bool checked) @@ -209,14 +226,16 @@ void Oximetry::on_RunButton_toggled(bool checked) connect(port, SIGNAL(readyRead()), this, SLOT(onReadyRead())); connect(port, SIGNAL(dsrChanged(bool)), this, SLOT(onDsrChanged(bool))); if (!(port->lineStatus() & LS_DSR)) - qDebug() << "warning: device is not turned on"; + qDebug() << "check device is turned on"; qDebug() << "listening for data on" << port->portName(); } else { qDebug() << "device failed to open:" << port->errorString(); } portmode=PM_LIVE; - + //foobar->setVisible(false); + CONTROL->setVisible(false); } else { + //foobar->setVisible(true); ui->RunButton->setText("&Start"); ui->SerialPortsCombo->setEnabled(true); delete port; @@ -243,21 +262,26 @@ void Oximetry::on_RunButton_toggled(bool checked) PULSE->MaxX(); PLETHY->MinX(); PLETHY->MaxX(); - - PLETHY->updateGL(); - SPO2->updateGL(); - PULSE->updateGL(); + //GraphView->ResetBounds(); + CONTROL->SetMinX(ev_plethy->first()); + CONTROL->SetMaxX(lasttime); + CONTROL->ResetBounds(); qint64 d=session->length(); // if (d<=30000) // return; + if (ev_pulse->count()>1 && (ev_spo2->count()>1)) if (QMessageBox::question(this,"Keep This Recording?","Would you like to keep this oximeter recording?",QMessageBox::Yes|QMessageBox::No)==QMessageBox::Yes) { qDebug() << "Saving oximeter session data"; + + session->eventlist.clear(); + Session *sess=new Session(mach,starttime/1000L); /*ev_spo2->setCode(CPAP_SPO2); ev_pulse->setCode(CPAP_Pulse); ev_plethy->setCode(CPAP_Plethy); */ + sess->eventlist[OXI_SPO2].push_back(ev_spo2); sess->eventlist[OXI_Pulse].push_back(ev_pulse); sess->eventlist[OXI_Plethysomogram].push_back(ev_plethy); @@ -271,8 +295,6 @@ void Oximetry::on_RunButton_toggled(bool checked) sess->avg(OXI_Pulse); sess->wavg(OXI_Pulse); sess->p90(OXI_Pulse); - //sess->min(OXI_Pulse); - //sess->max(OXI_Pulse); sess->setMin(OXI_SPO2,ev_spo2->min()); sess->setMax(OXI_SPO2,ev_spo2->max()); @@ -281,16 +303,13 @@ void Oximetry::on_RunButton_toggled(bool checked) sess->avg(OXI_SPO2); sess->wavg(OXI_SPO2); sess->p90(OXI_SPO2); - //sess->min(OXI_SPO2); - //sess->max(OXI_SPO2); - //sess->min(OXI_Plethysomogram); - //sess->max(OXI_Plethysomogram); sess->avg(OXI_Plethysomogram); sess->wavg(OXI_Plethysomogram); sess->p90(OXI_Plethysomogram); sess->setMin(OXI_Plethysomogram,ev_plethy->min()); sess->setMax(OXI_Plethysomogram,ev_plethy->max()); + sess->setFirst(OXI_Plethysomogram,ev_plethy->first()); sess->setLast(OXI_Plethysomogram,ev_plethy->last()); @@ -305,8 +324,6 @@ void Oximetry::on_RunButton_toggled(bool checked) mach->AddSession(sess,profile); mach->Save(); - - session->eventlist.clear(); ev_plethy=new EventList(OXI_Plethysomogram,EVL_Waveform,1,0,0,0,1000.0/50.0); session->eventlist[OXI_Plethysomogram].push_back(ev_plethy); @@ -315,8 +332,21 @@ void Oximetry::on_RunButton_toggled(bool checked) ev_spo2=new EventList(OXI_SPO2,EVL_Event,1); session->eventlist[OXI_SPO2].push_back(ev_spo2); + + session->setCount(OXI_Plethysomogram,0); + session->setCount(OXI_Pulse,0); + session->setCount(OXI_SPO2,0); + + //m_shared->ResetBounds(); + //m_shared->updateScale(); + //m_shared->updateGL(); + } + CONTROL->setVisible(true); + GraphView->updateScale(); + //CONTROL->ResetBounds(); + GraphView->updateGL(); } } @@ -329,10 +359,11 @@ void Oximetry::UpdatePlethy(qint8 d) ev_plethy->getData().push_back(d); if (dmin()) ev_plethy->setMin(d); if (d>ev_plethy->max()) ev_plethy->setMax(d); - ev_plethy->setCount(ev_plethy->count()+1); + int i=ev_plethy->count()+1; + ev_plethy->setCount(i); + session->setCount(OXI_Plethysomogram,i); // update the cache //ev_plethy->AddEvent(lasttime,d); lasttime+=20; // 50 samples per second - PLETHY->SetMinY(ev_plethy->min()); PLETHY->SetMaxY(ev_plethy->max()); PULSE->SetMinY(ev_pulse->min()); @@ -360,6 +391,8 @@ bool Oximetry::UpdatePulse(qint8 pul) if (lastpulse!=pul) { ev_pulse->AddEvent(lasttime,pul); + session->setCount(OXI_Pulse,ev_pulse->count()); // update the cache + ret=true; //qDebug() << "Pulse=" << int(bytes[0]); } @@ -373,6 +406,7 @@ bool Oximetry::UpdateSPO2(qint8 sp) if (lastspo2!=sp) { ev_spo2->AddEvent(lasttime,sp); + session->setCount(OXI_SPO2,ev_spo2->count()); // update the cache ret=true; //qDebug() << "SpO2=" << int(bytes[1]); } @@ -403,11 +437,16 @@ void Oximetry::onReadyRead() i+=2; } } - PLETHY->updateGL(); + + if ((ev_plethy->count()==1) || (ev_pulse->count()==1) || (ev_spo2->count()==1)) { + GraphView->updateScale(); + } + GraphView->updateGL(); // damn... + /*PLETHY->updateGL(); if (redraw_pulse) PULSE->updateGL(); if (redraw_spo2) - SPO2->updateGL(); + SPO2->updateGL(); */ } void Oximetry::onDsrChanged(bool status) // Doesn't work for CMS50's diff --git a/oximetry.h b/oximetry.h index 342cca6e..14b434ff 100644 --- a/oximetry.h +++ b/oximetry.h @@ -17,8 +17,9 @@ #include "SleepLib/day.h" #include "SleepLib/session.h" -#include "Graphs/graphwindow.h" +//#include "Graphs/graphwindow.h" #include "Graphs/gLineChart.h" +#include "Graphs/gFooBar.h" namespace Ui { class Oximetry; @@ -32,10 +33,9 @@ class Oximetry : public QWidget Q_OBJECT public: - explicit Oximetry(QWidget *parent,QGLWidget * shared=NULL); + explicit Oximetry(QWidget *parent,gGraphView * shared=NULL); ~Oximetry(); - void AddGraph(gGraphWindow *w) { Graphs.push_back(w); } void RedrawGraphs(); private slots: @@ -55,11 +55,14 @@ private: Ui::Oximetry *ui; Profile *profile; - QVBoxLayout *splitter; - gLineChart *pulse,*spo2,*plethy; - gGraphWindow *PULSE,*SPO2,*PLETHY; - QVector Graphs; + gGraphView *GraphView; + MyScrollBar *scrollbar; + QHBoxLayout *layout; + + gLineChart *pulse,*spo2,*plethy; + gGraph *PULSE,*SPO2,*PLETHY,*CONTROL; + QVector Data; QextSerialPort *port; @@ -74,6 +77,8 @@ private: EventList * ev_pulse; EventList * ev_spo2; EventList * ev_plethy; + Layer * foobar; + gGraphView * m_shared; }; #endif // OXIMETRY_H diff --git a/oximetry.ui b/oximetry.ui index dbf18b86..1c275768 100644 --- a/oximetry.ui +++ b/oximetry.ui @@ -6,7 +6,7 @@ 0 0 - 512 + 554 361 @@ -21,113 +21,96 @@ 0 - - - 2 + + + + 0 + 0 + - - - - true - - - - - 0 - 0 - 508 - 303 - + + + + + + + 0 + 45 + + + + + 16777215 + 45 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + Serial Port - - - 0 - - - 0 - - - - - 0 - - - - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - Serial Port - - - - - - - - 120 - 0 - - - - - - - - - - - - :/icons/refresh.png:/icons/refresh.png - - - - - - - &Start - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - &Import from Device - - - - - - - + + + + + + 120 + 0 + + + + + + + + + + + + :/icons/refresh.png:/icons/refresh.png + + + + + + + &Start + + + true + + + + + + + Qt::Horizontal + + + + 59 + 20 + + + + + + + + &Import from Device + + + + +