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

Fix crash in oximeter file import

Browse Source
This commit is contained in:
Mark Watkins 2014-05-28 19:43:18 +10:00
parent a01395e267
commit d82a041db0
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sleepyhead/oximeterimport.cpp
View File

@ -272,11 +272,13 @@ void OximeterImport::on_fileImportButton_clicked()
#endif #endif
QString filename = QFileDialog::getOpenFileName(this, tr("Select a valid oximetry data file"), documentsFolder, "Oximetry Files (*.spo *.spor *.dat)"); QString filename = QFileDialog::getOpenFileName(nullptr , tr("Select a valid oximetry data file"), documentsFolder, "Oximetry Files (*.spo *.spor *.dat)");
if (filename.isEmpty()) if (filename.isEmpty())
return; return;
// Make sure filename dialog had time to close properly.. // Make sure filename dialog had time to close properly..
QApplication::processEvents(); QApplication::processEvents();
@ -648,14 +650,8 @@ void OximeterImport::on_syncButton_clicked()
void OximeterImport::on_saveButton_clicked() void OximeterImport::on_saveButton_clicked()
{ {
int size = oximodule->oxirec->size();
if (size < 2) {
QMessageBox::warning(this, STR_MessageBox_Warning, tr("Not enough recorded oximetry data."), QMessageBox::Ok);
return;
}
if (!oximodule) return; if (!oximodule) return;
QVector<OxiRecord> * oxirec = nullptr; QVector<OxiRecord> * oxirec = nullptr;
if (!oximodule->oxisessions.contains(oximodule->startTime())) { if (!oximodule->oxisessions.contains(oximodule->startTime())) {
@ -664,6 +660,8 @@ void OximeterImport::on_saveButton_clicked()
return; return;
} }
oxirec = oximodule->oxisessions[oximodule->startTime()]; oxirec = oximodule->oxisessions[oximodule->startTime()];
if (oxirec->size() < 10)
return;
// this can move to SerialOximeter class process function... // this can move to SerialOximeter class process function...
@ -706,6 +704,7 @@ void OximeterImport::on_saveButton_clicked()
qint64 step = (importMode == IM_LIVE) ? oximodule->liveResolution() : oximodule->importResolution(); qint64 step = (importMode == IM_LIVE) ? oximodule->liveResolution() : oximodule->importResolution();
int size = oxirec->size();
for (int i=1; i < size; ++i) { for (int i=1; i < size; ++i) {
OxiRecord * rec = &(*oxirec)[i]; OxiRecord * rec = &(*oxirec)[i];