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

Fix Pholy's entirely accidental commit mayhem ;)

Browse Source
This commit is contained in:
Mark Watkins 2018-04-03 13:51:53 +10:00
commit d1f3ac50a8
6 changed files with 97 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sleepyhead/Graphs/gSessionTimesChart.cpp
View File

@ -1138,7 +1138,7 @@ void gAHIChart::preCalc()
ahi_wavg = 0;
ahi_avg = 0;
calc_cnt = 0;
total_days = 0;
total_hours = 0;
min_ahi = 99999;
max_ahi = -99999;
@ -1187,13 +1187,15 @@ void gAHIChart::customCalc(Day *day, QVector<SummaryChartSlice> &list)
ahi_wavg += ahi_cnt;
ahi_avg += ahi_cnt;
total_hours += hours;
calc_cnt++;
total_days++;
qDebug() << "Leaving gAHIChart::customCalc - ahi_avg: " << ahi_avg << " total_days: " << total_days ;
}
void gAHIChart::afterDraw(QPainter & /*painter */, gGraph &graph, QRect rect)
{
if (totaldays == nousedays) return;
//int size = idx_end - idx_start;
qDebug() << "Entering gAHIChart::afterDraw - ahi_avg: " << ahi_avg << " total_days: " << total_days ;
bool skip = true;
float med = 0;
@ -1211,8 +1213,8 @@ void gAHIChart::afterDraw(QPainter & /*painter */, gGraph &graph, QRect rect)
}
break;
case 2: // avg
if (calc_cnt > 0) {
med = ahi_avg / calc_cnt;
if (total_days > 0) {
med = ahi_avg / total_days;
skip = false;
}
break;

4
sleepyhead/Graphs/gSessionTimesChart.h
View File

@ -412,7 +412,7 @@ public:
// layer->total_hours = total_hours;
// layer->max_ahi = max_ahi;
// layer->min_ahi = min_ahi;
// layer->calc_cnt = calc_cnt;
// layer->total_days = total_days;
// layer->ahi_data = ahi_data;
}
@ -424,7 +424,7 @@ public:
float max_ahi;
float min_ahi;
int calc_cnt;
int total_days;
QList<float> ahi_data;
};

4
sleepyhead/SleepLib/day.cpp
View File

@ -150,9 +150,9 @@ QString Day::calcMiddleLabel(ChannelID code)
if (c == 0) {
return QObject::tr("%1 %2").arg(STR_TR_Median).arg(schema::channel[code].label());
} else if (c == 1) {
return QObject::tr("%1 %2").arg(STR_TR_Average).arg(schema::channel[code].label());
return QObject::tr("%1 %2").arg(STR_TR_WAvg).arg(schema::channel[code].label());
} else {
return QObject::tr("%1 %2").arg(STR_TR_Average).arg(schema::channel[code].label());
return QObject::tr("%1 %2").arg(STR_TR_Avg).arg(schema::channel[code].label());
}
}
QString Day::calcMaxLabel(ChannelID code)

8
sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp
View File

