diff --git a/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp b/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp index 5b479708e..b5d135fa4 100644 --- a/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp +++ b/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp @@ -182,17 +182,6 @@ void ChannelAnalyzerNGGUI::channelizerInputSampleRateChanged() applySettings(); } -void ChannelAnalyzerNGGUI::on_deltaMinus_toggled(bool minus) -{ - int deltaFrequency = m_channelMarker.getCenterFrequency(); - bool minusDelta = (deltaFrequency < 0); - - if (minus ^ minusDelta) // sign change - { - m_channelMarker.setCenterFrequency(-deltaFrequency); - } -} - void ChannelAnalyzerNGGUI::on_channelSampleRate_changed(quint64 value) { ui->channelSampleRate->setValueRange(7, 2000U, m_channelAnalyzer->getInputSampleRate()); @@ -220,13 +209,9 @@ int ChannelAnalyzerNGGUI::getRequestedChannelSampleRate() } } -void ChannelAnalyzerNGGUI::on_deltaFrequency_changed(quint64 value) +void ChannelAnalyzerNGGUI::on_deltaFrequency_changed(qint64 value) { - if (ui->deltaMinus->isChecked()) { - m_channelMarker.setCenterFrequency(-value); - } else { - m_channelMarker.setCenterFrequency(value); - } + m_channelMarker.setCenterFrequency(value); } void ChannelAnalyzerNGGUI::on_BW_valueChanged(int value) @@ -371,8 +356,9 @@ ChannelAnalyzerNGGUI::ChannelAnalyzerNGGUI(PluginAPI* pluginAPI, DeviceSourceAPI connect(m_channelizer, SIGNAL(inputSampleRateChanged()), this, SLOT(channelizerInputSampleRateChanged())); m_deviceAPI->addThreadedSink(m_threadedChannelizer); - ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->deltaFrequency->setValueRange(7, 0U, 9999999U); + ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03))); + ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); + ui->deltaFrequency->setValueRange(false, 7, -9999999, 9999999); ui->channelSampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->channelSampleRate->setValueRange(7, 2000U, 9999999U); @@ -513,8 +499,7 @@ void ChannelAnalyzerNGGUI::applySettings() if (m_doApplySettings) { setTitleColor(m_channelMarker.getColor()); - ui->deltaFrequency->setValue(abs(m_channelMarker.getCenterFrequency())); - ui->deltaMinus->setChecked(m_channelMarker.getCenterFrequency() < 0); + ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency()); m_channelizer->configure(m_channelizer->getInputMessageQueue(), //m_channelizer->getInputSampleRate(), diff --git a/plugins/channelrx/chanalyzerng/chanalyzernggui.h b/plugins/channelrx/chanalyzerng/chanalyzernggui.h index d356b0250..2e124bd6f 100644 --- a/plugins/channelrx/chanalyzerng/chanalyzernggui.h +++ b/plugins/channelrx/chanalyzerng/chanalyzernggui.h @@ -59,8 +59,7 @@ public: private slots: void viewChanged(); void channelizerInputSampleRateChanged(); - void on_deltaFrequency_changed(quint64 value); - void on_deltaMinus_toggled(bool minus); + void on_deltaFrequency_changed(qint64 value); void on_channelSampleRate_changed(quint64 value); void on_useRationalDownsampler_toggled(bool checked); void on_BW_valueChanged(int value); diff --git a/plugins/channelrx/chanalyzerng/chanalyzernggui.ui b/plugins/channelrx/chanalyzerng/chanalyzernggui.ui index 551e596a0..f5cb92639 100644 --- a/plugins/channelrx/chanalyzerng/chanalyzernggui.ui +++ b/plugins/channelrx/chanalyzerng/chanalyzernggui.ui @@ -61,29 +61,20 @@ - - - Frequency shift direction + + + + 16 + 0 + - ... - - - - :/plus.png - :/minus.png - - - - true - - - false + Df - + 0 @@ -605,6 +596,12 @@
gui/glscopenggui.h
1 + + ValueDialZ + QWidget +
gui/valuedialz.h
+ 1 +