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

Fix for oximetry session display in Daily tab

Browse Source
This commit is contained in:
Mark Watkins 2011-10-07 17:10:36 +10:00
parent a4d497660b
commit 837c6a2b0b
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
daily.cpp
View File

@ -191,7 +191,8 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
SPO2->AddLayer(AddOXI(new gLineChart(OXI_SPO2,Qt::blue,true))); SPO2->AddLayer(AddOXI(new gLineChart(OXI_SPO2,Qt::blue,true)));
PLETHY->AddLayer(AddOXI(new gLineChart(OXI_Plethy,Qt::darkBlue,false))); PLETHY->AddLayer(AddOXI(new gLineChart(OXI_Plethy,Qt::darkBlue,false)));
SPO2->forceMinY(60); SPO2->forceMaxY(100);
SPO2->forceMinY(70);
PULSE->forceMinY(40); PULSE->forceMinY(40);
for (int i=0;i<ng;i++){ for (int i=0;i<ng;i++){
graphs[i]->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin); graphs[i]->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
@ -608,6 +609,7 @@ void Daily::Load(QDate date)
html+="<tr><td align=center>SessionID</td><td align=center>Date</td><td align=center>Start</td><td align=center>End</td></tr>"; html+="<tr><td align=center>SessionID</td><td align=center>Date</td><td align=center>Start</td><td align=center>End</td></tr>";
QDateTime fd,ld; QDateTime fd,ld;
bool corrupted_waveform=false; bool corrupted_waveform=false;
if (cpap) {
for (QVector<Session *>::iterator s=cpap->begin();s!=cpap->end();s++) { for (QVector<Session *>::iterator s=cpap->begin();s!=cpap->end();s++) {
fd=QDateTime::fromTime_t((*s)->first()/1000L); fd=QDateTime::fromTime_t((*s)->first()/1000L);
ld=QDateTime::fromTime_t((*s)->last()/1000L); ld=QDateTime::fromTime_t((*s)->last()/1000L);
@ -616,6 +618,8 @@ void Daily::Load(QDate date)
tmp.sprintf(("<tr><td align=center>%08i</td><td align=center>"+fd.date().toString(Qt::SystemLocaleShortDate)+"</td><td align=center>"+fd.toString("HH:mm ")+"</td><td align=center>"+ld.toString("HH:mm")+"</td></tr>").toLatin1(),(*s)->session()); tmp.sprintf(("<tr><td align=center>%08i</td><td align=center>"+fd.date().toString(Qt::SystemLocaleShortDate)+"</td><td align=center>"+fd.toString("HH:mm ")+"</td><td align=center>"+ld.toString("HH:mm")+"</td></tr>").toLatin1(),(*s)->session());
html+=tmp; html+=tmp;
} }
}
if (oxi) {
for (QVector<Session *>::iterator s=oxi->begin();s!=oxi->end();s++) { for (QVector<Session *>::iterator s=oxi->begin();s!=oxi->end();s++) {
fd=QDateTime::fromTime_t((*s)->first()/1000L); fd=QDateTime::fromTime_t((*s)->first()/1000L);
ld=QDateTime::fromTime_t((*s)->last()/1000L); ld=QDateTime::fromTime_t((*s)->last()/1000L);
@ -624,6 +628,7 @@ void Daily::Load(QDate date)
tmp.sprintf(("<tr><td align=center>%08i</td><td align=center>"+fd.date().toString(Qt::SystemLocaleShortDate)+"</td><td align=center>"+fd.toString("HH:mm ")+"</td><td align=center>"+ld.toString("HH:mm")+"</td></tr>").toLatin1(),(*s)->session()); tmp.sprintf(("<tr><td align=center>%08i</td><td align=center>"+fd.date().toString(Qt::SystemLocaleShortDate)+"</td><td align=center>"+fd.toString("HH:mm ")+"</td><td align=center>"+ld.toString("HH:mm")+"</td></tr>").toLatin1(),(*s)->session());
html+=tmp; html+=tmp;
} }
}
html+="</table>"; html+="</table>";
if (corrupted_waveform) { if (corrupted_waveform) {
html+="<hr><div align=center><i>One or more waveform record for this session had faulty source data. Some waveform overlay points may not match up correctly.</i></div>"; html+="<hr><div align=center><i>One or more waveform record for this session had faulty source data. Some waveform overlay points may not match up correctly.</i></div>";

2
oximetry.cpp
View File

@ -182,7 +182,7 @@ void Oximetry::on_RunButton_toggled(bool checked)
ev_spo2->getTime().clear(); ev_spo2->getTime().clear();
ev_spo2->setCount(0); ev_spo2->setCount(0);
lasttime=qint64(QDateTime::currentDateTime().toTime_t())*1000L; // utc?? lasttime=QDateTime::currentDateTime().toTime_t()*1000L; // utc??
starttime=lasttime; starttime=lasttime;
session->SetSessionID(lasttime/1000L); session->SetSessionID(lasttime/1000L);

2
oximetry.h
View File

@ -66,7 +66,7 @@ private:
QextSerialPort *port; QextSerialPort *port;
QString portname; QString portname;
PORTMODE portmode; PORTMODE portmode;
qint64 lasttime,starttime; double lasttime,starttime;
int lastpulse, lastspo2; int lastpulse, lastspo2;
Machine * mach; Machine * mach;