chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reversed Event Flags shadow, oximetry debugging stuff

Browse Source
This commit is contained in:
Mark Watkins 2011-07-18 10:47:21 +10:00
parent 27d7e35a21
commit 6fd5ada166
4 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Graphs/gFooBar.cpp
View File

@ -28,6 +28,7 @@ void gFooBar::Plot(gGraphWindow & w,float scrx,float scry)
int start_px=w.GetLeftMargin()-1;
int width=scrx - (w.GetLeftMargin() + w.GetRightMargin());
int height=scry - (w.GetTopMargin() + w.GetBottomMargin());
int end_px=scrx-w.GetRightMargin();
QColor & col1=color[0];
QColor & col2=color[1];
@ -59,12 +60,21 @@ void gFooBar::Plot(gGraphWindow & w,float scrx,float scry)
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
glColor4f(.2,.2,.2,.3);
glColor4f(.2,.2,.2,.2);
glBegin(GL_QUADS);
glVertex2f(start_px+px, w.GetBottomMargin());
glVertex2f(start_px, w.GetBottomMargin());
glVertex2f(start_px, w.GetBottomMargin()+height);
glVertex2f(start_px+px, w.GetBottomMargin()+height);
glVertex2f(start_px+py, w.GetBottomMargin()+height);
glVertex2f(start_px+px, w.GetBottomMargin());
//glEnd();
//glDisable(GL_BLEND);
//glColor4f(.2,.2,.2,.3);
//glBegin(GL_QUADS);
glVertex2f(start_px+py, w.GetBottomMargin());
glVertex2f(start_px+py, w.GetBottomMargin()+height);
glVertex2f(end_px, w.GetBottomMargin()+height);
glVertex2f(end_px, w.GetBottomMargin());
glEnd();
glDisable(GL_BLEND);
}

6
Graphs/gLineChart.cpp
View File

@ -136,7 +136,11 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
x1=point[1].x();
// if (accel) {
sr=x1-x0; // Time distance between samples
assert(sr>0);
if (sr<=0) {
qWarning() << "qLineChart::Plot() assert(sr>0)";
return;
}
//assert(sr>0);
// double qx=xL-x0; // Full time range of this segment
//double gx=xx/qx; // ratio of how much of the whole data set this represents
//double segwidth=width*gx;

2
Graphs/graphwindow.cpp
View File

@ -821,7 +821,7 @@ void gGraphWindow::paintGL()
if (m_mouseLDown) {
if (m_mouseRBrect.width()>0)
//glDisable(GL_DEPTH_TEST);
RoundedRectangle(m_mouseRBrect.x(),m_mouseRBrect.y(),m_mouseRBrect.width(),m_mouseRBrect.height(),5,QColor(50,50,50,128));
RoundedRectangle(m_mouseRBrect.x(),m_mouseRBrect.y(),m_mouseRBrect.width(),m_mouseRBrect.height(),5,QColor(50,50,200,64));
//glEnable(GL_DEPTH_TEST);
}
glEnable(GL_DEPTH_TEST);

22
oximetry.cpp
View File

@ -29,7 +29,7 @@ Oximetry::Oximetry(QWidget *parent) :
gSplitter->setHandleWidth(2);
ui->graphLayout->addWidget(gSplitter);
AddData(pulse=new WaveData(OXI_Pulse));
AddData(pulse=new EventData(OXI_Pulse));
PULSE=new gGraphWindow(gSplitter,tr("Pulse Rate"),(QGLWidget *)NULL);
PULSE->AddLayer(new gXAxis());
PULSE->AddLayer(new gYAxis());
@ -37,7 +37,7 @@ Oximetry::Oximetry(QWidget *parent) :
PULSE->AddLayer(new gLineChart(pulse,Qt::red,65536,false,false,false));
PULSE->setMinimumHeight(150);
AddData(spo2=new WaveData(OXI_SPO2));
AddData(spo2=new EventData(OXI_SPO2));
SPO2=new gGraphWindow(gSplitter,tr("SPO2"),PULSE);
SPO2->AddLayer(new gXAxis());
SPO2->AddLayer(new gYAxis());
@ -275,6 +275,9 @@ void Oximetry::UpdatePlethy(qint8 d)
bool Oximetry::UpdatePulseSPO2(qint8 pul,qint8 sp)
{
bool ret=false;
// Don't block zeros.. If the data is used, it's needed
// Can make the graph can skip them.
if (lastpulse!=pul) {
pulse->point[0][pulse->np[0]].setX(double(lasttime)/86400000.0);
pulse->point[0][pulse->np[0]++].setY(pul);
@ -311,7 +314,6 @@ bool Oximetry::UpdatePulseSPO2(qint8 pul,qint8 sp)
void Oximetry::onReadyRead()
{
static int lastsize=-1;
QByteArray bytes;
int a = port->bytesAvailable();
bytes.resize(a);
@ -346,7 +348,7 @@ void Oximetry::onReadyRead()
}
qDebug() << aa; */
lastsize=bytes.size();
//lastsize=bytes.size();
}
void Oximetry::onDsrChanged(bool status)
{
@ -358,6 +360,16 @@ void Oximetry::onDsrChanged(bool status)
extern QProgressBar *qprogress;
extern QLabel *qstatus;
void DumpBytes(unsigned char * b,int len)
{
QString a="Bytes "+QString::number(len,16)+": ";
for (int i=0;i<len;i++) {
a.append(QString::number(b[i],16)+" ");
}
qDebug() << a;
}
// Move this code to CMS50 Importer??
void Oximetry::on_ImportButton_clicked()
{
@ -437,6 +449,7 @@ void Oximetry::on_ImportButton_clicked()
do {
bool fnd=false;
res=port->read((char *)rb,0x20);
DumpBytes(rb,0x20);
if (blocks==0) {
for (int i=0;i<res-1;i++) {
@ -447,6 +460,7 @@ void Oximetry::on_ImportButton_clicked()
}
}
if (!fnd) {
qDebug() << "Retrying..";
fails++;
break; // reissue the F5 and try again