w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't kill Tx on closing Settings. Warn if TxFreq should be 700 Hz, instead of forcing changes to 700 or 1000 Hz.

This commit is contained in:
Joe Taylor 2021-03-10 15:08:52 -05:00
parent 1d590b81f5
commit 4d4ecfbcda
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
widgets/mainwindow.cpp
View File

@ -6408,7 +6408,6 @@ void MainWindow::on_actionJT65_triggered()
void MainWindow::on_actionQ65_triggered() void MainWindow::on_actionQ65_triggered()
{ {
// on_actionFST4_triggered();
m_mode="Q65"; m_mode="Q65";
m_modeTx="Q65"; m_modeTx="Q65";
ui->actionQ65->setChecked(true); ui->actionQ65->setChecked(true);
@ -6686,6 +6685,16 @@ void MainWindow::on_TxFreqSpinBox_valueChanged(int n)
if(m_mode!="MSK144") { if(m_mode!="MSK144") {
Q_EMIT transmitFrequency (n - m_XIT); Q_EMIT transmitFrequency (n - m_XIT);
} }
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->value()!=700) {
ui->TxFreqSpinBox->setStyleSheet("QSpinBox{background-color:red}");
} else {
ui->TxFreqSpinBox->setStyleSheet("");
}
}
statusUpdate (); statusUpdate ();
} }
@ -7564,9 +7573,7 @@ void MainWindow::on_sbTR_valueChanged(int value)
progressBar.setMaximum (value); progressBar.setMaximum (value);
} }
if(m_mode=="FST4") chk_FST4_freq_range(); if(m_mode=="FST4") chk_FST4_freq_range();
if(m_transmitting) { // if(m_transmitting) on_stopTxButton_clicked(); //### Is this needed or desirable? ###
on_stopTxButton_clicked();
}
on_sbSubmode_valueChanged(ui->sbSubmode->value()); on_sbSubmode_valueChanged(ui->sbSubmode->value());
statusUpdate (); statusUpdate ();
} }
@ -7600,10 +7607,11 @@ void MainWindow::on_sbSubmode_valueChanged(int n)
mode_label.setText (m_mode); mode_label.setText (m_mode);
} }
if(m_mode=="Q65") { 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)) if(((m_nSubMode==4 && m_TRperiod==60.0) || (m_nSubMode==3 && m_TRperiod==30.0) ||
{ ui->TxFreqSpinBox->setValue(700); (m_nSubMode==2 && m_TRperiod==15.0)) && ui->TxFreqSpinBox->value()!=700) {
ui->TxFreqSpinBox->setStyleSheet("QSpinBox{background-color:red}");
} else { } else {
ui->TxFreqSpinBox->setValue(1000); ui->TxFreqSpinBox->setStyleSheet("");
} }
} }
if(m_mode=="JT9") { if(m_mode=="JT9") {