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

CMS50 Record Reading Fix

Browse Source
This commit is contained in:
Mark Watkins 2011-07-18 20:57:34 +10:00
parent 20c53ad5d7
commit 3d3b7a9a27
2 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Graphs/gLineOverlay.cpp
View File

@ -95,12 +95,19 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry)
quadarray[quadcnt++]=start_py; quadarray[quadcnt++]=start_py;
} else { } else {
if (lo_type==LOT_Dot) { if (lo_type==LOT_Dot) {
//pointarray[pointcnt++]=x1; //if (pref["AlwaysShowOverlayBars"].toBool()) {
//pointarray[pointcnt++]=start_py+3; //
vertarray[vertcnt++]=x1; if (pref["AlwaysShowOverlayBars"].toBool() || (xx<(3600.0/86400.0))) {
vertarray[vertcnt++]=start_py+1; // show the fat dots in the middle
vertarray[vertcnt++]=x1; pointarray[pointcnt++]=x1;
vertarray[vertcnt++]=start_py+1+12; pointarray[pointcnt++]=w.y2p(20);
} else {
// thin lines down the bottom
vertarray[vertcnt++]=x1;
vertarray[vertcnt++]=start_py+1;
vertarray[vertcnt++]=x1;
vertarray[vertcnt++]=start_py+1+12;
}
} else if (lo_type==LOT_Bar) { } else if (lo_type==LOT_Bar) {
int z=start_py+height; int z=start_py+height;
if (pref["AlwaysShowOverlayBars"].toBool() || (xx<(3600.0/86400.0))) { if (pref["AlwaysShowOverlayBars"].toBool() || (xx<(3600.0/86400.0))) {

44
oximetry.cpp
View File

@ -32,15 +32,12 @@ Oximetry::Oximetry(QWidget *parent) :
AddData(plethy=new WaveData(OXI_Plethy)); AddData(plethy=new WaveData(OXI_Plethy));
AddGraph(PLETHY=new gGraphWindow(gSplitter,tr("Plethysomogram"),(QGLWidget *)NULL)); AddGraph(PLETHY=new gGraphWindow(gSplitter,tr("Plethysomogram"),(QGLWidget *)NULL));
PLETHY->AddLayer(new gLineChart(plethy,Qt::black,65536,true,false,false));
AddData(pulse=new EventData(OXI_Pulse)); AddData(pulse=new EventData(OXI_Pulse));
AddGraph(PULSE=new gGraphWindow(gSplitter,tr("Pulse Rate"),PLETHY)); AddGraph(PULSE=new gGraphWindow(gSplitter,tr("Pulse Rate"),PLETHY));
PULSE->AddLayer(new gLineChart(pulse,Qt::red,65536,false,false,false));
AddData(spo2=new EventData(OXI_SPO2)); AddData(spo2=new EventData(OXI_SPO2));
AddGraph(SPO2=new gGraphWindow(gSplitter,tr("SPO2"),PLETHY)); AddGraph(SPO2=new gGraphWindow(gSplitter,tr("SPO2"),PLETHY));
SPO2->AddLayer(new gLineChart(spo2,Qt::blue,65536,false,false,false));
plethy->SetRealMaxY(128); plethy->SetRealMaxY(128);
pulse->SetRealMaxY(130); pulse->SetRealMaxY(130);
@ -63,13 +60,19 @@ Oximetry::Oximetry(QWidget *parent) :
Graphs[i]->AddLayer(new gXAxis()); Graphs[i]->AddLayer(new gXAxis());
Graphs[i]->AddLayer(new gFooBar()); Graphs[i]->AddLayer(new gFooBar());
gSplitter->addWidget(Graphs[i]);
}
SPO2->AddLayer(new gLineChart(spo2,Qt::blue,65536,false,false,false));
PULSE->AddLayer(new gLineChart(pulse,Qt::red,65536,false,false,false));
PLETHY->AddLayer(new gLineChart(plethy,Qt::black,65536,true,false,false));
for (unsigned i=0;i<Graphs.size();i++) {
Graphs[i]->setMinimumHeight(150); Graphs[i]->setMinimumHeight(150);
Graphs[i]->SetSplitter(gSplitter); Graphs[i]->SetSplitter(gSplitter);
Graphs[i]->RealMinY(); Graphs[i]->RealMinY();
Graphs[i]->RealMaxY(); Graphs[i]->RealMaxY();
Graphs[i]->MinY(); Graphs[i]->MinY();
Graphs[i]->MaxY(); Graphs[i]->MaxY();
gSplitter->addWidget(Graphs[i]);
} }
on_RefreshPortsButton_clicked(); on_RefreshPortsButton_clicked();
@ -335,9 +338,9 @@ extern QProgressBar *qprogress;
extern QLabel *qstatus; extern QLabel *qstatus;
void DumpBytes(unsigned char * b,int len) void DumpBytes(int blocks, unsigned char * b,int len)
{ {
QString a="Bytes "+QString::number(len,16)+": "; QString a=QString::number(blocks,16)+": Bytes "+QString::number(len,16)+": ";
for (int i=0;i<len;i++) { for (int i=0;i<len;i++) {
a.append(QString::number(b[i],16)+" "); a.append(QString::number(b[i],16)+" ");
} }
@ -423,13 +426,14 @@ void Oximetry::on_ImportButton_clicked()
do { do {
bool fnd=false; bool fnd=false;
res=port->read((char *)rb,0x20); res=port->read((char *)rb,0x20);
DumpBytes(rb,0x20); DumpBytes(blocks,rb,res);
done=false;
if (blocks==0) { if (blocks==0) {
for (int i=0;i<res-1;i++) { for (int i=0;i<res-1;i++) {
if ((rb[i]==0xf2) && (rb[i+1]==0x80)) { if ((rb[i]==0xf2) && (rb[i+1]==0x80)) { // && (rb[i+2]==0x00)) {
fnd=true; fnd=true;
startpos=i+10; startpos=i+9;
break; break;
} }
} }
@ -438,14 +442,26 @@ void Oximetry::on_ImportButton_clicked()
qDebug() << "Retrying.."; qDebug() << "Retrying..";
fails++; fails++;
break; // reissue the F5 and try again break; // reissue the F5 and try again
} else {
qDebug() << "Found";
} }
length=(rb[startpos] ^ 0x80)<< 7 | (rb[startpos+1]&0x7f); // 84 95 7c
// 0x10556 bytes..
// 0x82b blocks
length=(rb[startpos++] & 0x7f) << 14;
length|=(rb[startpos++] & 0x7f) << 7;
length|=(rb[startpos++] & 0x7f);
if (!(rb[startpos]&0x80)) {
length <<= 8;
length|=rb[startpos++];
}
/*length=(rb[startpos] ^ 0x80)<< 7 | (rb[startpos+1]);
startpos+=2; startpos+=2;
if (!(rb[startpos]&0x80)) { if (!(rb[startpos]&0x80)) {
length|=(rb[startpos]&0x7f) << 14; length|=(rb[startpos]&0x7f) << 14;
startpos++; startpos++;
} else oneoff=true; } else oneoff=true; */
buffer=new unsigned char [length+32]; buffer=new unsigned char [length+32];
//qDebug() << length << startpos; //qDebug() << length << startpos;
@ -456,14 +472,10 @@ void Oximetry::on_ImportButton_clicked()
memcpy((char *)&buffer[bytes],(char *)rb,res); memcpy((char *)&buffer[bytes],(char *)rb,res);
bytes+=res; bytes+=res;
} }
//aa="";
//for (int i=0;i<res;i++) {
// aa+=QString::number(unsigned(rb[i]),16)+" ";
//}
//qDebug() << aa;
blocks++; blocks++;
if (res<0x20) { if (res<0x20) {
qDebug() << "Read "<< bytes << " bytes of " << length;
done=true; done=true;
break; break;
} }