@ -121,7 +121,7 @@ int CMS50Loader::Open(QString path)
setStatus(LIVE);
return 1;
}
QString ext = path.section(".",1);
QString ext = path.section(".", -1); // find the last '.'
if ((ext.compare("spo2", Qt::CaseInsensitive)==0) || (ext.compare("spo", Qt::CaseInsensitive)==0) || (ext.compare("spor", Qt::CaseInsensitive)==0)) {
// try to read and process SpoR file..
return readSpoRFile(path) ? 1 : 0;
@ -536,17 +536,21 @@ bool CMS50Loader::readSpoRFile(QString path)
{
QFile file(path);
if (!file.exists()) {
qWarning() << "Can't find the oximeter file: " << path;
return false;
}
if (!file.open(QFile::ReadOnly)) {
qWarning() << "Can't open the oximeter file: " << path;
return false;
}
bool spo2header = false;
QString ext = path.section('.', -1);
qDebug() << "Oximeter file extention is " << ext;
if (ext.compare("spo2",Qt::CaseInsensitive) == 0) {
spo2header = true;
qDebug() << "Oximeter file looks like an SpO2 type" ;
}
QByteArray data;
@ -591,7 +595,7 @@ bool CMS50Loader::readSpoRFile(QString path)
quint32 hour, minute, second;
if (data.at(pos) != 1) {
qWarning() << ".spo2 file" << path << "might be a different";
qWarning() << "oximeter file" << path << "might be odd format";
}
// Unknown cruft header...

107
sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
View File

@ -72,12 +72,15 @@ bool CMS50F37Loader::openDevice()
b = scanDevice("rfcomm", 0, 0); // Linux
}
if (!b) {
qWarning() << "No oximeter found";
return false;
}
}
serial.setPortName(port);
if (!serial.open(QSerialPort::ReadWrite))
if (!serial.open(QSerialPort::ReadWrite)) {
qDebug() << "Failed to open oximeter";
return false;
}
// forward this stuff
@ -151,7 +154,7 @@ int CMS50F37Loader::Open(QString path)
} else if (path.compare("live") == 0) {
return 0;
}
QString ext = path.section(".",1);
QString ext = path.section(".", -1); // find the LAST '.'
if ((ext.compare("spo2", Qt::CaseInsensitive)==0) || (ext.compare("spo", Qt::CaseInsensitive)==0) || (ext.compare("spor", Qt::CaseInsensitive)==0)) {
// try to read and process SpoR file..
return readSpoRFile(path) ? 1 : 0;
@ -193,7 +196,8 @@ QString CMS50F37Loader::getUser()
do {
QApplication::processEvents();
} while (user.isEmpty() && (time.elapsed() < TIMEOUT));
qDebug() << "User = " << user;
return user;
}
@ -208,6 +212,8 @@ QString CMS50F37Loader::getVendor()
do {
QApplication::processEvents();
} while (vendor.isEmpty() && (time.elapsed() < TIMEOUT));
qDebug() << "Vendor is " << vendor;
return vendor;
}
@ -233,6 +239,8 @@ QString CMS50F37Loader::getModel()
} else {
duration_divisor = 2;
}
qDebug() << "Model is " << model;
return model;
}
@ -252,6 +260,8 @@ QString CMS50F37Loader::getDeviceID()
do {
QApplication::processEvents();
} while (devid.isEmpty() && (time.elapsed() < TIMEOUT));
qDebug() << "Device Id is " << devid;
return devid;
}
@ -266,6 +276,7 @@ int CMS50F37Loader::getSessionCount()
QApplication::processEvents();
} while ((session_count < 0) && (time.elapsed() < TIMEOUT));
qDebug() << "Session count is " << session_count;
return session_count;
}
@ -279,6 +290,7 @@ int CMS50F37Loader::getOximeterInfo()
QApplication::processEvents();
} while ((device_info < 0) && (time.elapsed() < TIMEOUT));
qDebug() << "Device Info is " << device_info;
return device_info;
}
@ -295,12 +307,14 @@ int CMS50F37Loader::getDuration(int session)
QApplication::processEvents();
} while ((duration < 0) && (time.elapsed() < TIMEOUT));
qDebug() << "Session duration is " << duration << "Divided by " << duration_divisor;
return duration / duration_divisor;
}
QDateTime CMS50F37Loader::getDateTime(int session)
{
QDateTime datetime;
imp_date = QDate();
imp_time = QTime();
sendCommand(COMMAND_GET_SESSION_TIME, session);
@ -311,9 +325,12 @@ QDateTime CMS50F37Loader::getDateTime(int session)
} while ((imp_date.isNull() || imp_time.isNull()) && (time.elapsed() < TIMEOUT));
if (imp_date.isNull() || imp_time.isNull())
return QDateTime();
datetime = QDateTime();
else
datetime = QDateTime(imp_date, imp_time);
return QDateTime(imp_date, imp_time);
qDebug() << "Oximeter DateTime is " << datetime.toString("yyyy-MMM-dd HH:mm:ss");
return datetime;
}
@ -335,7 +352,9 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
int year, month, day;
quint8 pulse;
quint8 spo2;
quint16 pi; // perfusion index
do {
quint8 res = buffer.at(idx);
@ -356,7 +375,7 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
if (res == resimport) break;
}
// add a dummy to make up for it.
qDebug() << "lost sync, padding...";
qDebug() << "pB: lost sync, padding...";
oxirec->append(OxiRecord(0,0,0));
}
continue;
@ -375,14 +394,14 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
QString extra = QString(buffer.mid(idx+3, 6));
model += extra.trimmed();
modelsegments++;
qDebug() << "Model:" << model;
qDebug() << "pB: Model:" << model;
}
break;
case 0x03: // Vendor string
data = buffer.at(idx+1);
if (data == 0) {
vendor = QString(buffer.mid(idx+2, 6));
qDebug() << "Vendor:" << vendor;
qDebug() << "pB: Vendor:" << vendor;
}
break;
@ -392,14 +411,14 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
}
devid = QString(buffer.mid(idx+2, 7));
qDebug() << "Device ID:" << devid;
qDebug() << "pB: Device ID:" << devid;
break;
// COMMAND_GET_USER_INFO
case 0x05: // 5,80,80,f5,f3,e5,f2,80,80
// User
user = QString(buffer.mid(idx+3).trimmed());
qDebug() << "0x05:" << user;
qDebug() << "pB: 0x05:" << user;
break;
case 0x6: // 6,80,80,87
@ -418,7 +437,7 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
day = QString().sprintf("%02i", buffer.at(idx+7)).toInt();
imp_date = QDate(year,month,day);
qDebug() << imp_date;
qDebug() << "pB: ymd " << year << month << day << " impDate " << imp_date;
break;
// COMMAND_GET_SESSION_DURATION
@ -458,7 +477,7 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
case 0x12: // 12,80,80,80,82,a6,92,80
tmpstr = QString().sprintf("%02i:%02i:%02i",buffer.at(idx+4), buffer.at(idx+5), buffer.at(idx+6));
imp_time = QTime::fromString(tmpstr, "HH:mm:ss");
qDebug() << imp_time;
qDebug() << "pB: tmpStr:" << tmpstr << " impTime " << imp_time;
break;
case 0x13: // 13,80,a0,a0,a0,a0,a0,a0,a0
@ -469,6 +488,7 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
case 0x09: // cms50i data sequence
case 0x0f: // f,80,de,c2,de,c2,de,c2 cms50F data...
if (!started_import) {
qDebug() << "pB: Starting import";
started_import = true;
started_reading = true;
finished_import = false;
@ -493,7 +513,7 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
break;
default:
qDebug() << "unknown cms50 result?" << hex << (int)res;
qDebug() << "pB: unknown cms50F result?" << hex << (int)res;
break;
}
@ -507,10 +527,10 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
buf[i] = (buf[i] & 0x7f) | ((msb & 0x01) ? 0x80 : 0);
}
quint16 pi = buf[4] | buf[5] << 8;
pi = buf[4] | buf[5] << 8;
pulse = buf[3];
quint8 spo2 = buf[2] & 0x7f;
qDebug() << "Pulse=" << pulse << "SPO2=" << spo2 << "Pi=" << pi;
spo2 = buf[2] & 0x7f;
qDebug() << "pB: Pulse=" << pulse << "SPO2=" << spo2 << "PI=" << pi;
oxirec->append(((spo2 == 0) || (pulse == 0)) ? OxiRecord(0,0,0) : OxiRecord(pulse, spo2, pi));
} else if (res == 0x0f) {
@ -521,13 +541,19 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
}
pulse = buffer.at(idx+3);
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(pulse, buffer.at(idx+2)));
spo2 = buffer.at(idx+2);
qDebug() << "pB: Pulse=" << pulse << "SPO2=" << spo2;
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(pulse, spo2));
pulse = buffer.at(idx+5);
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(pulse, buffer.at(idx+4)));
spo2 = buffer.at(idx+4);
qDebug() << "pB: Pulse=" << pulse << "SPO2=" << spo2;
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(pulse, spo2));
pulse = buffer.at(idx+7);
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(pulse, buffer.at(idx+6)));
spo2 = buffer.at(idx+6);
qDebug() << "pB: Pulse=" << pulse << "SPO2=" << spo2;
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(pulse, spo2));
}
QStringList str;
@ -537,9 +563,9 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
if (!started_import) {
// startTimer.singleShot(2000, this, SLOT(requestData()));
qDebug() << "Read:" << len << size << str.join(",");
qDebug() << "pB: Read:" << len << size << str.join(",");
} else {
qDebug() << "Import:" << len << size << str.join(",");
qDebug() << "pB: Import:" << len << size << str.join(",");
}
idx += len;
@ -593,11 +619,12 @@ void CMS50F37Loader::sendCommand(quint8 c)
cmd[2] |= (c & 0x7f);
QString out;
for (int i=0;i < 9;i++) out += QString().sprintf("%02X ",cmd[i]);
for (int i=0;i < 9;i++)
out += QString().sprintf("%02X ",cmd[i]);
qDebug() << "Write:" << out;
if (serial.write((char *)cmd, 9) == -1) {
qDebug() << "Couldn't write data reset bytes to CMS50";
qDebug() << "Couldn't write data bytes to CMS50F";
}
}
@ -608,11 +635,12 @@ void CMS50F37Loader::sendCommand(quint8 c, quint8 c2)
cmd[4] |= (c2 & 0x7f);
QString out;
for (int i=0; i < 9; ++i) out += QString().sprintf("%02X ",cmd[i]);
for (int i=0; i < 9; ++i)
out += QString().sprintf("%02X ",cmd[i]);
qDebug() << "Write:" << out;
if (serial.write((char *)cmd, 9) == -1) {
qDebug() << "Couldn't write data reset bytes to CMS50";
qDebug() << "Couldn't write data bytes to CMS50F";
}
}
@ -624,11 +652,12 @@ void CMS50F37Loader::eraseSession(int user, int session)
cmd[4] = (session & 0x7f) | 0x80;
QString out;
for (int i=0; i < 9; ++i) out += QString().sprintf("%02X ",cmd[i]);
for (int i=0; i < 9; ++i)
out += QString().sprintf("%02X ",cmd[i]);
qDebug() << "Write:" << out;
if (serial.write((char *)cmd, 9) == -1) {
qDebug() << "Couldn't write data reset bytes to CMS50";
qDebug() << "Couldn't write data bytes to CMS50F";
}
int z = timectr;
@ -660,11 +689,12 @@ void CMS50F37Loader::setDeviceID(QString str)
cmd[1] = msb | 0x80;
QString out;
for (int i=0; i < 9; ++i) out += QString().sprintf("%02X ",cmd[i]);
for (int i=0; i < 9; ++i)
out += QString().sprintf("%02X ",cmd[i]);
qDebug() << "Write:" << out;
if (serial.write((char *)cmd, 9) == -1) {
qDebug() << "Couldn't write data reset bytes to CMS50";
qDebug() << "Couldn't write data bytes to CMS50F";
}
// Supposed to return 0x04 command, so reset devid..
@ -691,7 +721,7 @@ void CMS50F37Loader::syncClock()
timectr = 0;
if (serial.write((char *)datecmd, 9) == -1) {
qDebug() << "Couldn't write data reset bytes to CMS50";
qDebug() << "Couldn't write data bytes to CMS50F";
}
QTime time;
@ -713,7 +743,7 @@ void CMS50F37Loader::syncClock()
timectr = 0;
if (serial.write((char *)timecmd, 9) == -1) {
qDebug() << "Couldn't write data reset bytes to CMS50";
qDebug() << "Couldn't write data bytes to CMS50F";
}
time.start();
@ -725,6 +755,7 @@ void CMS50F37Loader::syncClock()
void CMS50F37Loader::nextCommand()
{
qDebug() << "nextCommand sequence: " << sequence;
if (++sequence < cms50_seqlength) {
// Send the next command packet in sequence
sendCommand(cms50_sequence[sequence]);
@ -742,6 +773,7 @@ void CMS50F37Loader::getSessionData(int session)
void CMS50F37Loader::resetDevice()
{
qDebug() << "Resetting oximeter";
sendCommand(COMMAND_CMS50_HELLO1);
QThread::msleep(100);
QApplication::processEvents();
@ -752,6 +784,7 @@ void CMS50F37Loader::resetDevice()
void CMS50F37Loader::requestData()
{
qDebug() << "Requesting session data";
sendCommand(COMMAND_GET_SESSION_DATA, selected_session);
}
@ -782,7 +815,7 @@ void CMS50F37Loader::resetImportTimeout()
qDebug() << "Oximeter device stopped transmitting.. Transfer complete";
// We were importing, but now are done
if (!finished_import && (started_import && started_reading)) {
qDebug() << "Switching CMS50 back to live mode and finalizing import";
qDebug() << "Switching CMS50F37 back to live mode and finalizing import";
// Turn back on live streaming so the end of capture can be dealt with
@ -802,7 +835,7 @@ void CMS50F37Loader::resetImportTimeout()
return;
}
qDebug() << "Should CMS50 resetImportTimeout reach here?";
qDebug() << "Should CMS50F37 resetImportTimeout reach here?";
// else what???
}
cb_reset = imp_callbacks;
@ -820,17 +853,21 @@ bool CMS50F37Loader::readSpoRFile(QString path)
{
QFile file(path);
if (!file.exists()) {
qWarning() << "Can't find the oximeter file: " << path;
return false;
}
if (!file.open(QFile::ReadOnly)) {
qWarning() << "Can't open the oximeter file: " << path;
return false;
}
bool spo2header = false;
QString ext = path.section('.', -1);
qDebug() << "Oximeter file extention is " << ext;
if (ext.compare("spo2",Qt::CaseInsensitive) == 0) {
spo2header = true;
qDebug() << "Oximeter file looks like an SpO2 type" ;
}
QByteArray data;
@ -864,7 +901,7 @@ bool CMS50F37Loader::readSpoRFile(QString path)
QString dstr(dchr);
m_startTime = QDateTime::fromString(dstr, "MM/dd/yy HH:mm:ss");
if (m_startTime.date().year() < 2000) { m_startTime = m_startTime.addYears(100); }
} else {
} else { // this should probaly find the most recent SH data day
m_startTime = QDateTime(QDate::currentDate(), QTime(0,0,0));
}
} else { // !spo2header

15
sleepyhead/SleepLib/loader_plugins/md300w1_loader.cpp
View File

@ -66,6 +66,7 @@ int MD300W1Loader::Open(QString path)
// Only one active Oximeter module at a time, set in preferences
qDebug() << "MD300W1 Loader opening " << path;
m_itemCnt = 0;
m_itemTotal = 0;
@ -94,7 +95,7 @@ int MD300W1Loader::Open(QString path)
setStatus(LIVE);
return 1;
}
QString ext = path.section(".",1);
QString ext = path.section(".", -1); // find the last '.'
if (ext.compare("dat", Qt::CaseInsensitive)==0) {
// try to read and process SpoR file..
return readDATFile(path) ? 1 : 0;
@ -158,13 +159,16 @@ void MD300W1Loader::resetImportTimeout()
bool MD300W1Loader::readDATFile(QString path)
{
QFile file(path);
qDebug() << "MD300W Loader attempting to read " << path;
if (!file.exists()) {
qDebug() << "File does not exist: " << path;
qDebug() << "File does not exist: " << path;
return false;
}
if (!file.open(QFile::ReadOnly)) {
qDebug() << "Can't open file R/O: " << path;
qDebug() << "Can't open file R/O: " << path;
return false;
}
@ -194,7 +198,7 @@ bool MD300W1Loader::readDATFile(QString path)
if (datetime.date().year() < 2000) datetime = datetime.addYears(100);
ts = datetime.toTime_t();
gap = ts - lasttime;
if (gap > 1) {
if (gap > 1) { // always true for first record, b/c time started on 1 Jan 1970
if (gap < 360) {
// Less than 5 minutes? Merge session
gap--;
@ -203,8 +207,7 @@ bool MD300W1Loader::readDATFile(QString path)
oxirec->append(OxiRecord(0,0));
}
} else {
// Create a new session
qDebug() << "Create session for " << datestr;
// Create a new session, always for first record
qDebug() << "Create session for " << datetime.toString("yyyy.MM.dd HH:mm:ss");
oxirec = new QVector<OxiRecord>;
oxisessions[datetime] = oxirec;