VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-03 06:24:48 -04:00
Code Issues Projects Releases Wiki Activity

DATV modulator: implement still image source for the TS. Fixes #2454

Browse Source
This commit is contained in:
f4exb
2026-01-01 11:13:03 +01:00
parent a88fc90851
commit 7cf1a28b48
25 changed files with 1380 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/channeltx/moddatv/datvmodgui.cpp
+73
View File
@@ -301,6 +301,7 @@ void DATVModGUI::on_dvbStandard_currentIndexChanged(int index)
on_modulation_currentIndexChanged(idx);
updateFEC();
setImageBitrate();
m_doApplySettings = true;
@@ -377,6 +378,7 @@ void DATVModGUI::on_modulation_currentIndexChanged(int index)
m_settings.m_modulation = (DATVModSettings::DATVModulation) (index + 1);
m_doApplySettings = false;
updateFEC();
setImageBitrate();
m_doApplySettings = true;
applySettings();
}
@@ -392,12 +394,14 @@ void DATVModGUI::on_fec_currentIndexChanged(int index)
{
(void) index;
m_settings.m_fec = DATVModSettings::mapCodeRate(ui->fec->currentText());
setImageBitrate();
applySettings();
}
void DATVModGUI::on_symbolRate_valueChanged(int value)
{
m_settings.m_symbolRate = value;
setImageBitrate();
applySettings();
}
@@ -421,6 +425,7 @@ void DATVModGUI::setChannelMarkerBandwidth()
void DATVModGUI::on_inputSelect_currentIndexChanged(int index)
{
m_settings.m_source = (DATVModSettings::DATVSource) index;
setImageBitrate();
applySettings();
}
@@ -430,6 +435,46 @@ void DATVModGUI::on_channelMute_toggled(bool checked)
applySettings();
}
void DATVModGUI::on_imageFileDialog_clicked(bool checked)
{
(void) checked;
QString fileName = QFileDialog::getOpenFileName(this,
tr("Open image file"), m_settings.m_imageFileName, tr("Image Files (*.bmp *.png *.jpg *.jpeg)"),
nullptr, QFileDialog::DontUseNativeDialog);
if (fileName != "")
{
m_settings.m_imageFileName = fileName;
ui->tsImageFileText->setText(m_settings.m_imageFileName);
m_settings.m_imageFileName = fileName;
applySettings();
}
}
void DATVModGUI::on_tsImageTimestamp_toggled(bool checked)
{
m_settings.m_imageOverlayTimestamp = checked;
applySettings();
}
void DATVModGUI::on_imageServiceProvider_editingFinished()
{
m_settings.m_imageServiceProvider = ui->imageServiceProvider->text();
applySettings();
}
void DATVModGUI::on_imageServiceName_editingFinished()
{
m_settings.m_imageServiceName = ui->imageServiceName->text();
applySettings();
}
void DATVModGUI::on_imageCodec_currentIndexChanged(int index)
{
m_settings.m_imageCodec = (DATVModSettings::DATVCodec) index;
applySettings();
}
void DATVModGUI::on_tsFileDialog_clicked(bool checked)
{
(void) checked;
@@ -592,10 +637,20 @@ void DATVModGUI::displaySettings()
ui->inputSelect->setCurrentIndex((int) m_settings.m_source);
if (m_settings.m_imageFileName.isEmpty())
ui->tsImageFileText->setText("...");
else
ui->tsImageFileText->setText(m_settings.m_imageFileName);
if (m_settings.m_tsFileName.isEmpty())
ui->tsFileText->setText("...");
else
ui->tsFileText->setText(m_settings.m_tsFileName);
ui->tsImageTimestamp->setChecked(m_settings.m_imageOverlayTimestamp);
ui->imageServiceProvider->setText(m_settings.m_imageServiceProvider);
ui->imageServiceName->setText(m_settings.m_imageServiceName);
ui->imageCodec->setCurrentIndex((int) m_settings.m_imageCodec);
ui->playFile->setChecked(m_settings.m_tsFilePlay);
ui->playLoop->setChecked(m_settings.m_tsFilePlayLoop);
@@ -619,6 +674,19 @@ void DATVModGUI::enterEvent(EnterEventType* event)
ChannelGUI::enterEvent(event);
}
void DATVModGUI::setImageBitrate()
{
if (m_settings.m_source == DATVModSettings::SourceImage)
{
int bitrate = static_cast<int>(m_settings.getDVBSDataBitrate() * 1.1f);
ui->tsImageFileBitrate->setText(QString("%1 kb/s").arg(bitrate/1000.0f, 0, 'f', 2));
}
else
{
ui->tsImageFileBitrate->setText("0kb/s");
}
}
void DATVModGUI::tick()
{
double powDb = CalcDb::dbPower(m_datvMod->getMagSq());
@@ -688,6 +756,11 @@ void DATVModGUI::makeUIConnections()
QObject::connect(ui->modulation, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &DATVModGUI::on_modulation_currentIndexChanged);
QObject::connect(ui->rollOff, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &DATVModGUI::on_rollOff_currentIndexChanged);
QObject::connect(ui->inputSelect, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &DATVModGUI::on_inputSelect_currentIndexChanged);
QObject::connect(ui->tsImageDialog, &QPushButton::clicked, this, &DATVModGUI::on_imageFileDialog_clicked);
QObject::connect(ui->tsImageTimestamp, &QCheckBox::toggled, this, &DATVModGUI::on_tsImageTimestamp_toggled);
QObject::connect(ui->imageServiceProvider, &QLineEdit::editingFinished, this, &DATVModGUI::on_imageServiceProvider_editingFinished);
QObject::connect(ui->imageServiceName, &QLineEdit::editingFinished, this, &DATVModGUI::on_imageServiceName_editingFinished);
QObject::connect(ui->imageCodec, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &DATVModGUI::on_imageCodec_currentIndexChanged);
QObject::connect(ui->tsFileDialog, &QPushButton::clicked, this, &DATVModGUI::on_tsFileDialog_clicked);
QObject::connect(ui->playFile, &ButtonSwitch::toggled, this, &DATVModGUI::on_playFile_toggled);
QObject::connect(ui->playLoop, &ButtonSwitch::toggled, this, &DATVModGUI::on_playLoop_toggled);