From 949a9e9380d1dfc185f102d0de73b23542479783 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 15 Oct 2022 03:04:29 +0200 Subject: [PATCH] Center frequency dials up to 9 digits and transverter delta frequency dial up to 12 digits. Fixes #1476 --- .../samplemimo/bladerf2mimo/bladerf2mimogui.cpp | 16 ++++++++-------- .../samplemimo/limesdrmimo/limesdrmimogui.cpp | 6 +++--- plugins/samplemimo/metismiso/metismisogui.cpp | 2 +- .../samplemimo/plutosdrmimo/plutosdrmimogui.cpp | 6 +++--- plugins/samplemimo/testmi/testmigui.cpp | 2 +- plugins/samplemimo/testmosync/testmosyncgui.cpp | 2 +- plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp | 2 +- .../bladerf1output/bladerf1outputgui.cpp | 6 +++--- .../bladerf2output/bladerf2outputgui.cpp | 8 ++++---- plugins/samplesink/fileoutput/fileoutputgui.cpp | 2 +- .../samplesink/hackrfoutput/hackrfoutputgui.cpp | 8 ++++---- .../limesdroutput/limesdroutputgui.cpp | 8 ++++---- .../plutosdroutput/plutosdroutputgui.cpp | 6 +++--- .../soapysdroutput/soapysdroutputgui.cpp | 8 ++++---- plugins/samplesink/testsink/testsinkgui.cpp | 2 +- plugins/samplesink/usrpoutput/usrpoutputgui.cpp | 8 ++++---- plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp | 2 +- plugins/samplesource/airspy/airspygui.cpp | 6 +++--- plugins/samplesource/airspyhf/airspyhfgui.cpp | 6 +++--- .../bladerf1input/bladerf1inputgui.cpp | 6 +++--- .../bladerf2input/bladerf2inputgui.cpp | 8 ++++---- plugins/samplesource/fcdpro/fcdprogui.cpp | 6 +++--- .../samplesource/fcdproplus/fcdproplusgui.cpp | 6 +++--- .../samplesource/hackrfinput/hackrfinputgui.cpp | 8 ++++---- plugins/samplesource/kiwisdr/kiwisdrgui.cpp | 2 +- .../limesdrinput/limesdrinputgui.cpp | 8 ++++---- plugins/samplesource/perseus/perseusgui.cpp | 6 +++--- .../plutosdrinput/plutosdrinputgui.cpp | 6 +++--- .../remotetcpinput/remotetcpinputgui.cpp | 2 +- plugins/samplesource/rtlsdr/rtlsdrgui.cpp | 6 +++--- plugins/samplesource/sdrplay/sdrplaygui.cpp | 4 ++-- plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp | 6 +++--- .../soapysdrinput/soapysdrinputgui.cpp | 8 ++++---- .../samplesource/testsource/testsourcegui.cpp | 2 +- plugins/samplesource/usrpinput/usrpinputgui.cpp | 8 ++++---- plugins/samplesource/xtrxinput/xtrxinputgui.cpp | 2 +- sdrgui/gui/transverterdialog.cpp | 2 +- 37 files changed, 101 insertions(+), 101 deletions(-) diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp index 4b174c8ce..2b747c179 100644 --- a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp +++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp @@ -159,7 +159,7 @@ void BladeRF2MIMOGui::displaySettings() ui->transverter->setDeltaFrequency(m_settings.m_rxTransverterDeltaFrequency); ui->transverter->setDeltaFrequencyActive(m_settings.m_rxTransverterMode); ui->transverter->setIQOrder(m_settings.m_iqOrder); - ui->centerFrequency->setValueRange(7, m_fMinRx / 1000, m_fMaxRx / 1000); + ui->centerFrequency->setValueRange(9, m_fMinRx / 1000, m_fMaxRx / 1000); ui->centerFrequency->setValue(m_settings.m_rxCenterFrequency / 1000); ui->bandwidth->setValueRange(5, m_bwMinRx / 1000, m_bwMaxRx / 1000); ui->bandwidth->setValue(m_settings.m_rxBandwidth / 1000); @@ -187,7 +187,7 @@ void BladeRF2MIMOGui::displaySettings() ui->transverter->setDeltaFrequency(m_settings.m_txTransverterDeltaFrequency); ui->transverter->setDeltaFrequencyActive(m_settings.m_txTransverterMode); ui->transverter->setIQOrder(m_settings.m_iqOrder); - ui->centerFrequency->setValueRange(7, m_fMinTx / 1000, m_fMaxTx / 1000); + ui->centerFrequency->setValueRange(9, m_fMinTx / 1000, m_fMaxTx / 1000); ui->centerFrequency->setValue(m_settings.m_txCenterFrequency / 1000); ui->bandwidth->setValueRange(5, m_bwMinTx / 1000, m_bwMaxTx / 1000); ui->bandwidth->setValue(m_settings.m_txBandwidth / 1000); @@ -705,12 +705,12 @@ void BladeRF2MIMOGui::updateFrequencyLimits() qint64 minLimit = f_min/1000 + deltaFrequency; qint64 maxLimit = f_max/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("BladeRF2MIMOGui::updateFrequencyLimits: Rx: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } else { @@ -719,12 +719,12 @@ void BladeRF2MIMOGui::updateFrequencyLimits() qint64 minLimit = f_min/1000 + deltaFrequency; qint64 maxLimit = f_max/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("BladeRF2MIMOGui::updateFrequencyLimits: Rx: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } } diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp index a41cd7d5f..68c9d7e05 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp +++ b/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp @@ -593,12 +593,12 @@ void LimeSDRMIMOGUI::updateFrequencyLimits() qint64 minLimit = minF/1000 + deltaFrequency; qint64 maxLimit = maxF/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("LimeSDRMIMOGUI::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void LimeSDRMIMOGUI::updateLPFLimits() diff --git a/plugins/samplemimo/metismiso/metismisogui.cpp b/plugins/samplemimo/metismiso/metismisogui.cpp index b3836f1d7..ac2871701 100644 --- a/plugins/samplemimo/metismiso/metismisogui.cpp +++ b/plugins/samplemimo/metismiso/metismisogui.cpp @@ -62,7 +62,7 @@ MetisMISOGui::MetisMISOGui(DeviceUISet *deviceUISet, QWidget* parent) : getContents()->setStyleSheet("#MetisMISOGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplemimo/metismiso/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, 0, m_absMaxFreq); + ui->centerFrequency->setValueRange(9, 0, m_absMaxFreq); displaySettings(); diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp index c47ee554c..046b47668 100644 --- a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp +++ b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp @@ -383,12 +383,12 @@ void PlutoSDRMIMOGUI::updateFrequencyLimits() minLimit = minLimit/1000 + deltaFrequency; maxLimit = maxLimit/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("PlutoSDRMIMOGUI::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } bool PlutoSDRMIMOGUI::handleMessage(const Message& message) diff --git a/plugins/samplemimo/testmi/testmigui.cpp b/plugins/samplemimo/testmi/testmigui.cpp index cc0d6a4cf..537c7df82 100644 --- a/plugins/samplemimo/testmi/testmigui.cpp +++ b/plugins/samplemimo/testmi/testmigui.cpp @@ -70,7 +70,7 @@ TestMIGui::TestMIGui(DeviceUISet *deviceUISet, QWidget* parent) : ui->spectrumSource->addItem("0"); ui->spectrumSource->addItem("1"); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, 0, 9999999); + ui->centerFrequency->setValueRange(9, 0, 999999999); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setValueRange(7, 48000, 9999999); ui->frequencyShift->setColorMapper(ColorMapper(ColorMapper::GrayGold)); diff --git a/plugins/samplemimo/testmosync/testmosyncgui.cpp b/plugins/samplemimo/testmosync/testmosyncgui.cpp index 1b53e70fe..5a8beee48 100644 --- a/plugins/samplemimo/testmosync/testmosyncgui.cpp +++ b/plugins/samplemimo/testmosync/testmosyncgui.cpp @@ -60,7 +60,7 @@ TestMOSyncGui::TestMOSyncGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleMIMO = (TestMOSync*) m_deviceUISet->m_deviceAPI->getSampleMIMO(); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, 0, pow(10,7)); + ui->centerFrequency->setValueRange(9, 0, pow(10,9)); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setValueRange(7, 32000U, 9000000U); diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp index 1f66fa5d0..f6c3c965a 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp +++ b/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp @@ -76,7 +76,7 @@ XTRXMIMOGUI::XTRXMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_xtrxMIMO->getLORange(minF, maxF, stepF); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz + ui->centerFrequency->setValueRange(9, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz m_xtrxMIMO->getSRRange(minF, maxF, stepF); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); diff --git a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp index 8ecf31f08..2e8820459 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp +++ b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp @@ -50,7 +50,7 @@ Bladerf1OutputGui::Bladerf1OutputGui(DeviceUISet *deviceUISet, QWidget* parent) setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet("#Bladerf1OutputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "/plugins/samplesink/bladerf1output/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); + ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setValueRange(8, BLADERF_SAMPLERATE_MIN, BLADERF_SAMPLERATE_REC_MAX); @@ -348,11 +348,11 @@ void Bladerf1OutputGui::on_xb200_currentIndexChanged(int index) if (m_settings.m_xb200) { - ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); + ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); } else { - ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000); + ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000); } sendSettings(); diff --git a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp index d416751e0..5e5af29be 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp @@ -57,7 +57,7 @@ BladeRF2OutputGui::BladeRF2OutputGui(DeviceUISet *deviceUISet, QWidget* parent) m_sampleSink->getFrequencyRange(f_min, f_max, step, scale); qDebug("BladeRF2OutputGui::BladeRF2OutputGui: getFrequencyRange: [%lu,%lu] step: %d", f_min, f_max, step); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, f_min/1000, f_max/1000); + ui->centerFrequency->setValueRange(9, f_min/1000, f_max/1000); m_sampleSink->getSampleRateRange(min, max, step, scale); qDebug("BladeRF2OutputGui::BladeRF2OutputGui: getSampleRateRange: [%d,%d] step: %d", min, max, step); @@ -143,12 +143,12 @@ void BladeRF2OutputGui::updateFrequencyLimits() qint64 minLimit = f_min/1000 + deltaFrequency; qint64 maxLimit = f_max/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("BladeRF2OutputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void BladeRF2OutputGui::setCenterFrequencySetting(uint64_t kHzValue) diff --git a/plugins/samplesink/fileoutput/fileoutputgui.cpp b/plugins/samplesink/fileoutput/fileoutputgui.cpp index 2c68dc144..ed617f8c3 100644 --- a/plugins/samplesink/fileoutput/fileoutputgui.cpp +++ b/plugins/samplesink/fileoutput/fileoutputgui.cpp @@ -61,7 +61,7 @@ FileOutputGui::FileOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, 0, pow(10,7)); + ui->centerFrequency->setValueRange(9, 0, pow(10,9)); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setValueRange(8, 32000U, 90000000U); diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp index 2f2484396..a80a6fabb 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp @@ -53,7 +53,7 @@ HackRFOutputGui::HackRFOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : getContents()->setStyleSheet("#HackRFOutputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesink/hackrfoutput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, 0U, 7250000U); + ui->centerFrequency->setValueRange(9, 0U, 999999999U); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setValueRange(8, 1000000U, 20000000U); @@ -226,12 +226,12 @@ void HackRFOutputGui::updateFrequencyLimits() qint64 minLimit = (0U) + deltaFrequency; qint64 maxLimit = (7250000U) + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("HackRFOutputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void HackRFOutputGui::displayFcTooltip() diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index 48f70d256..5c79b01cc 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -54,7 +54,7 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_limeSDROutput->getLORange(minF, maxF); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz + ui->centerFrequency->setValueRange(9, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz m_limeSDROutput->getSRRange(minF, maxF); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); @@ -156,12 +156,12 @@ void LimeSDROutputGUI::updateFrequencyLimits() // Min freq is 30MHz - NCO must be used to go below this qint64 minFreq = m_settings.m_ncoEnable ? 30000 + m_settings.m_ncoFrequency/1000 : 30000; - minLimit = minLimit < minFreq ? minFreq : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < minFreq ? minFreq : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("LimeSDROutputGUI::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } bool LimeSDROutputGUI::handleMessage(const Message& message) diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp index 9c311d116..cae0480af 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp @@ -443,12 +443,12 @@ void PlutoSDROutputGUI::updateFrequencyLimits() minLimit = minLimit/1000 + deltaFrequency; maxLimit = maxLimit/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("PlutoSDRInputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void PlutoSDROutputGUI::handleInputMessages() diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp index 6a3782eb4..86d37ef64 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp @@ -67,7 +67,7 @@ SoapySDROutputGui::SoapySDROutputGui(DeviceUISet *deviceUISet, QWidget* parent) ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); uint64_t f_min, f_max; m_sampleSink->getFrequencyRange(f_min, f_max); - ui->centerFrequency->setValueRange(7, f_min/1000, f_max/1000); + ui->centerFrequency->setValueRange(9, f_min/1000, f_max/1000); createCorrectionsControl(); createAntennasControl(m_sampleSink->getAntennas()); @@ -819,12 +819,12 @@ void SoapySDROutputGui::updateFrequencyLimits() qint64 minLimit = f_min/1000 + deltaFrequency; qint64 maxLimit = f_max/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("SoapySDRInputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void SoapySDROutputGui::setCenterFrequencySetting(uint64_t kHzValue) diff --git a/plugins/samplesink/testsink/testsinkgui.cpp b/plugins/samplesink/testsink/testsinkgui.cpp index 1a746bcc6..80c9a3584 100644 --- a/plugins/samplesink/testsink/testsinkgui.cpp +++ b/plugins/samplesink/testsink/testsinkgui.cpp @@ -59,7 +59,7 @@ TestSinkGui::TestSinkGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSink = (TestSinkOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, 0, pow(10,7)); + ui->centerFrequency->setValueRange(9, 0, pow(10,9)); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setValueRange(8, 32000U, 90000000U); diff --git a/plugins/samplesink/usrpoutput/usrpoutputgui.cpp b/plugins/samplesink/usrpoutput/usrpoutputgui.cpp index 64bb7fb97..e24bb8471 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputgui.cpp +++ b/plugins/samplesink/usrpoutput/usrpoutputgui.cpp @@ -55,7 +55,7 @@ USRPOutputGUI::USRPOutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_usrpOutput->getLORange(minF, maxF); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz + ui->centerFrequency->setValueRange(9, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz m_usrpOutput->getSRRange(minF, maxF); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); @@ -167,12 +167,12 @@ void USRPOutputGUI::updateFrequencyLimits() qint64 minLimit = minF/1000 + deltaFrequency; qint64 maxLimit = maxF/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("USRPOutputGUI::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } bool USRPOutputGUI::handleMessage(const Message& message) diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp index bbb2874d0..d8becf57b 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp +++ b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp @@ -56,7 +56,7 @@ XTRXOutputGUI::XTRXOutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_XTRXOutput->getLORange(minF, maxF, stepF); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz + ui->centerFrequency->setValueRange(9, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz m_XTRXOutput->getSRRange(minF, maxF, stepF); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); diff --git a/plugins/samplesource/airspy/airspygui.cpp b/plugins/samplesource/airspy/airspygui.cpp index 7026bd5cc..0f8428537 100644 --- a/plugins/samplesource/airspy/airspygui.cpp +++ b/plugins/samplesource/airspy/airspygui.cpp @@ -182,12 +182,12 @@ void AirspyGui::updateFrequencyLimits() qint64 minLimit = AirspyInput::loLowLimitFreq/1000 + deltaFrequency; qint64 maxLimit = AirspyInput::loHighLimitFreq/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("AirspyGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void AirspyGui::displaySettings() diff --git a/plugins/samplesource/airspyhf/airspyhfgui.cpp b/plugins/samplesource/airspyhf/airspyhfgui.cpp index e5759d5ca..cb0c6a751 100644 --- a/plugins/samplesource/airspyhf/airspyhfgui.cpp +++ b/plugins/samplesource/airspyhf/airspyhfgui.cpp @@ -195,12 +195,12 @@ void AirspyHFGui::updateFrequencyLimits() break; } - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("AirspyHFGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void AirspyHFGui::displaySettings() diff --git a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp index 266f3e789..04d92ac60 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp +++ b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp @@ -53,7 +53,7 @@ Bladerf1InputGui::Bladerf1InputGui(DeviceUISet *deviceUISet, QWidget* parent) : getContents()->setStyleSheet("#Bladerf1InputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/bladerf1input/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); + ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); // BladeRF can go as low as 80 kS/s but because of buffering in practice experience is not good below 330 kS/s @@ -406,11 +406,11 @@ void Bladerf1InputGui::on_xb200_currentIndexChanged(int index) if (m_settings.m_xb200) { - ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); + ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); } else { - ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000); + ui->centerFrequency->setValueRange(9, BLADERF_FREQUENCY_MIN/1000, BLADERF_FREQUENCY_MAX/1000); } sendSettings(); diff --git a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp index 2f2444170..9ace95cfe 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp @@ -58,7 +58,7 @@ BladeRF2InputGui::BladeRF2InputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource->getFrequencyRange(f_min, f_max, step, scale); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, f_min/1000, f_max/1000); + ui->centerFrequency->setValueRange(9, f_min/1000, f_max/1000); m_sampleSource->getSampleRateRange(min, max, step, scale); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); @@ -156,12 +156,12 @@ void BladeRF2InputGui::updateFrequencyLimits() qint64 minLimit = f_min/1000 + deltaFrequency; qint64 maxLimit = f_max/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("BladeRF2OutputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void BladeRF2InputGui::setCenterFrequencySetting(uint64_t kHzValue) diff --git a/plugins/samplesource/fcdpro/fcdprogui.cpp b/plugins/samplesource/fcdpro/fcdprogui.cpp index 63072c5bb..2c35bba09 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.cpp +++ b/plugins/samplesource/fcdpro/fcdprogui.cpp @@ -274,12 +274,12 @@ void FCDProGui::updateFrequencyLimits() qint64 minLimit = fcd_traits::loLowLimitFreq/1000 + deltaFrequency; qint64 maxLimit = fcd_traits::loHighLimitFreq/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("FCDProGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void FCDProGui::displaySettings() diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp index 8f6afe8f4..1fe32a7cf 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp @@ -190,12 +190,12 @@ void FCDProPlusGui::updateFrequencyLimits() qint64 minLimit = fcd_traits::loLowLimitFreq/1000 + deltaFrequency; qint64 maxLimit = fcd_traits::loHighLimitFreq/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("FCDProPlusGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void FCDProPlusGui::displaySettings() diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp index 2686c9c06..199b6c855 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp @@ -54,7 +54,7 @@ HackRFInputGui::HackRFInputGui(DeviceUISet *deviceUISet, QWidget* parent) : getContents()->setStyleSheet("#HackRFInputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/hackrfinput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, 0U, 7250000U); + ui->centerFrequency->setValueRange(9, 0U, 999999999U); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setValueRange(8, 1000000U, 20000000U); @@ -196,12 +196,12 @@ void HackRFInputGui::updateFrequencyLimits() qint64 minLimit = (0U) + deltaFrequency; qint64 maxLimit = (7250000U) + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("HackRFInputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void HackRFInputGui::displaySampleRate() diff --git a/plugins/samplesource/kiwisdr/kiwisdrgui.cpp b/plugins/samplesource/kiwisdr/kiwisdrgui.cpp index 6e2043569..e36a93136 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrgui.cpp +++ b/plugins/samplesource/kiwisdr/kiwisdrgui.cpp @@ -72,7 +72,7 @@ KiwiSDRGui::KiwiSDRGui(DeviceUISet *deviceUISet, QWidget* parent) : getContents()->setStyleSheet("#KiwiSDRGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/kiwisdr/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, 0, 9999999); + ui->centerFrequency->setValueRange(9, 0, 999999999); displaySettings(); makeUIConnections(); diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index 666efc482..960951c7d 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -58,7 +58,7 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_limeSDRInput->getLORange(minF, maxF); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz + ui->centerFrequency->setValueRange(9, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz m_limeSDRInput->getSRRange(minF, maxF); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); @@ -279,12 +279,12 @@ void LimeSDRInputGUI::updateFrequencyLimits() // Min freq is 30MHz - NCO must be used to go below this qint64 minFreq = m_settings.m_ncoEnable ? 30000 + m_settings.m_ncoFrequency/1000 : 30000; - minLimit = minLimit < minFreq ? minFreq : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < minFreq ? minFreq : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("LimeSDRInputGUI::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void LimeSDRInputGUI::handleInputMessages() diff --git a/plugins/samplesource/perseus/perseusgui.cpp b/plugins/samplesource/perseus/perseusgui.cpp index 96c3da079..67e4d690f 100644 --- a/plugins/samplesource/perseus/perseusgui.cpp +++ b/plugins/samplesource/perseus/perseusgui.cpp @@ -229,12 +229,12 @@ void PerseusGui::updateFrequencyLimits() qint64 minLimit = 10 + deltaFrequency; qint64 maxLimit = 40000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("PerseusGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void PerseusGui::sendSettings() diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp index a8a8f3f75..e311e76b5 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp @@ -515,12 +515,12 @@ void PlutoSDRInputGui::updateFrequencyLimits() minLimit = minLimit/1000 + deltaFrequency; maxLimit = maxLimit/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("PlutoSDRInputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void PlutoSDRInputGui::handleInputMessages() diff --git a/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp b/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp index 76953bae3..721d93698 100644 --- a/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp +++ b/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp @@ -59,7 +59,7 @@ RemoteTCPInputGui::RemoteTCPInputGui(DeviceUISet *deviceUISet, QWidget* parent) m_helpURL = "plugins/samplesource/remotetcpinput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, 0, 9999999); // frequency dial is in kHz + ui->centerFrequency->setValueRange(9, 0, 999999999); // frequency dial is in kHz ui->devSampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->devSampleRate->setValueRange(8, 0, 99999999); diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp index 266e93a72..1f9533341 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp @@ -200,12 +200,12 @@ void RTLSDRGui::updateFrequencyLimits() qint64 minLimit = (m_settings.m_noModMode ? RTLSDRInput::frequencyLowRangeMin : RTLSDRInput::frequencyHighRangeMin) + deltaFrequency; qint64 maxLimit = (m_settings.m_noModMode ? RTLSDRInput::frequencyLowRangeMax : RTLSDRInput::frequencyHighRangeMax) + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("RTLSDRGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void RTLSDRGui::displayGains() diff --git a/plugins/samplesource/sdrplay/sdrplaygui.cpp b/plugins/samplesource/sdrplay/sdrplaygui.cpp index 43a913a1b..59f3cad93 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.cpp +++ b/plugins/samplesource/sdrplay/sdrplaygui.cpp @@ -48,7 +48,7 @@ SDRPlayGui::SDRPlayGui(DeviceUISet *deviceUISet, QWidget* parent) : getContents()->setStyleSheet("#SDRPlayGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/sdrplay/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, 10U, 12000U); + ui->centerFrequency->setValueRange(9, 10U, 999999999U); ui->fBand->clear(); for (unsigned int i = 0; i < SDRPlayBands::getNbBands(); i++) @@ -345,7 +345,7 @@ void SDRPlayGui::on_iqImbalance_toggled(bool checked) void SDRPlayGui::on_fBand_currentIndexChanged(int index) { ui->centerFrequency->setValueRange( - 7, + 9, SDRPlayBands::getBandLow(index), SDRPlayBands::getBandHigh(index)); diff --git a/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp b/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp index 6b259f7ba..291d0c137 100644 --- a/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp +++ b/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp @@ -237,12 +237,12 @@ void SDRPlayV3Gui::updateFrequencyLimits() qint64 minLimit = 1U + deltaFrequency; qint64 maxLimit = 2000000U + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("SDRPlayV3Gui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void SDRPlayV3Gui::displaySettings() diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp index 1e005d0cb..4221cc11a 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp @@ -69,7 +69,7 @@ SoapySDRInputGui::SoapySDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) : ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); uint64_t f_min, f_max; m_sampleSource->getFrequencyRange(f_min, f_max); - ui->centerFrequency->setValueRange(7, f_min/1000, f_max/1000); + ui->centerFrequency->setValueRange(9, f_min/1000, f_max/1000); createCorrectionsControl(); createAntennasControl(m_sampleSource->getAntennas()); @@ -856,12 +856,12 @@ void SoapySDRInputGui::updateFrequencyLimits() qint64 minLimit = f_min/1000 + deltaFrequency; qint64 maxLimit = f_max/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("SoapySDRInputGui::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void SoapySDRInputGui::setCenterFrequencySetting(uint64_t kHzValue) diff --git a/plugins/samplesource/testsource/testsourcegui.cpp b/plugins/samplesource/testsource/testsourcegui.cpp index b994c75ed..a3f453e1b 100644 --- a/plugins/samplesource/testsource/testsourcegui.cpp +++ b/plugins/samplesource/testsource/testsourcegui.cpp @@ -59,7 +59,7 @@ TestSourceGui::TestSourceGui(DeviceUISet *deviceUISet, QWidget* parent) : getContents()->setStyleSheet("#TestSourceGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/testsource/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, 0, 9999999); + ui->centerFrequency->setValueRange(9, 0, 999999999); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setValueRange(7, 48000, 9999999); ui->frequencyShift->setColorMapper(ColorMapper(ColorMapper::GrayGold)); diff --git a/plugins/samplesource/usrpinput/usrpinputgui.cpp b/plugins/samplesource/usrpinput/usrpinputgui.cpp index aaabb12d2..d7054a6f6 100644 --- a/plugins/samplesource/usrpinput/usrpinputgui.cpp +++ b/plugins/samplesource/usrpinput/usrpinputgui.cpp @@ -59,7 +59,7 @@ USRPInputGUI::USRPInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_usrpInput->getLORange(minF, maxF); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz + ui->centerFrequency->setValueRange(9, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz m_usrpInput->getSRRange(minF, maxF); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); @@ -256,12 +256,12 @@ void USRPInputGUI::updateFrequencyLimits() qint64 minLimit = minF/1000 + deltaFrequency; qint64 maxLimit = maxF/1000 + deltaFrequency; - minLimit = minLimit < 0 ? 0 : minLimit > 9999999 ? 9999999 : minLimit; - maxLimit = maxLimit < 0 ? 0 : maxLimit > 9999999 ? 9999999 : maxLimit; + minLimit = minLimit < 0 ? 0 : minLimit > 999999999 ? 999999999 : minLimit; + maxLimit = maxLimit < 0 ? 0 : maxLimit > 999999999 ? 999999999 : maxLimit; qDebug("USRPInputGUI::updateFrequencyLimits: delta: %lld min: %lld max: %lld", deltaFrequency, minLimit, maxLimit); - ui->centerFrequency->setValueRange(7, minLimit, maxLimit); + ui->centerFrequency->setValueRange(9, minLimit, maxLimit); } void USRPInputGUI::handleInputMessages() diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp index e2ef6bf57..0763231a1 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp @@ -59,7 +59,7 @@ XTRXInputGUI::XTRXInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_XTRXInput->getLORange(minF, maxF, stepF); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz + ui->centerFrequency->setValueRange(9, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz m_XTRXInput->getSRRange(minF, maxF, stepF); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); diff --git a/sdrgui/gui/transverterdialog.cpp b/sdrgui/gui/transverterdialog.cpp index 425bfa209..85a8de87e 100644 --- a/sdrgui/gui/transverterdialog.cpp +++ b/sdrgui/gui/transverterdialog.cpp @@ -37,7 +37,7 @@ TransverterDialog::TransverterDialog(qint64& deltaFrequency, bool& deltaFrequenc ui->setupUi(this); ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03))); ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->deltaFrequency->setValueRange(false, 10, -9999999999L, 9999999999L); + ui->deltaFrequency->setValueRange(false, 12, -999999999999L, 999999999999L); ui->deltaFrequency->setValue(m_deltaFrequency); ui->deltaFrequencyActive->setChecked(m_deltaFrequencyActive); ui->iqOrder->setEnabled(true);