diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp index 683f15a7a..99e0c5511 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.cpp +++ b/plugins/channelrx/demodatv/atvdemodgui.cpp @@ -73,6 +73,8 @@ void ATVDemodGUI::resetToDefaults() { blockApplySettings(true); + //********** RF Default values ********** + ui->deltaFrequency->setValue(0); //********** ATV Default values ********** ui->synchLevel->setValue(100); ui->blackLevel->setValue(310); @@ -226,13 +228,16 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceSourceAPI *objDeviceAPI, //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); @@ -265,6 +270,8 @@ void ATVDemodGUI::applySettings() if (m_blnDoApplySettings) { setTitleColor(m_objChannelMarker.getColor()); + ui->deltaFrequency->setValue(abs(m_objChannelMarker.getCenterFrequency())); + ui->deltaFrequencyMinus->setChecked(m_objChannelMarker.getCenterFrequency() < 0); m_objChannelizer->configure(m_objChannelizer->getInputMessageQueue(), //m_objATVDemod->GetSampleRate(), diff --git a/plugins/channelrx/demodatv/atvdemodgui.ui b/plugins/channelrx/demodatv/atvdemodgui.ui index 75edcbfec..131a7731a 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.ui +++ b/plugins/channelrx/demodatv/atvdemodgui.ui @@ -6,8 +6,8 @@ 0 0 - 500 - 500 + 480 + 480 @@ -18,8 +18,8 @@ - 500 - 450 + 480 + 480 @@ -39,10 +39,124 @@ 10 10 - 481 - 361 + 461 + 26 + + RF Settings + + + + + + + + + + + + :/plus.png + :/minus.png + + + + + + + + + 0 + 0 + + + + + 32 + 16 + + + + + + + + Hz + + + + + + + + + Modulation type + + + + FM 1 + + + + + FM 2 + + + + + AM + + + + + + + + BW + + + + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 00000 kS/s + + + + + + + + + 10 + 40 + 462 + 347 + + + + TV Screen + QLayout::SetMinimumSize @@ -74,373 +188,282 @@ - + 10 - 380 - 481 - 105 + 390 + 461 + 80 - - - 461 - 105 - + + TV Settings - - ATV Settings - - - - - 310 - 60 - 101 - 20 - - - - Black level - - - 999 - - - 1 - - - 1 - - - 0 - - - Qt::Horizontal - - - - - - 120 - 30 - 72 - 22 - - - - Frames per second + + + 2 - - 25 Fps - + + + + + Frames per second + + + + 25 Fps + + + + + 30 Fps + + + + + + + + Toggle horizontal synchronization + + + HSync + + + + + + + Toggle vertical synchronization + + + VSync + + + + + + + Render only half of the frames for slow processors + + + Half + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 24 + 24 + + + + Reset to default values + + + R + + + + - - 30 Fps - + + + + + Horizontal synchronization level + + + 999 + + + 1 + + + 1 + + + 0 + + + Qt::Horizontal + + + + + + + <html><head/><body><p align="right">mV</p></body></html> + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + <html><head/><body><p align="right">mV</p></body></html> + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + <html><head/><body><p>Synch</p></body></html> + + + + + + + <html><head/><body><p>Black Lvl</p></body></html> + + + + + + + Black level + + + 999 + + + 1 + + + 1 + + + 0 + + + Qt::Horizontal + + + + + + + Line + + + + + + + Line length in time units + + + 1 + + + 1000 + + + 1 + + + 1 + + + 1 + + + Qt::Horizontal + + + + + + + <html><head/><body><p align="right">uS</p></body></html> + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + <html><head/><body><p>Top</p></body></html> + + + + + + + Horizontal top length in time units + + + 1 + + + 30 + + + 1 + + + 1 + + + 1 + + + Qt::Horizontal + + + + + + + <html><head/><body><p align="right">uS</p></body></html> + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - - - 50 - 60 - 101 - 16 - - - - Horizontal synchronization level - - - 999 - - - 1 - - - 1 - - - 0 - - - Qt::Horizontal - - - - - - 220 - 30 - 61 - 20 - - - - Toggle horizontal synchronization - - - HSync - - - - - - 300 - 30 - 61 - 20 - - - - Toggle vertical synchronization - - - VSync - - - - - - 10 - 60 - 41 - 16 - - - - <html><head/><body><p>Synch</p></body></html> - - - - - - 160 - 60 - 51 - 16 - - - - <html><head/><body><p align="right">mV</p></body></html> - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 250 - 60 - 61 - 16 - - - - <html><head/><body><p>Black Lvl</p></body></html> - - - - - - 420 - 60 - 51 - 16 - - - - <html><head/><body><p align="right">mV</p></body></html> - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 380 - 30 - 51 - 20 - - - - Render only half of the frames for slow processors - - - Half - - - - - - 10 - 80 - 31 - 16 - - - - Line - - - - - - 50 - 80 - 101 - 16 - - - - Line length in time units - - - 1 - - - 1000 - - - 1 - - - 1 - - - 1 - - - Qt::Horizontal - - - - - - 160 - 80 - 51 - 16 - - - - <html><head/><body><p align="right">uS</p></body></html> - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 250 - 80 - 31 - 16 - - - - <html><head/><body><p>Top</p></body></html> - - - - - - 310 - 80 - 101 - 20 - - - - Horizontal top length in time units - - - 1 - - - 30 - - - 1 - - - 1 - - - 1 - - - Qt::Horizontal - - - - - - 420 - 80 - 51 - 16 - - - - <html><head/><body><p align="right">uS</p></body></html> - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 10 - 30 - 72 - 22 - - - - Modulation type - - - - FM 1 - - - - - FM 2 - - - - - AM - - - - - - - 450 - 30 - 24 - 22 - - - - Reset to default values - - - R - - + @@ -450,6 +473,12 @@
gui/rollupwidget.h
1 + + ValueDial + QWidget +
gui/valuedial.h
+ 1 + ATVScreen QWidget