diff --git a/plugins/channelrx/demodatv/atvdemodgui.ui b/plugins/channelrx/demodatv/atvdemodgui.ui index d48aa0577..17ac80b09 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.ui +++ b/plugins/channelrx/demodatv/atvdemodgui.ui @@ -1011,7 +1011,7 @@ QTabWidget::West - 0 + 1 diff --git a/plugins/channelrx/demoddatv/datvdemodgui.cpp b/plugins/channelrx/demoddatv/datvdemodgui.cpp index 7fab97e52..1c68bf252 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.cpp +++ b/plugins/channelrx/demoddatv/datvdemodgui.cpp @@ -277,6 +277,12 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba connect(&m_objTimer, SIGNAL(timeout()), this, SLOT(tick())); m_objTimer.start(); + ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03))); + ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); + ui->deltaFrequency->setValueRange(false, 7, -9999999, 9999999); + + ui->rfBandwidth->setColorMapper(ColorMapper(ColorMapper::GrayYellow)); + ui->rfBandwidth->setValueRange(7, 0, 9999999); m_objChannelMarker.blockSignals(true); m_objChannelMarker.setColor(Qt::magenta); diff --git a/plugins/channelrx/demoddatv/datvdemodgui.ui b/plugins/channelrx/demoddatv/datvdemodgui.ui index a7e2b3181..5fa342fa9 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.ui +++ b/plugins/channelrx/demoddatv/datvdemodgui.ui @@ -6,26 +6,20 @@ 0 0 - 512 - 640 + 530 + 442 - + 0 0 - 512 - 640 - - - - - 512 - 640 + 530 + 442 @@ -40,741 +34,914 @@ DATV Demodulator - + - 10 + 0 0 - 496 - 250 + 521 + 41 - - - 496 - 250 - + + RF Settings - - - 496 - 250 - - - - DATV Settings - - - - - 0 - 20 - 222 - 222 - - - - - QLayout::SetMinimumSize - - - - - - 0 - 0 - - - - - 220 - 220 - - - - - 220 - 220 - - - - Signal constellation - - - - - - - - - - - - 230 - 20 - 261 - 221 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - 10 - 10 - 81 - 21 - - - - DVB Standard - - - - DVB-S - - - - - - - 10 - 40 - 80 - 21 - - - - Modulation scheme - - - - BPSK - - - - - QPSK - - - - - 8PSK - - - - - 16APSK - - - - - 32APSK - - - - - 64APSKe - - - - - 16QAM - - - - - 64QAM - - - - - 256QAM - - - - - - - 10 - 70 - 80 - 21 - - - - FEC ratio - - - - 1/2 - - - - - 2/3 - - - - - 3/4 - - - - - 5/6 - - - - - 7/8 - - - - - - - 10 - 100 - 101 - 20 - - - - Fast signal decode - - - FAST LOCK - - - - - - 140 - 120 - 81 - 20 - - - - Viterbi algorithm (CPU intensive) - - - VITERBI - - - - - - 10 - 120 - 111 - 20 - - - - Constellation hardening - - - HARD METRIC - - - - - - 100 - 40 - 61 - 21 - - - - Symbols/s - - - - - - 100 - 10 - 71 - 21 - - - - Bandwidth - - - - - - 140 - 100 - 111 - 20 - - - - Small frequency drift compensation - - - ALLOW DRIFT - - - - - - 170 - 70 - 81 - 23 - - - - Number of stray peaks to suppress - - - 32 - - - - - - 100 - 70 - 71 - 21 - - - - Notch filter - - - - - - 70 - 200 - 181 - 20 - - - - Video buffer fill - - - 0 - - - - - - 10 - 180 - 111 - 16 - - - - Total number of bytes decoded - - - - - - - - - - 230 - 120 - 21 - 22 - - - - R - - - - - - 170 - 40 - 81 - 23 - - - - Symbol rate - - - 1 - - - 1024000000 - - - 1000 - - - - - - 170 - 10 - 81 - 23 - - - - RF filter bandwidth - - - 1000 - - - 1024000000 - - - 1000 - - - - - - 130 - 180 - 121 - 16 - - - - Stream speed - - - - - - - - - - 10 - 200 - 61 - 15 - - - - Buffer: - - - - - - 10 - 150 - 91 - 22 - - - - Filter - - - - FIR LINEAR - - - - - FIR NEAREST - - - - - FIR RRC - - - - - - - 140 - 150 - 41 - 23 - - - - RRC filter roll off factor - - - 1 - - - 99 - - - 35 - - - - - - 106 - 150 - 28 - 23 - - - - R.off - - - - - - 180 - 150 - 28 - 23 - - - - Exc - - - - - - 210 - 150 - 41 - 23 - - - - Filter excursion (dB) - - - 1 - - - 99 - - - 10 - - - + + + + + + + 10 + + + 10 + + + + + dF + + + + + + + + 0 + 0 + + + + + 32 + 16 + + + + + DejaVu Sans Mono + 12 + false + + + + PointingHandCursor + + + Channel center frequency shift + + + + + + + Hz + + + + + + + + + 10 + + + 10 + + + + + BW + + + + + + + + 0 + 0 + + + + + 32 + 16 + + + + + DejaVu Sans Mono + 12 + false + + + + PointingHandCursor + + + RF bandwidth + + + + + + + Hz + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + - + - 10 - 250 - 496 - 385 + 0 + 40 + 526 + 400 - 496 - 385 + 526 + 400 - - - 496 - 385 - + + DATV - - VIDEO Stream + + QTabWidget::West - - - - 0 - 300 - 281 - 81 - - - - Stream information - - - true - - - false - - - - - - 400 - 350 - 91 - 27 - - - - Full screen video (click in the image to return) - - - Full Screen - - - - - - 400 - 300 - 91 - 27 - - - - Start/Stop video streaming - - - Video - - - - - - 0 - 20 - 488 - 272 - - - - - - - - 0 - 0 - + + 0 + + + + DATV + + + + + 0 + 0 + 496 + 250 + + + + + 496 + 250 + + + + + 496 + 250 + + + + DATV Settings + + + + + 0 + 20 + 222 + 222 + + + + + QLayout::SetMinimumSize - - - 480 - 270 - - - - - 355 - 270 - + + + + + 0 + 0 + + + + + 220 + 220 + + + + + 220 + 220 + + + + Signal constellation + + + + + + + + + + + + 230 + 20 + 261 + 221 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + 10 + 10 + 81 + 21 + - Video + DVB Standard - - + + + DVB-S + + + + + + + 10 + 40 + 80 + 21 + + + + Modulation scheme + + + + BPSK + + + + + QPSK + + + + + 8PSK + + + + + 16APSK + + + + + 32APSK + + + + + 64APSKe + + + + + 16QAM + + + + + 64QAM + + + + + 256QAM + + + + + + + 10 + 70 + 80 + 21 + + + + FEC ratio + + + + 1/2 + + + + + 2/3 + + + + + 3/4 + + + + + 5/6 + + + + + 7/8 + + + + + + + 10 + 100 + 101 + 20 + + + + Fast signal decode + + + FAST LOCK - - + + + + 140 + 120 + 81 + 20 + + + + Viterbi algorithm (CPU intensive) + + + VITERBI + + + + + + 10 + 120 + 111 + 20 + + + + Constellation hardening + + + HARD METRIC + + + + + + 100 + 40 + 61 + 21 + + + + Symbols/s + + + + + + 100 + 10 + 71 + 21 + + + + Bandwidth + + + + + + 140 + 100 + 111 + 20 + + + + Small frequency drift compensation + + + ALLOW DRIFT + + + + + + 170 + 70 + 81 + 23 + + + + Number of stray peaks to suppress + + + 32 + + + + + + 100 + 70 + 71 + 21 + + + + Notch filter + + + + + + 70 + 200 + 181 + 20 + + + + Video buffer fill + + + 0 + + + + + + 10 + 180 + 111 + 16 + + + + Total number of bytes decoded + + + - + + + + + + 230 + 120 + 21 + 22 + + + + R + + + + + + 170 + 40 + 81 + 23 + + + + Symbol rate + + + 1 + + + 1024000000 + + + 1000 + + + + + + 170 + 10 + 81 + 23 + + + + RF filter bandwidth + + + 1000 + + + 1024000000 + + + 1000 + + + + + + 130 + 180 + 121 + 16 + + + + Stream speed + + + - + + + + + + 10 + 200 + 61 + 15 + + + + Buffer: + + + + + + 10 + 150 + 91 + 22 + + + + Filter + + + + FIR LINEAR + + + + + FIR NEAREST + + + + + FIR RRC + + + + + + + 140 + 150 + 41 + 23 + + + + RRC filter roll off factor + + + 1 + + + 99 + + + 35 + + + + + + 106 + 150 + 28 + 23 + + + + R.off + + + + + + 180 + 150 + 28 + 23 + + + + Exc + + + + + + 210 + 150 + 41 + 23 + + + + Filter excursion (dB) + + + 1 + + + 99 + + + 10 + + + + - - - false - - - - 300 - 320 - 85 - 20 - - - - Transport stream detected - - - Transport - - - true - - - - - false - - - - 300 - 340 - 85 - 20 - - - - Video data detected - - - Video - - - true - - - - - false - - - - 300 - 360 - 85 - 20 - - - - Video being decoded - - - Decoding - - - true - - - - - false - - - - 300 - 300 - 85 - 20 - - - - Data being received - - - Data - - - true - + + + Video + + + + + 0 + 0 + 496 + 385 + + + + + 496 + 385 + + + + + 496 + 385 + + + + VIDEO Stream + + + + + 0 + 300 + 281 + 81 + + + + Stream information + + + true + + + false + + + + + + 400 + 350 + 91 + 27 + + + + Full screen video (click in the image to return) + + + Full Screen + + + + + + 400 + 300 + 91 + 27 + + + + Start/Stop video streaming + + + Video + + + + + + 0 + 20 + 488 + 272 + + + + + + + + 0 + 0 + + + + + 480 + 270 + + + + + 355 + 270 + + + + Video + + + + + + + + + + + false + + + + 300 + 320 + 85 + 20 + + + + Transport stream detected + + + Transport + + + true + + + + + false + + + + 300 + 340 + 85 + 20 + + + + Video data detected + + + Video + + + true + + + + + false + + + + 300 + 360 + 85 + 20 + + + + Video being decoded + + + Decoding + + + true + + + + + false + + + + 300 + 300 + 85 + 20 + + + + Data being received + + + Data + + + true + + + @@ -796,6 +963,18 @@
datvideorender.h
1 + + ValueDialZ + QWidget +
gui/valuedialz.h
+ 1 +
+ + ValueDial + QWidget +
gui/valuedial.h
+ 1 +