w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-03 13:47:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'charlies-txfreq' into release-2.4.0

Browse Source
This commit is contained in:
Bill Somerville 2021-02-11 18:22:16 +00:00
commit 9f6cf3444e
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
widgets/mainwindow.cpp
View File

@ -6414,8 +6414,6 @@ void MainWindow::on_actionQ65_triggered()
m_hsymStop=49; m_hsymStop=49;
ui->sbTR->values ({15, 30, 60, 120, 300}); ui->sbTR->values ({15, 30, 60, 120, 300});
on_sbTR_valueChanged (ui->sbTR->value()); on_sbTR_valueChanged (ui->sbTR->value());
//### ui->sbSubmode->setMaximum(4);
ui->sbSubmode->setMaximum(7);
ui->sbSubmode->setValue(m_nSubMode); ui->sbSubmode->setValue(m_nSubMode);
QString fname {QDir::toNativeSeparators(m_config.temp_dir().absoluteFilePath ("red.dat"))}; QString fname {QDir::toNativeSeparators(m_config.temp_dir().absoluteFilePath ("red.dat"))};
m_wideGraph->setRedFile(fname); m_wideGraph->setRedFile(fname);
@ -7592,7 +7590,17 @@ void MainWindow::on_sbTR_valueChanged(int value)
ui->rh_decodes_headings_label->setText("UTC dB DT Freq " + tr ("Message")); ui->rh_decodes_headings_label->setText("UTC dB DT Freq " + tr ("Message"));
} }
} }
}
if ("Q65" == m_mode)
{
switch (value)
{
case 15: ui->sbSubmode->setMaximum (2); break;
case 30: ui->sbSubmode->setMaximum (3); break;
default: ui->sbSubmode->setMaximum (4); break;
}
}
}
m_fastGraph->setTRPeriod (value); m_fastGraph->setTRPeriod (value);
m_modulator->setTRPeriod (value); // TODO - not thread safe m_modulator->setTRPeriod (value); // TODO - not thread safe
m_detector->setTRPeriod (value); // TODO - not thread safe m_detector->setTRPeriod (value); // TODO - not thread safe
@ -7638,6 +7646,13 @@ void MainWindow::on_sbSubmode_valueChanged(int n)
if(m_mode=="ISCAT") { if(m_mode=="ISCAT") {
if(m_nSubMode==0) ui->TxFreqSpinBox->setValue(1012); if(m_nSubMode==0) ui->TxFreqSpinBox->setValue(1012);
if(m_nSubMode==1) ui->TxFreqSpinBox->setValue(560); if(m_nSubMode==1) ui->TxFreqSpinBox->setValue(560);
}
if(m_mode=="Q65") {
if((m_nSubMode==4 && m_TRperiod==60.0) || (m_nSubMode==3 && m_TRperiod==30.0) || (m_nSubMode==2 && m_TRperiod==15.0))
{ ui->TxFreqSpinBox->setValue(700);
} else {
ui->TxFreqSpinBox->setValue(1000);
}
} }
if(m_mode=="JT9") { if(m_mode=="JT9") {
if(m_nSubMode<4) { if(m_nSubMode<4) {