From f153325ec0190de7d39f557dcb5d31a92abbfbb7 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 25 Feb 2016 11:02:39 +0100 Subject: [PATCH] File source plugin: added passive navigation slider --- .../samplesource/filesource/filesourcegui.cpp | 9 ++- .../samplesource/filesource/filesourcegui.ui | 65 ++++++++++++++++++- 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/plugins/samplesource/filesource/filesourcegui.cpp b/plugins/samplesource/filesource/filesourcegui.cpp index f76a26af0..9e82c5a36 100644 --- a/plugins/samplesource/filesource/filesourcegui.cpp +++ b/plugins/samplesource/filesource/filesourcegui.cpp @@ -50,6 +50,7 @@ FileSourceGui::FileSourceGui(PluginAPI* pluginAPI, QWidget* parent) : connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); connect(&(m_pluginAPI->getMainWindow()->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); displaySettings(); + ui->navTimeSlider->setEnabled(false); m_sampleSource = new FileSourceInput(m_pluginAPI->getMainWindow()->getMasterTimer()); connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages())); @@ -227,8 +228,9 @@ void FileSourceGui::updateWithStreamTime() QTime t(0, 0, 0, 0); t = t.addSecs(t_sec); t = t.addMSecs(t_msec); - QString s_time = t.toString("hh:mm:ss.zzz"); - ui->relTimeText->setText(s_time); + QString s_timems = t.toString("hh:mm:ss.zzz"); + QString s_time = t.toString("hh:mm:ss"); + ui->relTimeText->setText(s_timems); quint64 startingTimeStampMsec = m_startingTimeStamp * 1000; QDateTime dt = QDateTime::fromMSecsSinceEpoch(startingTimeStampMsec); @@ -236,6 +238,9 @@ void FileSourceGui::updateWithStreamTime() dt = dt.addMSecs(t_msec); QString s_date = dt.toString("yyyy-MM-dd hh:mm:ss.zzz"); ui->absTimeText->setText(s_date); + float posRatio = (float) t_sec / (float) m_recordLength; + ui->navTimeSlider->setValue((int) (posRatio * 100.0)); + ui->navTimeText->setText(s_time); } void FileSourceGui::tick() diff --git a/plugins/samplesource/filesource/filesourcegui.ui b/plugins/samplesource/filesource/filesourcegui.ui index 10d2e4ff4..0faf9b4a2 100644 --- a/plugins/samplesource/filesource/filesourcegui.ui +++ b/plugins/samplesource/filesource/filesourcegui.ui @@ -7,7 +7,7 @@ 0 0 289 - 133 + 227 @@ -362,6 +362,69 @@ + + + + Qt::Horizontal + + + + + + + + + Time navigator + + + 100 + + + 1 + + + Qt::Horizontal + + + + + + + Qt::Vertical + + + + + + + false + + + + 60 + 0 + + + + Navigate time + + + 00:00:00 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + Qt::Horizontal + + +