VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-03-06 19:38:47 -05:00
Code Issues Projects Releases Wiki Activity

ATV demod: use ValueDialZ for channel delta frequency value dial

Browse Source
This commit is contained in:
f4exb 2017-05-17 23:47:08 +02:00
parent a11d8617b5
commit 14b7cb093e
3 changed files with 20 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/channelrx/demodatv/atvdemodgui.cpp
View File

@ -295,8 +295,9 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceSourceAPI *objDeviceAPI,
ui->glScope->connectTimer(m_objPluginAPI->getMainWindow()->getMasterTimer()); ui->glScope->connectTimer(m_objPluginAPI->getMainWindow()->getMasterTimer());
connect(&m_objPluginAPI->getMainWindow()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms connect(&m_objPluginAPI->getMainWindow()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms
ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03)));
ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
ui->deltaFrequency->setValueRange(7, 0U, 9999999U); ui->deltaFrequency->setValueRange(false, 7, -9999999, 9999999);
connect(m_objChannelizer, SIGNAL(inputSampleRateChanged()), this, SLOT(channelSampleRateChanged())); connect(m_objChannelizer, SIGNAL(inputSampleRateChanged()), this, SLOT(channelSampleRateChanged()));
@ -363,8 +364,7 @@ void ATVDemodGUI::applySettings()
{ {
if (m_blnDoApplySettings) if (m_blnDoApplySettings)
{ {
ui->deltaFrequency->setValue(abs(m_objChannelMarker.getCenterFrequency())); ui->deltaFrequency->setValue(m_objChannelMarker.getCenterFrequency());
ui->deltaFrequencyMinus->setChecked(m_objChannelMarker.getCenterFrequency() < 0);
m_objChannelizer->configure(m_objChannelizer->getInputMessageQueue(), m_objChannelizer->configure(m_objChannelizer->getInputMessageQueue(),
m_objChannelizer->getInputSampleRate(), // always use maximum available bandwidth m_objChannelizer->getInputSampleRate(), // always use maximum available bandwidth
@ -606,24 +606,9 @@ void ATVDemodGUI::on_decimatorEnable_toggled(bool checked)
applyRFSettings(); applyRFSettings();
} }
void ATVDemodGUI::on_deltaFrequency_changed(quint64 value) void ATVDemodGUI::on_deltaFrequency_changed(qint64 value)
{ {
if (ui->deltaFrequencyMinus->isChecked()) { m_objChannelMarker.setCenterFrequency(value);
m_objChannelMarker.setCenterFrequency(-value);
} else {
m_objChannelMarker.setCenterFrequency(value);
}
}
void ATVDemodGUI::on_deltaFrequencyMinus_toggled(bool minus)
{
int deltaFrequency = m_objChannelMarker.getCenterFrequency();
bool minusDelta = (deltaFrequency < 0);
if (minus ^ minusDelta) // sign change
{
m_objChannelMarker.setCenterFrequency(-deltaFrequency);
}
} }
void ATVDemodGUI::on_bfo_valueChanged(int value) void ATVDemodGUI::on_bfo_valueChanged(int value)

3
plugins/channelrx/demodatv/atvdemodgui.h
View File

@ -81,8 +81,7 @@ private slots:
void on_rfOppBW_valueChanged(int value); void on_rfOppBW_valueChanged(int value);
void on_rfFiltering_toggled(bool checked); void on_rfFiltering_toggled(bool checked);
void on_decimatorEnable_toggled(bool checked); void on_decimatorEnable_toggled(bool checked);
void on_deltaFrequency_changed(quint64 value); void on_deltaFrequency_changed(qint64 value);
void on_deltaFrequencyMinus_toggled(bool minus);
void on_bfo_valueChanged(int value); void on_bfo_valueChanged(int value);
void on_fmDeviation_valueChanged(int value); void on_fmDeviation_valueChanged(int value);
void on_screenTabWidget_currentChanged(int index); void on_screenTabWidget_currentChanged(int index);

34
plugins/channelrx/demodatv/atvdemodgui.ui
View File

@ -58,26 +58,20 @@
<item> <item>
<layout class="QHBoxLayout" name="deltaFrequencyLayout"> <layout class="QHBoxLayout" name="deltaFrequencyLayout">
<item> <item>
<widget class="QToolButton" name="deltaFrequencyMinus"> <widget class="QLabel" name="deltaFrequencyLabel">
<property name="toolTip"> <property name="minimumSize">
<string>Channel center frequency shift direction</string> <size>
<width>16</width>
<height>0</height>
</size>
</property> </property>
<property name="text"> <property name="text">
<string/> <string>Df</string>
</property>
<property name="icon">
<iconset>
<selectedoff>:/plus.png</selectedoff>
<selectedon>:/minus.png</selectedon>
</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="ValueDial" name="deltaFrequency" native="true"> <widget class="ValueDialZ" name="deltaFrequency" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum"> <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -1117,12 +1111,6 @@
<header>gui/rollupwidget.h</header> <header>gui/rollupwidget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>ValueDial</class>
<extends>QWidget</extends>
<header>gui/valuedial.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>ButtonSwitch</class> <class>ButtonSwitch</class>
<extends>QToolButton</extends> <extends>QToolButton</extends>
@ -1146,6 +1134,12 @@
<header>gui/glscopenggui.h</header> <header>gui/glscopenggui.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>ValueDialZ</class>
<extends>QWidget</extends>
<header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../../sdrbase/resources/res.qrc"/> <include location="../../../sdrbase/resources/res.qrc"/>