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

Add moule name to debug, force tab enable after import

Browse Source
This commit is contained in:
Phil Olynyk 2019-06-11 10:30:51 -04:00
parent d3c10ca745
commit b6427de247
3 changed files with 130 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
oscar/SleepLib/loader_plugins/cms50f37_loader.cpp
View File

@ -71,13 +71,13 @@ bool CMS50F37Loader::openDevice()
b = scanDevice("rfcomm", 0, 0); // Linux b = scanDevice("rfcomm", 0, 0); // Linux
} }
if (!b) { if (!b) {
qWarning() << "No oximeter found"; qWarning() << "cms50f37 - No oximeter found";
return false; return false;
} }
} }
serial.setPortName(port); serial.setPortName(port);
if (!serial.open(QSerialPort::ReadWrite)) { if (!serial.open(QSerialPort::ReadWrite)) {
qDebug() << "Failed to open oximeter"; qDebug() << "cms50f37 - Failed to open oximeter";
return false; return false;
} }
@ -198,7 +198,7 @@ QString CMS50F37Loader::getUser()
QApplication::processEvents(); QApplication::processEvents();
} while (userName.isEmpty() && (time.elapsed() < TIMEOUT)); } while (userName.isEmpty() && (time.elapsed() < TIMEOUT));
qDebug() << "User " << userIdx << " is " << userName; qDebug() << "cms50f37 - User " << userIdx << " is " << userName;
return userName; return userName;
} }
@ -214,7 +214,7 @@ QString CMS50F37Loader::getVendor()
QApplication::processEvents(); QApplication::processEvents();
} while (vendor.isEmpty() && (time.elapsed() < TIMEOUT)); } while (vendor.isEmpty() && (time.elapsed() < TIMEOUT));
qDebug() << "Vendor is " << vendor; qDebug() << "cms50f37 - Vendor is " << vendor;
return vendor; return vendor;
} }
@ -241,14 +241,14 @@ QString CMS50F37Loader::getModel()
duration_divisor = 2; duration_divisor = 2;
} }
qDebug() << "Model is " << model; qDebug() << "cms50f37 - Model is " << model;
return model; return model;
} }
QString CMS50F37Loader::getDeviceString() QString CMS50F37Loader::getDeviceString()
{ {
QString VendDev = QString("%1 %2").arg(getVendor()).arg(getModel()); QString VendDev = QString("%1 %2").arg(getVendor()).arg(getModel());
qDebug() << "USB Device String is " << VendDev; qDebug() << "cms50f37 - USB Device String is " << VendDev;
return VendDev; return VendDev;
} }
@ -264,7 +264,7 @@ QString CMS50F37Loader::getDeviceID()
QApplication::processEvents(); QApplication::processEvents();
} while (devid.isEmpty() && (time.elapsed() < TIMEOUT)); } while (devid.isEmpty() && (time.elapsed() < TIMEOUT));
qDebug() << "Device Id is " << devid; qDebug() << "cms50f37 - Device Id is " << devid;
return devid; return devid;
} }
@ -279,7 +279,7 @@ int CMS50F37Loader::getUserCount() // for future use, check, then add select us
QApplication::processEvents(); QApplication::processEvents();
} while ((userCount < 0) && (time.elapsed() < TIMEOUT)); } while ((userCount < 0) && (time.elapsed() < TIMEOUT));
qDebug() << "User count is " << userCount; qDebug() << "cms50f37 - User count is " << userCount;
return userCount; return userCount;
} }
@ -294,7 +294,7 @@ int CMS50F37Loader::getSessionCount()
QApplication::processEvents(); QApplication::processEvents();
} while ((session_count < 0) && (time.elapsed() < TIMEOUT)); } while ((session_count < 0) && (time.elapsed() < TIMEOUT));
qDebug() << "Session count is " << session_count; qDebug() << "cms50f37 - Session count is " << session_count;
return session_count; return session_count;
} }
@ -308,7 +308,7 @@ int CMS50F37Loader::getOximeterInfo()
QApplication::processEvents(); QApplication::processEvents();
} while ((device_info < 0) && (time.elapsed() < TIMEOUT)); } while ((device_info < 0) && (time.elapsed() < TIMEOUT));
qDebug() << "Device Info is " << device_info; qDebug() << "cms50f37 - Device Info is " << device_info;
return device_info; return device_info;
} }
@ -325,7 +325,7 @@ int CMS50F37Loader::getDuration(int session)
QApplication::processEvents(); QApplication::processEvents();
} while ((duration < 0) && (time.elapsed() < TIMEOUT)); } while ((duration < 0) && (time.elapsed() < TIMEOUT));
qDebug() << "Session duration is " << duration << "Divided by " << duration_divisor; qDebug() << "cms50f37 - Session duration is " << duration << "Divided by " << duration_divisor;
return duration / duration_divisor; return duration / duration_divisor;
} }
@ -351,7 +351,7 @@ QDateTime CMS50F37Loader::getDateTime(int session)
else else
datetime = QDateTime(imp_date, imp_time); datetime = QDateTime(imp_date, imp_time);
qDebug() << "Oximeter DateTime is " << datetime.toString("yyyy-MMM-dd HH:mm:ssap"); qDebug() << "cms50f37 - Oximeter DateTime is " << datetime.toString("yyyy-MMM-dd HH:mm:ssap");
return datetime; return datetime;
} }
@ -397,7 +397,7 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
if (res == resimport) break; if (res == resimport) break;
} }
// add a dummy to make up for it. // add a dummy to make up for it.
qDebug() << "pB: lost sync, padding..."; qDebug() << "cms50f37 - pB: lost sync, padding...";
oxirec->append(OxiRecord(0,0,0)); oxirec->append(OxiRecord(0,0,0));
} }
continue; continue;
@ -418,24 +418,24 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
QString extra = QString(buffer.mid(idx+3, 6)); QString extra = QString(buffer.mid(idx+3, 6));
model += extra.trimmed(); model += extra.trimmed();
modelsegments++; modelsegments++;
qDebug() << "pB: Model:" << model; qDebug() << "cms50f37 - pB: Model:" << model;
} }
break; break;
case 0x03: // Vendor string case 0x03: // Vendor string
vendor = QString(buffer.mid(idx+2, 7)); vendor = QString(buffer.mid(idx+2, 7));
qDebug() << "pB: Vendor:" << vendor; qDebug() << "cms50f37 - pB: Vendor:" << vendor;
break; break;
case 0x04: // Device Identifiers case 0x04: // Device Identifiers
devid = QString(buffer.mid(idx+2, 7)); devid = QString(buffer.mid(idx+2, 7));
qDebug() << "pB: Device ID:" << devid; qDebug() << "cms50f37 - pB: Device ID:" << devid;
break; break;
// COMMAND_GET_USER_INFO // COMMAND_GET_USER_INFO
case 0x05: // 5,80,80,f5,f3,e5,f2,80,80 case 0x05: // 5,80,80,f5,f3,e5,f2,80,80
userIdx = buffer.at(idx+2); // for future use userIdx = buffer.at(idx+2); // for future use
userName = QString(buffer.mid(idx+3).trimmed()); userName = QString(buffer.mid(idx+3).trimmed());
qDebug() << "pB: 0x05:" << userName; qDebug() << "cms50f37 - pB: 0x05:" << userName;
break; break;
// Command GET_VERSION // Command GET_VERSION
@ -456,7 +456,8 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
} }
else else
imp_date = QDate(year,month,day); imp_date = QDate(year,month,day);
qDebug() << "pB: ymd " << year << month << day << " impDate " << imp_date; qDebug() << "cms50f37 - cms50D+ detected: " << (cms50dplus ? "yes" : "no");
qDebug() << "cms50f37 - pB: ymd " << year << month << day << " impDate: " << imp_date;
break; break;
// COMMAND_GET_SESSION_DURATION // COMMAND_GET_SESSION_DURATION
@ -502,7 +503,7 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
case 0x12: // 12,80,80,80,82,a6,92,80 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)); 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"); imp_time = QTime::fromString(tmpstr, "HH:mm:ss");
qDebug() << "pB: tmpStr:" << tmpstr << " impTime " << imp_time; qDebug() << "cms50f37 - pB: tmpStr:" << tmpstr << " impTime: " << imp_time;
break; break;
case 0x13: // 13,80,a0,a0,a0,a0,a0,a0,a0 case 0x13: // 13,80,a0,a0,a0,a0,a0,a0,a0
@ -513,7 +514,7 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
case 0x09: // cms50i data sequence case 0x09: // cms50i data sequence
case 0x0f: // f,80,de,c2,de,c2,de,c2 cms50F data... case 0x0f: // f,80,de,c2,de,c2,de,c2 cms50F data...
if (!started_import) { if (!started_import) {
qDebug() << "pB: Starting import"; qDebug() << "cms50f37 - pB: Starting import";
started_import = true; started_import = true;
started_reading = true; started_reading = true;
finished_import = false; finished_import = false;
@ -538,7 +539,7 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
break; break;
default: default:
qDebug() << "pB: unknown cms50F result?" << hex << (int)res; qDebug() << "cms50f37 - pB: unknown cms50F result?" << hex << (int)res;
break; break;
} }
@ -548,7 +549,7 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
pi = buffer.at(idx+4) | (buffer.at(idx+5) << 8); pi = buffer.at(idx+4) | (buffer.at(idx+5) << 8);
pulse = buffer.at(idx+3); pulse = buffer.at(idx+3);
spo2 = buffer.at(idx+2); spo2 = buffer.at(idx+2);
qDebug() << "pB: Pulse=" << pulse << "SPO2=" << spo2 << "PI=" << pi; // qDebug() << "cms50f37 - pB: Pulse=" << pulse << "SPO2=" << spo2 << "PI=" << pi;
oxirec->append(((spo2 == 0) || (pulse == 0)) ? OxiRecord(0,0,0) : OxiRecord(pulse, spo2, pi)); oxirec->append(((spo2 == 0) || (pulse == 0)) ? OxiRecord(0,0,0) : OxiRecord(pulse, spo2, pi));
} else if (res == 0x0f) { } else if (res == 0x0f) {
@ -556,17 +557,17 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
pulse = buffer.at(idx+3); pulse = buffer.at(idx+3);
spo2 = buffer.at(idx+2); spo2 = buffer.at(idx+2);
qDebug() << "pB: Pulse=" << pulse << "SPO2=" << spo2; // qDebug() << "cms50f37 - pB: Pulse=" << pulse << "SPO2=" << spo2;
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(pulse, spo2)); oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(pulse, spo2));
pulse = buffer.at(idx+5); pulse = buffer.at(idx+5);
spo2 = buffer.at(idx+4); spo2 = buffer.at(idx+4);
qDebug() << "pB: Pulse=" << pulse << "SPO2=" << spo2; // qDebug() << "cms50f37 - pB: Pulse=" << pulse << "SPO2=" << spo2;
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(pulse, spo2)); oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(pulse, spo2));
pulse = buffer.at(idx+7); pulse = buffer.at(idx+7);
spo2 = buffer.at(idx+6); spo2 = buffer.at(idx+6);
qDebug() << "pB: Pulse=" << pulse << "SPO2=" << spo2; // qDebug() << "cms50f37 - pB: Pulse=" << pulse << "SPO2=" << spo2;
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(pulse, spo2)); oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(pulse, spo2));
} }
@ -577,9 +578,9 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
if (!started_import) { if (!started_import) {
// startTimer.singleShot(2000, this, SLOT(requestData())); // startTimer.singleShot(2000, this, SLOT(requestData()));
qDebug() << "pB: Read:" << len << size << str.join(","); qDebug() << "cms50f37 - pB: Read:" << len << size << str.join(",");
} else { } else {
qDebug() << "pB: Import:" << len << size << str.join(","); qDebug() << "cms50f37 - pB: Import:" << len << size << str.join(",");
} }
idx += len; idx += len;
@ -602,10 +603,10 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
//{ //{
// if (oxirec == nullptr) { // warn // if (oxirec == nullptr) { // warn
//} //}
//
// int available = buffer.size(); // int available = buffer.size();
// int idx = 0; // int idx = 0;
//
// QByteArray plethy; // QByteArray plethy;
// while (idx < available-5) { // while (idx < available-5) {
// if (((unsigned char)buffer.at(idx) & 0x80) != 0x80) { // if (((unsigned char)buffer.at(idx) & 0x80) != 0x80) {
@ -616,14 +617,14 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
// int pbeat=(unsigned char)buffer.at(idx + 2); // int pbeat=(unsigned char)buffer.at(idx + 2);
// int pulse=((unsigned char)buffer.at(idx + 3) & 0x7f) | ((pbeat & 0x40) << 1); // int pulse=((unsigned char)buffer.at(idx + 3) & 0x7f) | ((pbeat & 0x40) << 1);
// int spo2=(unsigned char)buffer.at(idx + 4) & 0x7f; // int spo2=(unsigned char)buffer.at(idx + 4) & 0x7f;
//
// oxirec->append(OxiRecord(pulse, spo2)); // oxirec->append(OxiRecord(pulse, spo2));
// plethy.append(pwave); // plethy.append(pwave);
//
// idx += 5; // idx += 5;
// } // }
// emit updatePlethy(plethy); // emit updatePlethy(plethy);
//
// return idx; // return idx;
//} //}
@ -636,10 +637,10 @@ void CMS50F37Loader::sendCommand(quint8 c)
QString out; QString out;
for (int i=0;i < 9;i++) for (int i=0;i < 9;i++)
out += QString().sprintf("%02X ",cmd[i]); out += QString().sprintf("%02X ",cmd[i]);
qDebug() << "Write:" << out; qDebug() << "cms50f37 - Write:" << out;
if (serial.write((char *)cmd, 9) == -1) { if (serial.write((char *)cmd, 9) == -1) {
qDebug() << "Couldn't write data bytes to CMS50F"; qDebug() << "cms50f37 - Couldn't write data bytes to CMS50F";
} }
} }
@ -652,10 +653,10 @@ void CMS50F37Loader::sendCommand(quint8 c, quint8 c2)
QString out; QString out;
for (int i=0; i < 9; ++i) for (int i=0; i < 9; ++i)
out += QString().sprintf("%02X ",cmd[i]); out += QString().sprintf("%02X ",cmd[i]);
qDebug() << "Write:" << out; qDebug() << "cms50f37 - Write:" << out;
if (serial.write((char *)cmd, 9) == -1) { if (serial.write((char *)cmd, 9) == -1) {
qDebug() << "Couldn't write data bytes to CMS50F"; qDebug() << "cms50f37 - Couldn't write data bytes to CMS50F";
} }
} }
@ -669,10 +670,10 @@ void CMS50F37Loader::eraseSession(int user, int session)
QString out; QString out;
for (int i=0; i < 9; ++i) for (int i=0; i < 9; ++i)
out += QString().sprintf("%02X ",cmd[i]); out += QString().sprintf("%02X ",cmd[i]);
qDebug() << "Erase Session: Write:" << out; qDebug() << "cms50f37 - Erase Session: Write:" << out;
if (serial.write((char *)cmd, 9) == -1) { if (serial.write((char *)cmd, 9) == -1) {
qDebug() << "Couldn't write Erase session bytes to CMS50F"; qDebug() << "cms50f37 - Couldn't write Erase session bytes to CMS50F";
} }
int z = timectr; int z = timectr;
@ -707,10 +708,10 @@ void CMS50F37Loader::setDeviceID(const QString & newid)
QString out; QString out;
for (int i=0; i < 9; ++i) for (int i=0; i < 9; ++i)
out += QString().sprintf("%02X ",cmd[i]); out += QString().sprintf("%02X ",cmd[i]);
qDebug() << "setDeviceID: Write:" << out; qDebug() << "cms50f37 - setDeviceID: Write:" << out;
if (serial.write((char *)cmd, 9) == -1) { if (serial.write((char *)cmd, 9) == -1) {
qDebug() << "Couldn't write DeviceID data bytes to CMS50F"; qDebug() << "cms50f37 - Couldn't write DeviceID data bytes to CMS50F";
} }
// Supposed to return 0x04 command, so reset devid.. // Supposed to return 0x04 command, so reset devid..
@ -737,7 +738,7 @@ void CMS50F37Loader::syncClock()
timectr = 0; timectr = 0;
if (serial.write((char *)datecmd, 9) == -1) { if (serial.write((char *)datecmd, 9) == -1) {
qDebug() << "Couldn't write date bytes to CMS50F"; qDebug() << "cms50f37 - Couldn't write date bytes to CMS50F";
} }
QTime time; QTime time;
@ -759,7 +760,7 @@ void CMS50F37Loader::syncClock()
timectr = 0; timectr = 0;
if (serial.write((char *)timecmd, 9) == -1) { if (serial.write((char *)timecmd, 9) == -1) {
qDebug() << "Couldn't write time bytes to CMS50F"; qDebug() << "cms50f37 - Couldn't write time bytes to CMS50F";
} }
time.start(); time.start();
@ -776,7 +777,7 @@ void CMS50F37Loader::nextCommand()
// Send the next command packet in sequence // Send the next command packet in sequence
sendCommand(cms50_sequence[sequence]); sendCommand(cms50_sequence[sequence]);
} else { } else {
qDebug() << "Run out of startup tasks to do and import failed!"; qDebug() << "cms50f37 - Run out of startup tasks to do and import failed!";
} }
} }
@ -789,7 +790,7 @@ void CMS50F37Loader::getSessionData(int session)
void CMS50F37Loader::resetDevice() void CMS50F37Loader::resetDevice()
{ {
qDebug() << "Resetting oximeter"; qDebug() << "cms50f37 - Resetting oximeter";
sendCommand(COMMAND_CMS50_HELLO1); sendCommand(COMMAND_CMS50_HELLO1);
QThread::msleep(100); QThread::msleep(100);
QApplication::processEvents(); QApplication::processEvents();
@ -800,7 +801,7 @@ void CMS50F37Loader::resetDevice()
void CMS50F37Loader::requestData() void CMS50F37Loader::requestData()
{ {
qDebug() << "Requesting session data"; qDebug() << "cms50f37 - Requesting session data";
sendCommand(COMMAND_GET_SESSION_DATA, selected_session); sendCommand(COMMAND_GET_SESSION_DATA, selected_session);
} }
@ -822,16 +823,16 @@ void CMS50F37Loader::resetImportTimeout()
if (imp_callbacks != cb_reset) { if (imp_callbacks != cb_reset) {
// Still receiving data.. reset timer // Still receiving data.. reset timer
qDebug() << "Still receiving data in resetImportTimeout()" << imp_callbacks << cb_reset; qDebug() << "cms50f37 - Still receiving data in resetImportTimeout()" << imp_callbacks << cb_reset;
if (resetTimer.isActive()) if (resetTimer.isActive())
resetTimer.stop(); resetTimer.stop();
if (!finished_import) resetTimer.singleShot(2000, this, SLOT(resetImportTimeout())); if (!finished_import) resetTimer.singleShot(2000, this, SLOT(resetImportTimeout()));
} else { } else {
qDebug() << "Oximeter device stopped transmitting.. Transfer complete"; qDebug() << "cms50f37 - Oximeter device stopped transmitting.. Transfer complete";
// We were importing, but now are done // We were importing, but now are done
if (!finished_import && (started_import && started_reading)) { if (!finished_import && (started_import && started_reading)) {
qDebug() << "Switching CMS50F37 back to live mode and finalizing import"; qDebug() << "cms50f37 - Switching CMS50F37 back to live mode and finalizing import";
// Turn back on live streaming so the end of capture can be dealt with // Turn back on live streaming so the end of capture can be dealt with
@ -851,7 +852,7 @@ void CMS50F37Loader::resetImportTimeout()
return; return;
} }
qDebug() << "Should CMS50F37 resetImportTimeout reach here?"; qDebug() << "cms50f37 - Should CMS50F37 resetImportTimeout reach here?";
// else what??? // else what???
} }
cb_reset = imp_callbacks; cb_reset = imp_callbacks;
@ -869,23 +870,23 @@ bool CMS50F37Loader::readSpoRFile(const QString & path)
{ {
QFile file(path); QFile file(path);
if (!file.exists()) { if (!file.exists()) {
qWarning() << "Can't find the oximeter file: " << path; qWarning() << "cms50f37 - Can't find the oximeter file: " << path;
QMessageBox::warning(nullptr, STR_MessageBox_Error, "<h2>"+tr("Could not find the oximeter file:")+"<br/><br/>"+path+"</h2>"); QMessageBox::warning(nullptr, STR_MessageBox_Error, "<h2>"+tr("Could not find the oximeter file:")+"<br/><br/>"+path+"</h2>");
return false; return false;
} }
if (!file.open(QFile::ReadOnly)) { if (!file.open(QFile::ReadOnly)) {
qWarning() << "Can't open the oximeter file: " << path; qWarning() << "cms50f37 - Can't open the oximeter file: " << path;
QMessageBox::warning(nullptr, STR_MessageBox_Error, "<h2>"+tr("Could not open the oximeter file:")+"<br/><br/>"+path+"</h2>"); QMessageBox::warning(nullptr, STR_MessageBox_Error, "<h2>"+tr("Could not open the oximeter file:")+"<br/><br/>"+path+"</h2>");
return false; return false;
} }
bool spo2header = false; bool spo2header = false;
QString ext = path.section('.', -1); QString ext = path.section('.', -1);
qDebug() << "Oximeter file extention is " << ext; qDebug() << "cms50f37 - Oximeter file extention is " << ext;
if (ext.compare("spo2",Qt::CaseInsensitive) == 0) { if (ext.compare("spo2",Qt::CaseInsensitive) == 0) {
spo2header = true; spo2header = true;
qDebug() << "Oximeter file looks like an SpO2 type" ; qDebug() << "cms50f37 - Oximeter file looks like an SpO2 type" ;
} }
QByteArray data; QByteArray data;
@ -918,7 +919,9 @@ bool CMS50F37Loader::readSpoRFile(const QString & path)
if (dchr[0]) { if (dchr[0]) {
QString dstr(dchr); QString dstr(dchr);
m_startTime = QDateTime::fromString(dstr, "MM/dd/yy HH:mm:ss"); m_startTime = QDateTime::fromString(dstr, "MM/dd/yy HH:mm:ss");
if (m_startTime.date().year() < 2000) { m_startTime = m_startTime.addYears(100); } if (m_startTime.date().year() < 2000) {
m_startTime = m_startTime.addYears(100);
}
} else { // this should probaly find the most recent SH data day } else { // this should probaly find the most recent SH data day
m_startTime = QDateTime(QDate::currentDate(), QTime(0,0,0)); // make it today at midnight m_startTime = QDateTime(QDate::currentDate(), QTime(0,0,0)); // make it today at midnight
cms50dplus = true; cms50dplus = true;
@ -931,7 +934,7 @@ bool CMS50F37Loader::readSpoRFile(const QString & path)
quint32 hour, minute, second; quint32 hour, minute, second;
if (data.at(pos) != 1) { if (data.at(pos) != 1) {
qWarning() << ".spo2 file" << path << "might be a different"; qWarning() << "cms50f37 - .spo2 file" << path << "might be a different";
} }
// Unknown cruft header... // Unknown cruft header...
@ -955,7 +958,7 @@ bool CMS50F37Loader::readSpoRFile(const QString & path)
int remainder = filesize - pos; int remainder = filesize - pos;
bytes_per_record = remainder / samples; bytes_per_record = remainder / samples;
qDebug() << samples << "samples of" << bytes_per_record << "bytes each"; qDebug() << "cms50f37 - " << samples << "samples of" << bytes_per_record << "bytes each";
// CMS50I .spo2 data have 4 digits, a 16bit, followed by spo2 then pulse // CMS50I .spo2 data have 4 digits, a 16bit, followed by spo2 then pulse
@ -1019,7 +1022,7 @@ void CMS50F37Loader::Register()
{ {
if (cms50f37_initialized) { return; } if (cms50f37_initialized) { return; }
qDebug() << "Registering CMS50F37Loader"; qDebug() << "cms50f37 - Registering CMS50F37Loader";
RegisterLoader(new CMS50F37Loader()); RegisterLoader(new CMS50F37Loader());
cms50f37_initialized = true; cms50f37_initialized = true;
} }

10
oscar/SleepLib/serialoximeter.cpp
View File

@ -30,7 +30,7 @@ bool SerialOximeter::scanDevice(QString keyword, quint16 vendor_id, quint16 prod
static bool dumponce = true; static bool dumponce = true;
QStringList ports; QStringList ports;
qDebug() << "Scanning for USB Serial devices"; qDebug() << "seroxi - Scanning for USB Serial devices";
QList<QSerialPortInfo> list=QSerialPortInfo::availablePorts(); QList<QSerialPortInfo> list=QSerialPortInfo::availablePorts();
// How does the mac detect this as a SPO2 device? // How does the mac detect this as a SPO2 device?
@ -51,7 +51,7 @@ bool SerialOximeter::scanDevice(QString keyword, quint16 vendor_id, quint16 prod
if (info->hasVendorIdentifier()) // 4292 if (info->hasVendorIdentifier()) // 4292
dbg += QString(" VID: %1").arg(info->vendorIdentifier()); dbg += QString(" VID: %1").arg(info->vendorIdentifier());
qDebug() << dbg.toLocal8Bit().data(); qDebug() << "seroxi - " << dbg.toLocal8Bit().data();
break; break;
} else if (dumponce) { } else if (dumponce) {
QString dbg=QString("Other Serial Port: Name: %1 Desc: %2 Manufacturer: %3 Location: %4").arg(name).arg(desc).arg(info->manufacturer()).arg(info->systemLocation()); QString dbg=QString("Other Serial Port: Name: %1 Desc: %2 Manufacturer: %3 Location: %4").arg(name).arg(desc).arg(info->manufacturer()).arg(info->systemLocation());
@ -61,7 +61,7 @@ bool SerialOximeter::scanDevice(QString keyword, quint16 vendor_id, quint16 prod
if (info->hasVendorIdentifier()) // 4292 if (info->hasVendorIdentifier()) // 4292
dbg += QString(" VID: %1").arg(info->vendorIdentifier()); dbg += QString(" VID: %1").arg(info->vendorIdentifier());
qDebug() << dbg.toLocal8Bit().data(); qDebug() << "seroxi - " << dbg.toLocal8Bit().data();
} }
} }
dumponce = false; dumponce = false;
@ -69,7 +69,7 @@ bool SerialOximeter::scanDevice(QString keyword, quint16 vendor_id, quint16 prod
return false; return false;
} }
if (ports.size()>1) { if (ports.size()>1) {
qDebug() << "More than one serial device matching these parameters was found, choosing the first by default"; qDebug() << "seroxi - More than one serial device matching these parameters was found, choosing the first by default";
} }
port=ports.at(0); port=ports.at(0);
return true; return true;
@ -81,7 +81,7 @@ void SerialOximeter::closeDevice()
disconnect(&serial,SIGNAL(readyRead()), this, SLOT(dataAvailable())); disconnect(&serial,SIGNAL(readyRead()), this, SLOT(dataAvailable()));
serial.close(); serial.close();
m_streaming = false; m_streaming = false;
qDebug() << "Port" << port << "closed"; qDebug() << "seroxi - Port" << port << "closed";
} }
bool SerialOximeter::openDevice() bool SerialOximeter::openDevice()

114
oscar/oximeterimport.cpp
View File

@ -117,12 +117,15 @@ OximeterImport::OximeterImport(QWidget *parent) :
OximeterImport::~OximeterImport() OximeterImport::~OximeterImport()
{ {
if (!dummyday) { if (dummyday != nullptr) {
delete dummyday; delete dummyday;
} }
if (!session) { if (session != nullptr) {
delete session; delete session;
} }
if (ELplethy != nullptr) {
delete ELplethy;
}
disconnect(sessbar, SIGNAL(sessionClicked(Session*)), this, SLOT(onSessionSelected(Session*))); disconnect(sessbar, SIGNAL(sessionClicked(Session*)), this, SLOT(onSessionSelected(Session*)));
delete ui; delete ui;
@ -146,17 +149,14 @@ void OximeterImport::on_nextButton_clicked()
break; break;
default: default:
ui->informationButton->setVisible(true); ui->informationButton->setVisible(true);
ui->nextButton->setVisible(true); ui->nextButton->setVisible(true);
} }
ui->stackedWidget->setCurrentIndex(i); ui->stackedWidget->setCurrentIndex(i);
} }
void OximeterImport::updateStatus(QString msg) void OximeterImport::updateStatus(QString msg)
{ {
qDebug() << "updateStatus to " << msg; qDebug() << "oximod - updateStatus to " << msg;
ui->logBox->appendPlainText(msg); ui->logBox->appendPlainText(msg);
ui->directImportStatus->setText(msg); ui->directImportStatus->setText(msg);
ui->liveStatusLabel->setText(msg); ui->liveStatusLabel->setText(msg);
@ -168,7 +168,7 @@ SerialOximeter * OximeterImport::detectOximeter()
const int PORTSCAN_TIMEOUT=30000; const int PORTSCAN_TIMEOUT=30000;
const int delay=100; const int delay=100;
qDebug() << "Attempt to detect Oximeter"; qDebug() << "oximod - Attempt to detect Oximeter";
ui->retryButton->setVisible(false); ui->retryButton->setVisible(false);
QList<SerialOximeter *> loaders; // GetOxiLoaders(); QList<SerialOximeter *> loaders; // GetOxiLoaders();
@ -201,9 +201,9 @@ SerialOximeter * OximeterImport::detectOximeter()
oximodule = oxi; oximodule = oxi;
break; break;
} }
} }
if (oximodule) if (oximodule)
break; break;
QThread::msleep(delay); QThread::msleep(delay);
@ -237,7 +237,7 @@ void OximeterImport::on_directImportButton_clicked()
ui->informationButton->setVisible(false); ui->informationButton->setVisible(false);
ui->stackedWidget->setCurrentWidget(ui->directImportPage); ui->stackedWidget->setCurrentWidget(ui->directImportPage);
qDebug() << "Direct Import button clicked" ; qDebug() << "oximod - Direct Import button clicked" ;
oximodule = detectOximeter(); oximodule = detectOximeter();
if (!oximodule) if (!oximodule)
return; return;
@ -263,6 +263,9 @@ void OximeterImport::on_directImportButton_clicked()
oximodule->resetDevice(); oximodule->resetDevice();
int session_count = oximodule->getSessionCount(); int session_count = oximodule->getSessionCount();
QDateTime startTime = QDateTime();
int duration = 0;
qDebug() << "oximod - Session count: " << session_count;
if (session_count > 1) { if (session_count > 1) {
ui->stackedWidget->setCurrentWidget(ui->chooseSessionPage); ui->stackedWidget->setCurrentWidget(ui->chooseSessionPage);
@ -279,13 +282,13 @@ void OximeterImport::on_directImportButton_clicked()
int h, m, s; int h, m, s;
for (int i=0; i< session_count; ++i) { for (int i=0; i< session_count; ++i) {
int duration = oximodule->getDuration(i); duration = oximodule->getDuration(i);
QDateTime datetime = oximodule->getDateTime(i); startTime = oximodule->getDateTime(i);
h = duration / 3600; h = duration / 3600;
m = (duration / 60) % 60; m = (duration / 60) % 60;
s = duration % 60; s = duration % 60;
item = new QTableWidgetItem(datetime.date().toString(Qt::SystemLocaleShortDate)+" "+datetime.time().toString("HH:mm:ss")); item = new QTableWidgetItem(startTime.date().toString(Qt::SystemLocaleShortDate)+" "+startTime.time().toString("HH:mm:ss"));
ui->tableOxiSessions->setItem(i, 0, item); ui->tableOxiSessions->setItem(i, 0, item);
// item->setData(Qt::UserRole+1, datetime); // item->setData(Qt::UserRole+1, datetime);
// item->setData(Qt::UserRole, i); // item->setData(Qt::UserRole, i);
@ -306,20 +309,22 @@ void OximeterImport::on_directImportButton_clicked()
return; return;
} else if (session_count > 0) { } else if (session_count > 0) {
chosen_sessions.push_back(0); chosen_sessions.push_back(0);
oximodule->getDuration(0); duration = oximodule->getDuration(0);
oximodule->setStartTime(oximodule->getDateTime(0)); startTime = oximodule->getDateTime(0);
oximodule->setStartTime(startTime);
qDebug() << "oximod - Session start time: " << startTime.toString();
} }
doImport(); doImport();
} }
void OximeterImport::doImport() void OximeterImport::doImport()
{ {
qDebug() << "Starting doImport"; qDebug() << "oximod - Starting doImport";
if (oximodule->commandDriven()) { if (oximodule->commandDriven()) {
if (chosen_sessions.size() == 0) { if (chosen_sessions.size() == 0) {
qDebug() << "oximod - Chosen session size is zero - quitting";
ui->connectLabel->setText("<h2>"+tr("Nothing to import")+"</h2>"); ui->connectLabel->setText("<h2>"+tr("Nothing to import")+"</h2>");
updateStatus(tr("Your oximeter did not have any valid sessions.")); updateStatus(tr("Your oximeter did not have any valid sessions."));
ui->cancelButton->setText(tr("Close")); ui->cancelButton->setText(tr("Close"));
return; return;
@ -329,12 +334,10 @@ void OximeterImport::doImport()
} else { } else {
ui->connectLabel->setText("<h2>"+tr("Select upload option on %1").arg(oximodule->loaderName())+"</h2>"); ui->connectLabel->setText("<h2>"+tr("Select upload option on %1").arg(oximodule->loaderName())+"</h2>");
ui->logBox->appendPlainText(tr("You need to tell your oximeter to begin sending data to the computer.")); ui->logBox->appendPlainText(tr("You need to tell your oximeter to begin sending data to the computer."));
updateStatus(tr("Please connect your oximeter, enter it's menu and select upload to commence data transfer...")); updateStatus(tr("Please connect your oximeter, enter it's menu and select upload to commence data transfer..."));
} }
connect(oximodule, SIGNAL(updateProgress(int,int)), this, SLOT(doUpdateProgress(int,int))); connect(oximodule, SIGNAL(updateProgress(int,int)), this, SLOT(doUpdateProgress(int,int)));
oximodule->Open("import"); oximodule->Open("import");
if (oximodule->commandDriven()) { if (oximodule->commandDriven()) {
@ -376,7 +379,7 @@ void OximeterImport::finishedImport(SerialOximeter * oxi)
{ {
Q_UNUSED(oxi); Q_UNUSED(oxi);
qDebug() << "finished Import "; qDebug() << "oximod - finished Import ";
connect(oximodule, SIGNAL(importComplete(SerialOximeter*)), this, SLOT(finishedImport(SerialOximeter*))); connect(oximodule, SIGNAL(importComplete(SerialOximeter*)), this, SLOT(finishedImport(SerialOximeter*)));
ui->cancelButton->setVisible(true); ui->cancelButton->setVisible(true);
@ -403,7 +406,7 @@ void OximeterImport::on_fileImportButton_clicked()
const QString documentsFolder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation); const QString documentsFolder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
qDebug() << "File Import button clicked"; qDebug() << "oximod - File Import button clicked";
QString filename = QFileDialog::getOpenFileName(nullptr , tr("Select a valid oximetry data file"), documentsFolder, tr("Oximetry Files (*.spo *.spor *.spo2 *.SpO2 *.dat)")); QString filename = QFileDialog::getOpenFileName(nullptr , tr("Select a valid oximetry data file"), documentsFolder, tr("Oximetry Files (*.spo *.spor *.spo2 *.SpO2 *.dat)"));
@ -413,7 +416,7 @@ void OximeterImport::on_fileImportButton_clicked()
// Make sure filename dialog had time to close properly.. // Make sure filename dialog had time to close properly..
QApplication::processEvents(); QApplication::processEvents();
qDebug() << "Chosen filename is " << filename; qDebug() << "oximod - Chosen filename is " << filename;
QList<SerialOximeter *> loaders = GetOxiLoaders(); QList<SerialOximeter *> loaders = GetOxiLoaders();
bool success = false; bool success = false;
@ -430,7 +433,7 @@ void OximeterImport::on_fileImportButton_clicked()
QMessageBox::warning(this, STR_MessageBox_Warning, tr("No Oximetry module could parse the given file:")+QString("\n\n%1").arg(filename), QMessageBox::Ok); QMessageBox::warning(this, STR_MessageBox_Warning, tr("No Oximetry module could parse the given file:")+QString("\n\n%1").arg(filename), QMessageBox::Ok);
return; return;
} }
qDebug() << "Using loader " << oximodule->loaderName(); qDebug() << "oximod - Using loader " << oximodule->loaderName();
ui->informationButton->setVisible(false); ui->informationButton->setVisible(false);
importMode = IM_FILE; importMode = IM_FILE;
@ -442,14 +445,14 @@ void OximeterImport::on_fileImportButton_clicked()
// oximodule->setStartTime( ??? ); Nope, it was set in the loader module by the file import routime // oximodule->setStartTime( ??? ); Nope, it was set in the loader module by the file import routime
on_syncButton_clicked(); on_syncButton_clicked();
} }
qDebug() << "Finished file import: Oximodule startTime is " << oximodule->startTime().toString("yyyy-MMM-dd HH:mm:ss"); qDebug() << "oximod - Finished file import: Oximodule startTime is " << oximodule->startTime().toString("yyyy-MMM-dd HH:mm:ss");
} }
void OximeterImport::on_liveImportButton_clicked() void OximeterImport::on_liveImportButton_clicked()
{ {
ui->informationButton->setVisible(false); ui->informationButton->setVisible(false);
qDebug() << "Live Import button clicked"; qDebug() << "oximod - Live Import button clicked";
ui->stackedWidget->setCurrentWidget(ui->liveImportPage); ui->stackedWidget->setCurrentWidget(ui->liveImportPage);
ui->liveImportPage->layout()->addWidget(ui->progressBar); ui->liveImportPage->layout()->addWidget(ui->progressBar);
QApplication::processEvents(); QApplication::processEvents();
@ -515,7 +518,7 @@ void OximeterImport::on_liveImportButton_clicked()
void OximeterImport::finishedRecording() void OximeterImport::finishedRecording()
{ {
qDebug() << "Finished Recording"; qDebug() << "oximod - Finished Recording";
updateTimer.stop(); updateTimer.stop();
oximodule->closeDevice(); oximodule->closeDevice();
@ -539,7 +542,7 @@ void OximeterImport::finishedRecording()
void OximeterImport::on_retryButton_clicked() void OximeterImport::on_retryButton_clicked()
{ {
qDebug() << "Retry button clicked"; qDebug() << "oximod - Retry button clicked";
if (ui->stackedWidget->currentWidget() == ui->directImportPage) { if (ui->stackedWidget->currentWidget() == ui->directImportPage) {
on_directImportButton_clicked(); on_directImportButton_clicked();
} else if (ui->stackedWidget->currentWidget() == ui->liveImportPage) { } else if (ui->stackedWidget->currentWidget() == ui->liveImportPage) {
@ -549,7 +552,7 @@ void OximeterImport::on_retryButton_clicked()
void OximeterImport::on_stopButton_clicked() void OximeterImport::on_stopButton_clicked()
{ {
qDebug() << "Stop button clicked"; qDebug() << "oximod - Stop button clicked";
if (oximodule) { if (oximodule) {
oximodule->abort(); oximodule->abort();
} }
@ -557,8 +560,9 @@ void OximeterImport::on_stopButton_clicked()
void OximeterImport::on_calendarWidget_clicked(const QDate &date) void OximeterImport::on_calendarWidget_clicked(const QDate &date)
{ {
qDebug() << "Calendar widget clicked " << date.toString("yyyy-MMM-dd"); qDebug() << "oximod - Calendar widget clicked " << date.toString("yyyy-MMM-dd");
if (ui->radioSyncCPAP->isChecked()) { if (ui->radioSyncCPAP->isChecked()) {
qDebug() << "oximod - Syncing to a CPAP session";
Day * day = p_profile->GetGoodDay(date, MT_CPAP); Day * day = p_profile->GetGoodDay(date, MT_CPAP);
sessbar->clear(); sessbar->clear();
@ -580,13 +584,13 @@ void OximeterImport::on_calendarWidget_clicked(const QDate &date)
ui->dateTimeEdit->setDateTime(time); ui->dateTimeEdit->setDateTime(time);
} else { } else {
ui->sessbarLabel->setText(tr("No CPAP data available on %1").arg(date.toString(Qt::SystemLocaleLongDate))); ui->sessbarLabel->setText(tr("No CPAP data available on %1").arg(date.toString(Qt::SystemLocaleLongDate)));
qDebug() << "Using oximeter time " << oximodule->startTime().toString("yyyy-MMM-dd hh:mm:ssap") << "on date " << date.toString(Qt::SystemLocaleLongDate); qDebug() << "oximod - Using oximeter time " << oximodule->startTime().toString("yyyy-MMM-dd hh:mm:ssap") << "on date " << date.toString(Qt::SystemLocaleLongDate);
ui->dateTimeEdit->setDateTime(QDateTime(date,oximodule->startTime().time())); ui->dateTimeEdit->setDateTime(QDateTime(date,oximodule->startTime().time()));
} }
sessbar->update(); sessbar->update();
} else if (ui->radioSyncOximeter) { } else if (ui->radioSyncOximeter) {
qDebug() << "Using oximeter date and time"; qDebug() << "oximod - Using oximeter date and time";
ui->sessbarLabel->setText(tr("%1").arg(date.toString(Qt::SystemLocaleLongDate))); ui->sessbarLabel->setText(tr("%1").arg(date.toString(Qt::SystemLocaleLongDate)));
ui->dateTimeEdit->setDateTime(QDateTime(date, ui->dateTimeEdit->dateTime().time())); ui->dateTimeEdit->setDateTime(QDateTime(date, ui->dateTimeEdit->dateTime().time()));
} }
@ -600,13 +604,13 @@ void OximeterImport::on_calendarWidget_selectionChanged()
void OximeterImport::onSessionSelected(Session * session) void OximeterImport::onSessionSelected(Session * session)
{ {
QDateTime time=QDateTime::fromMSecsSinceEpoch(session->first(), Qt::LocalTime); QDateTime time=QDateTime::fromMSecsSinceEpoch(session->first(), Qt::LocalTime);
qDebug() << "Selected session starts at " << time.toString("yyyy-MMM-dd hh:mm:ssap"); qDebug() << "oximod - Selected session starts at " << time.toString("yyyy-MMM-dd hh:mm:ssap");
ui->dateTimeEdit->setDateTime(time); ui->dateTimeEdit->setDateTime(time);
} }
void OximeterImport::on_sessionBackButton_clicked() void OximeterImport::on_sessionBackButton_clicked()
{ {
qDebug() << "Session Back button clicked"; qDebug() << "oximod - Session Back button clicked";
int idx = (sessbar->selected()-1); int idx = (sessbar->selected()-1);
if (idx >= 0) { if (idx >= 0) {
sessbar->setSelected(idx); sessbar->setSelected(idx);
@ -618,7 +622,7 @@ void OximeterImport::on_sessionBackButton_clicked()
void OximeterImport::on_sessionForwardButton_clicked() void OximeterImport::on_sessionForwardButton_clicked()
{ {
qDebug() << "Session Forward button clicked"; qDebug() << "oximod - Session Forward button clicked";
int idx = (sessbar->selected()+1); int idx = (sessbar->selected()+1);
if (idx < sessbar->count()) { if (idx < sessbar->count()) {
sessbar->setSelected(idx); sessbar->setSelected(idx);
@ -630,6 +634,7 @@ void OximeterImport::on_sessionForwardButton_clicked()
void OximeterImport::on_radioSyncCPAP_clicked() void OximeterImport::on_radioSyncCPAP_clicked()
{ {
qDebug() << "oximod - Use CPAP Time button clicked";
on_calendarWidget_clicked(oximodule->startTime().date()); on_calendarWidget_clicked(oximodule->startTime().date());
ui->syncCPAPGroup->setVisible(true); ui->syncCPAPGroup->setVisible(true);
@ -638,15 +643,18 @@ void OximeterImport::on_radioSyncCPAP_clicked()
void OximeterImport::on_radioSyncOximeter_clicked() void OximeterImport::on_radioSyncOximeter_clicked()
{ {
qDebug() << "Use OximeterTime button clicked"; qDebug() << "oximod - Use OximeterTime button clicked";
ui->syncCPAPGroup->setVisible(false); ui->syncCPAPGroup->setVisible(false);
if ( oximodule ) { if ( oximodule ) {
if (oximodule->isStartTimeValid()) { if (oximodule->isStartTimeValid()) {
qDebug() << "Oximeter time is valid " << oximodule->startTime().toString("yyyy-MMM-dd HH:mm:ssap"); qDebug() << "oximod - Oximeter time is valid " << oximodule->startTime().toString("yyyy-MMM-dd HH:mm:ssap");
ui->calendarWidget->setSelectedDate(oximodule->startTime().date()); ui->calendarWidget->setSelectedDate(oximodule->startTime().date());
ui->dateTimeEdit->setDateTime(oximodule->startTime()); ui->dateTimeEdit->setDateTime(oximodule->startTime());
} else } else {
qDebug() << "Oximeter time is not valid"; qDebug() << "oximod - Oximeter time is not valid" << oximodule->startTime().toString("yyyy-MMM-dd HH:mm:ssap");
ui->calendarWidget->setSelectedDate(oximodule->startTime().date());
ui->dateTimeEdit->setDateTime(oximodule->startTime());
}
} }
} }
@ -745,7 +753,7 @@ void OximeterImport::updateLiveDisplay()
void OximeterImport::on_cancelButton_clicked() void OximeterImport::on_cancelButton_clicked()
{ {
qDebug() << "Cancel button clicked"; qDebug() << "oximod - Cancel button clicked";
if (oximodule && oximodule->isStreaming()) { if (oximodule && oximodule->isStreaming()) {
oximodule->closeDevice(); oximodule->closeDevice();
oximodule->trashRecords(); oximodule->trashRecords();
@ -779,12 +787,12 @@ void OximeterImport::on_informationButton_clicked()
void OximeterImport::on_syncButton_clicked() void OximeterImport::on_syncButton_clicked()
{ {
qDebug() << "Sync button clicked"; qDebug() << "oximod - Sync button clicked";
if (oximodule == nullptr) { if (oximodule == nullptr) {
qCritical() << "OximeterImport::on_syncButton_clicked called when oximodule is null"; qCritical() << "oximod - OximeterImport::on_syncButton_clicked called when oximodule is null";
return; return;
} }
qDebug() << "Oximodule Start Time is " << oximodule->startTime().toString("yyyy-MMM-dd HH.mm.ss") << "Duration: " << oximodule->getDuration(/* dummy */ 0 ); qDebug() << "oximod Start Time is " << oximodule->startTime().toString("yyyy-MMM-dd HH.mm.ss") << "Duration: " << oximodule->getDuration(/* dummy */ 0 );
ui->stackedWidget->setCurrentWidget(ui->syncPage); ui->stackedWidget->setCurrentWidget(ui->syncPage);
@ -795,7 +803,7 @@ void OximeterImport::on_syncButton_clicked()
QDate last = p_profile->LastDay(); QDate last = p_profile->LastDay();
QDate oxidate = oximodule->startTime().date(); QDate oxidate = oximodule->startTime().date();
qDebug() << "Oximodule start date is " << oxidate.toString("yyyy-MMM-dd"); qDebug() << "oximod - start date is " << oxidate.toString("yyyy-MMM-dd");
if ((oxidate >= first) && (oxidate <= last)) { if ((oxidate >= first) && (oxidate <= last)) {
@ -826,7 +834,7 @@ void OximeterImport::on_syncButton_clicked()
void OximeterImport::on_saveButton_clicked() void OximeterImport::on_saveButton_clicked()
{ {
qDebug() << "Oximeter Save button clicked"; qDebug() << "oximod - Oximeter Save button clicked";
if (!oximodule) return; if (!oximodule) return;
QVector<OxiRecord> * oxirec = nullptr; QVector<OxiRecord> * oxirec = nullptr;
@ -837,8 +845,10 @@ void OximeterImport::on_saveButton_clicked()
return; return;
} }
oxirec = oximodule->oxisessions[oximodule->startTime()]; oxirec = oximodule->oxisessions[oximodule->startTime()];
if (oxirec->size() < 10) if (oxirec->size() < 10) {
qDebug() << "oximod - oxirec size less than 10 - quitting";
return; return;
}
// this can move to SerialOximeter class process function... // this can move to SerialOximeter class process function...
@ -890,6 +900,7 @@ void OximeterImport::on_saveButton_clicked()
int size = oxirec->size(); int size = oxirec->size();
// why was I skipping the first sample? not priming it anymore.. // why was I skipping the first sample? not priming it anymore..
qDebug() << "oximod = Creating event list for pulse and O2 saturation";
for (int i=0; i < size; ++i) { for (int i=0; i < size; ++i) {
OxiRecord * rec = &(*oxirec)[i]; OxiRecord * rec = &(*oxirec)[i];
@ -973,7 +984,6 @@ void OximeterImport::on_saveButton_clicked()
session->setLast(OXI_SPO2, ti); session->setLast(OXI_SPO2, ti);
} }
if (haveperf && ELperf && lastperf > 0) { if (haveperf && ELperf && lastperf > 0) {
ELperf->AddEvent(ti, lastperf); ELperf->AddEvent(ti, lastperf);
session->setLast(OXI_Perf, ti); session->setLast(OXI_Perf, ti);
@ -990,6 +1000,8 @@ void OximeterImport::on_saveButton_clicked()
calcSPO2Drop(session); calcSPO2Drop(session);
calcPulseChange(session); calcPulseChange(session);
qDebug() << "oximod - Setting up machine and session";
mach->setModel(oximodule->getModel()); mach->setModel(oximodule->getModel());
mach->setBrand(oximodule->getVendor()); mach->setBrand(oximodule->getVendor());
@ -1023,11 +1035,15 @@ void OximeterImport::on_saveButton_clicked()
session->setOpened(true); session->setOpened(true);
qDebug() << "oximod - Adding session to machine";
mach->AddSession(session); mach->AddSession(session);
qDebug() << "oximod - Saving machine";
mach->Save(); mach->Save();
mach->SaveSummaryCache(); mach->SaveSummaryCache();
p_profile->StoreMachines(); p_profile->StoreMachines();
mainwin->EnableTabs(true); // somebody has to do it...
mainwin->getDaily()->LoadDate(mainwin->getDaily()->getDate()); mainwin->getDaily()->LoadDate(mainwin->getDaily()->getDate());
mainwin->getOverview()->ReloadGraphs(); mainwin->getOverview()->ReloadGraphs();
@ -1040,7 +1056,7 @@ void OximeterImport::on_saveButton_clicked()
void OximeterImport::chooseSession() void OximeterImport::chooseSession()
{ {
qDebug() << "Oximeter Choose Session called"; qDebug() << "oximod - Oximeter Choose Session called";
selecting_session = false; selecting_session = false;
ui->stackedWidget->setCurrentWidget(ui->chooseSessionPage); ui->stackedWidget->setCurrentWidget(ui->chooseSessionPage);
@ -1084,7 +1100,7 @@ void OximeterImport::chooseSession()
void OximeterImport::on_chooseSessionButton_clicked() void OximeterImport::on_chooseSessionButton_clicked()
{ {
qDebug() << "Chosen session clicked"; qDebug() << "oximod - Chosen session clicked";
ui->chooseSessionButton->setVisible(false); ui->chooseSessionButton->setVisible(false);
QTableWidgetItem * item_0 = ui->tableOxiSessions->item(ui->tableOxiSessions->currentRow(),0); QTableWidgetItem * item_0 = ui->tableOxiSessions->item(ui->tableOxiSessions->currentRow(),0);
@ -1151,7 +1167,7 @@ void OximeterImport::on_oximeterType_currentIndexChanged(int index)
ui->oldCMS50specific->setVisible(false); ui->oldCMS50specific->setVisible(false);
ui->newCMS50settingsPanel->setVisible(true); ui->newCMS50settingsPanel->setVisible(true);
break; break;
case 1: // Olds CMS50's case 1: // Old CMS50's
ui->directImportButton->setEnabled(true); ui->directImportButton->setEnabled(true);
ui->liveImportButton->setEnabled(true); ui->liveImportButton->setEnabled(true);
ui->fileImportButton->setEnabled(true); ui->fileImportButton->setEnabled(true);