From 50c5836c0e4c9d8e573b3efd5b15e715b5cff870 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 27 Oct 2016 17:00:05 +0200 Subject: [PATCH] Tx ph.2: allow nore sample rates below 96 kS/s on FileSink to test just the channel plugin interpolator --- plugins/samplesink/filesink/filesinkgui.cpp | 12 ++++++------ plugins/samplesink/filesink/filesinkgui.h | 2 +- plugins/samplesink/filesink/filesinkgui.ui | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/samplesink/filesink/filesinkgui.cpp b/plugins/samplesink/filesink/filesinkgui.cpp index 5b5658229..c14e07a37 100644 --- a/plugins/samplesink/filesink/filesinkgui.cpp +++ b/plugins/samplesink/filesink/filesinkgui.cpp @@ -53,10 +53,10 @@ FileSinkGui::FileSinkGui(DeviceSinkAPI *deviceAPI, QWidget* parent) : ui->centerFrequency->setValueRange(7, 0, pow(10,7)); ui->fileNameText->setText(m_fileName); - ui->samplerate->clear(); + ui->sampleRate->clear(); for (int i = 0; i < FileSinkSampleRates::getNbRates(); i++) { - ui->samplerate->addItem(QString::number(FileSinkSampleRates::getRate(i))); + ui->sampleRate->addItem(QString::number(FileSinkSampleRates::getRate(i))); } connect(&(m_deviceAPI->getMainWindow()->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); @@ -196,7 +196,7 @@ void FileSinkGui::displaySettings() { ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); unsigned int sampleRateIndex = FileSinkSampleRates::getRateIndex(m_settings.m_sampleRate); - ui->samplerate->setCurrentIndex(sampleRateIndex); + ui->sampleRate->setCurrentIndex(sampleRateIndex); } void FileSinkGui::sendSettings() @@ -251,7 +251,7 @@ void FileSinkGui::on_centerFrequency_changed(quint64 value) void FileSinkGui::on_sampleRate_currentIndexChanged(int index) { - int newrate = FileSinkSampleRates::getRate(index); + int newrate = FileSinkSampleRates::getRate(index); m_settings.m_sampleRate = newrate * 1000; sendSettings(); } @@ -327,8 +327,8 @@ void FileSinkGui::tick() } } -unsigned int FileSinkSampleRates::m_rates[] = {48}; -unsigned int FileSinkSampleRates::m_nb_rates = 1; +unsigned int FileSinkSampleRates::m_rates[] = {48, 60, 64, 72}; +unsigned int FileSinkSampleRates::m_nb_rates = 4; unsigned int FileSinkSampleRates::getRate(unsigned int rate_index) { diff --git a/plugins/samplesink/filesink/filesinkgui.h b/plugins/samplesink/filesink/filesinkgui.h index 7cb78512e..fbe152598 100644 --- a/plugins/samplesink/filesink/filesinkgui.h +++ b/plugins/samplesink/filesink/filesinkgui.h @@ -93,7 +93,7 @@ public: static unsigned int getRateIndex(unsigned int rate); static unsigned int getNbRates(); private: - static unsigned int m_rates[1]; + static unsigned int m_rates[4]; static unsigned int m_nb_rates; }; diff --git a/plugins/samplesink/filesink/filesinkgui.ui b/plugins/samplesink/filesink/filesinkgui.ui index c1ccc761a..72c06097d 100644 --- a/plugins/samplesink/filesink/filesinkgui.ui +++ b/plugins/samplesink/filesink/filesinkgui.ui @@ -225,7 +225,7 @@ - + Sample rate selection (kS/s)