From 964d6b8862021a4d800511647ce5de7afef949a8 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 19 Sep 2014 01:33:50 +1000 Subject: [PATCH] Fix item delegates in Event/Waveform preferences --- sleepyhead/Graphs/gSessionTimesChart.cpp | 4 ++-- sleepyhead/overview.cpp | 6 +++++- sleepyhead/preferencesdialog.cpp | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sleepyhead/Graphs/gSessionTimesChart.cpp b/sleepyhead/Graphs/gSessionTimesChart.cpp index d5a00d70..9b01dc5e 100644 --- a/sleepyhead/Graphs/gSessionTimesChart.cpp +++ b/sleepyhead/Graphs/gSessionTimesChart.cpp @@ -898,7 +898,7 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion & float s2 = double(slice.end - slice.start) / 3600000.0; QColor col = (slice.status == EquipmentOn) ? goodcolor : Qt::black; - QString txt = QObject::tr("%1\nLength:%3\nStart:%2\n").arg(it.key().toString(Qt::SystemLocaleDate)).arg(st.time().toString("hh:mm:ss")).arg(s2,0,'f',2); + QString txt = QObject::tr("%1\nLength: %3\nStart: %2\n").arg(it.key().toString(Qt::SystemLocaleDate)).arg(st.time().toString("hh:mm:ss")).arg(s2,0,'f',2); txt += (slice.status == EquipmentOn) ? QObject::tr("Mask On") : QObject::tr("Mask Off"); slices.append(SummaryChartSlice(&calcitems[0], s1, s2, txt, col)); @@ -911,7 +911,7 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion & float s2 = sess->hours(); - QString txt = QObject::tr("%1\nLength:%3\nStart:%2").arg(it.key().toString(Qt::SystemLocaleDate)).arg(st.time().toString("hh:mm:ss")).arg(s2,0,'f',2); + QString txt = QObject::tr("%1\nLength: %3\nStart: %2").arg(it.key().toString(Qt::SystemLocaleDate)).arg(st.time().toString("hh:mm:ss")).arg(s2,0,'f',2); slices.append(SummaryChartSlice(&calcitems[0], s1, s2, txt, goodcolor)); } diff --git a/sleepyhead/overview.cpp b/sleepyhead/overview.cpp index 91e35ea7..e56f3118 100644 --- a/sleepyhead/overview.cpp +++ b/sleepyhead/overview.cpp @@ -387,6 +387,10 @@ void Overview::RebuildGraphs(bool reset) G->AddLayer(sc); } else if (chan->type() == schema::WAVEFORM) { G->AddLayer(new gSummaryChart(code, chan->machtype())); + } else if (chan->type() == schema::UNKNOWN) { + gSummaryChart * sc = new gSummaryChart(chan->code(), MT_CPAP); + sc->addCalc(code, ST_CPH, schema::channel[code].defaultColor()); + G->AddLayer(sc); } } @@ -473,7 +477,7 @@ void Overview::on_LineCursorUpdate(double time) } else dateLabel->setText(QString(GraphView->emptyText())); } -void Overview::on_RangeUpdate(double minx, double maxx) +void Overview::on_RangeUpdate(double minx, double /* maxx */) { if (minx > 1) { dateLabel->setText(GraphView->getRangeString()); diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp index 670ae47c..54da4ddf 100644 --- a/sleepyhead/preferencesdialog.cpp +++ b/sleepyhead/preferencesdialog.cpp @@ -405,7 +405,7 @@ void PreferencesDialog::InitChanInfo() ComboBoxDelegate * combobox = new ComboBoxDelegate(ui->waveView); - ui->chanView->setItemDelegateForColumn(2,combobox); + ui->chanView->setItemDelegateForColumn(3,combobox); int row = 0; for (ci = schema::channel.names.begin(); ci != schema::channel.names.end(); ci++) { @@ -536,8 +536,8 @@ void PreferencesDialog::InitWaveInfo() SpinBoxDelegate * spinbox = new SpinBoxDelegate(ui->waveView); - ui->waveView->setItemDelegateForColumn(2,spinbox); ui->waveView->setItemDelegateForColumn(3,spinbox); + ui->waveView->setItemDelegateForColumn(4,spinbox); int row = 0; for (ci = schema::channel.names.begin(); ci != schema::channel.names.end(); ci++) {