diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp
index 99e0c5511..7bbba0608 100644
--- a/plugins/channelrx/demodatv/atvdemodgui.cpp
+++ b/plugins/channelrx/demodatv/atvdemodgui.cpp
@@ -73,8 +73,6 @@ void ATVDemodGUI::resetToDefaults()
{
blockApplySettings(true);
- //********** RF Default values **********
- ui->deltaFrequency->setValue(0);
//********** ATV Default values **********
ui->synchLevel->setValue(100);
ui->blackLevel->setValue(310);
@@ -203,41 +201,40 @@ void ATVDemodGUI::onMenuDoubleClicked()
ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceSourceAPI *objDeviceAPI,
QWidget* objParent) :
- RollupWidget(objParent), ui(new Ui::ATVDemodGUI), m_objPluginAPI(
- objPluginAPI), m_objDeviceAPI(objDeviceAPI), m_objChannelMarker(
- this), m_blnBasicSettingsShown(false), m_blnDoApplySettings(
- true)
+ RollupWidget(objParent),
+ ui(new Ui::ATVDemodGUI),
+ m_objPluginAPI(objPluginAPI),
+ m_objDeviceAPI(objDeviceAPI),
+ m_objChannelMarker(this),
+ m_blnBasicSettingsShown(false),
+ m_blnDoApplySettings(true)
{
ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose, true);
- connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this,
- SLOT(onWidgetRolled(QWidget*,bool)));
- connect(this, SIGNAL(menuDoubleClickEvent()), this,
- SLOT(onMenuDoubleClicked()));
+ connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
+ connect(this, SIGNAL(menuDoubleClickEvent()), this, SLOT(onMenuDoubleClicked()));
m_objATVDemod = new ATVDemod();
m_objATVDemod->SetATVScreen(ui->screenTV);
m_objChannelizer = new DownChannelizer(m_objATVDemod);
- m_objThreadedChannelizer = new ThreadedBasebandSampleSink(m_objChannelizer,
- this);
+ m_objThreadedChannelizer = new ThreadedBasebandSampleSink(m_objChannelizer, this);
m_objDeviceAPI->addThreadedSink(m_objThreadedChannelizer);
+ //connect(&m_objPluginAPI->getMainWindow()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms
+
+ ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold));
+ ui->deltaFrequency->setValueRange(7, 0U, 9999999U);
+
connect(m_objChannelizer, SIGNAL(inputSampleRateChanged()), this, SLOT(channelSampleRateChanged()));
//m_objPluginAPI->addThreadedSink(m_objThreadedChannelizer);
- //connect(&m_objPluginAPI->getMainWindow()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms
-
- ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold));
- ui->deltaFrequency->setValueRange(7, 0U, 9999999U);
-
m_objChannelMarker.setColor(Qt::white);
m_objChannelMarker.setBandwidth(6000000);
-
m_objChannelMarker.setCenterFrequency(0);
m_objChannelMarker.setVisible(true);
- connect(&m_objChannelMarker, SIGNAL(changed()), this, SLOT(viewChanged()));
+ //connect(&m_objChannelMarker, SIGNAL(changed()), this, SLOT(viewChanged()));
m_objDeviceAPI->registerChannelInstance(m_strChannelID, this);
m_objDeviceAPI->addChannelMarker(&m_objChannelMarker);
diff --git a/plugins/channelrx/demodatv/atvdemodgui.ui b/plugins/channelrx/demodatv/atvdemodgui.ui
index 131a7731a..f1c9ccd9a 100644
--- a/plugins/channelrx/demodatv/atvdemodgui.ui
+++ b/plugins/channelrx/demodatv/atvdemodgui.ui
@@ -6,7 +6,7 @@
0
0
- 480
+ 520
480
@@ -18,7 +18,7 @@
- 480
+ 520
480
@@ -39,8 +39,8 @@
10
10
- 461
- 26
+ 501
+ 27
@@ -76,6 +76,12 @@
16
+
+
+ Monospace
+ 12
+
+
-
@@ -123,6 +129,13 @@
+ -
+
+
+ 10.0
+
+
+
-
@@ -139,7 +152,7 @@
-
- 00000 kS/s
+ 00000k
@@ -150,7 +163,7 @@
10
40
- 462
+ 501
347
@@ -193,7 +206,7 @@
10
390
- 461
+ 501
80
diff --git a/plugins/channelrx/demodatv/atvdemodplugin.cpp b/plugins/channelrx/demodatv/atvdemodplugin.cpp
index 18398202b..8a972b8de 100644
--- a/plugins/channelrx/demodatv/atvdemodplugin.cpp
+++ b/plugins/channelrx/demodatv/atvdemodplugin.cpp
@@ -26,7 +26,7 @@
const PluginDescriptor ATVDemodPlugin::m_ptrPluginDescriptor =
{
QString("ATV Demodulator"),
- QString("3.3.0"),
+ QString("3.3.1"),
QString("(c) F4HKW for F4EXB / SDRAngel"),
QString("https://github.com/f4exb/sdrangel"),
true,