From a15f9851e8f4248bc220b489023552e26a27d6b5 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 19 Aug 2014 14:30:27 +1000 Subject: [PATCH] CMS50I session select test 7 --- sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp | 3 +++ sleepyhead/oximeterimport.cpp | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp index 05516647..4e357c06 100644 --- a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp @@ -53,6 +53,9 @@ CMS50F37Loader::CMS50F37Loader() duration_divisor = 2; + model = QString(); + vendor = QString(); + } CMS50F37Loader::~CMS50F37Loader() diff --git a/sleepyhead/oximeterimport.cpp b/sleepyhead/oximeterimport.cpp index 3f21df42..652dcda0 100644 --- a/sleepyhead/oximeterimport.cpp +++ b/sleepyhead/oximeterimport.cpp @@ -222,6 +222,8 @@ void OximeterImport::on_directImportButton_clicked() if (!oximodule) return; + QString model = oximodule->getModel(); + oximodule->resetDevice(); int session_count = oximodule->getSessionCount(); @@ -236,6 +238,8 @@ void OximeterImport::on_directImportButton_clicked() ui->tableOxiSessions->setRowCount(session_count); ui->tableOxiSessions->setSelectionBehavior(QAbstractItemView::SelectRows); + ui->tableOxiSessions->setColumnWidth(0,150); + int h, m, s; for (int i=0; i< session_count; ++i) { @@ -254,7 +258,7 @@ 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->getModel()).arg(i+1, 0)); + item = new QTableWidgetItem(tr("%1 Session %2 (%3s)").arg(model).arg(i+1, 0).arg(duration)); ui->tableOxiSessions->setItem(i, 2, item); item->setFlags(item->flags() & ~Qt::ItemIsEditable); }