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

CMS50I session select test 6

Browse Source
This commit is contained in:
Mark Watkins 2014-08-19 14:19:16 +10:00
parent 5f9f6271a9
commit b95de3c947
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,7 +186,8 @@ QString CMS50F37Loader::getUser()
QString CMS50F37Loader::getVendor()
{
vendor = QString();
if (!vendor.isEmpty()) return vendor;
sendCommand(COMMAND_GET_OXIMETER_VENDOR);
QTime time;
@ -199,7 +200,8 @@ QString CMS50F37Loader::getVendor()
QString CMS50F37Loader::getModel()
{
model = QString();
if (!model.isEmpty()) return model;
sendCommand(COMMAND_GET_OXIMETER_MODEL);
QTime time;

11
sleepyhead/oximeterimport.cpp
View File

@ -254,16 +254,16 @@ void OximeterImport::on_directImportButton_clicked()
ui->tableOxiSessions->setItem(i, 1, item);
item->setFlags(item->flags() & ~Qt::ItemIsEditable);
item = new QTableWidgetItem(tr("%1 Session #%2").arg(oximodule->loaderName()).arg(i+1, 0));
item = new QTableWidgetItem(tr("%1 Session #%2").arg(oximodule->getModel()).arg(i+1, 0));
ui->tableOxiSessions->setItem(i, 2, item);
item->setFlags(item->flags() & ~Qt::ItemIsEditable);
}
selecting_session = true;
ui->tableOxiSessions->selectRow(chosen_session = 0);
ui->tableOxiSessions->selectRow(0);
return;
} else {
chosen_session = 0;
chosen_sessions.push_back(0);
oximodule->getDuration(0);
oximodule->setStartTime(oximodule->getDateTime(0));
}
@ -284,7 +284,8 @@ void OximeterImport::doImport()
oximodule->Open("import");
if (oximodule->commandDriven()) {
oximodule->getSessionData(chosen_session);
int chosen=chosen_sessions.takeFirst();
oximodule->getSessionData(chosen);
}
// Wait to start import streaming..
@ -990,7 +991,7 @@ void OximeterImport::on_chooseSessionButton_clicked()
if (selecting_session) {
ui->stackedWidget->setCurrentWidget(ui->directImportPage);
chosen_session = item->data(Qt::UserRole).toInt();
chosen_sessions.push_back(item->data(Qt::UserRole).toInt());
// go back and start import
doImport();

3
sleepyhead/oximeterimport.h
View File

@ -106,8 +106,7 @@ private:
int spo2;
bool selecting_session;
int chosen_session;
QList<int> chosen_sessions;
};
#endif // OXIMETERIMPORT_H

2
sleepyhead/oximeterimport.ui
View File

@ -1349,7 +1349,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
</attribute>
<column>
<property name="text">
<string>Import Time</string>
<string>Start Time</string>
</property>
</column>
<column>