Fix some potential bounds errors in setting frequency limits. Implement submodes QRA65B-E on the Tx side.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6942 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor
2016-07-23 13:22:34 +00:00
parent 6a8ed228e2
commit d1e23bdac8
3 changed files with 19 additions and 7 deletions
+11 -1
View File
@@ -3984,7 +3984,9 @@ void MainWindow::on_actionMSK144_triggered()
void MainWindow::on_actionQRA64_triggered()
{
int n=m_nSubMode;
on_actionJT65_triggered();
m_nSubMode=n;
m_mode="QRA64";
m_modeTx="QRA64";
ui->actionQRA64->setChecked(true);
@@ -3993,9 +3995,15 @@ void MainWindow::on_actionQRA64_triggered()
setup_status_bar (m_config.enable_VHF_features ());
m_wideGraph->setMode(m_mode);
m_wideGraph->setModeTx(m_modeTx);
ui->sbSubmode->setMaximum(4);
if(m_config.enable_VHF_features()) {
ui->sbSubmode->setValue(m_nSubMode);
} else {
ui->sbSubmode->setValue(0);
ui->sbTR->setValue(0);
}
}
void MainWindow::on_actionJT65_triggered()
{
if(m_mode=="JT4" or m_mode.startsWith ("WSPR")) {
@@ -4865,6 +4873,8 @@ void MainWindow::transmit (double snr)
if(m_nSubMode==0) toneSpacing=12000.0/6912.0;
if(m_nSubMode==1) toneSpacing=2*12000.0/6912.0;
if(m_nSubMode==2) toneSpacing=4*12000.0/6912.0;
if(m_nSubMode==3) toneSpacing=8*12000.0/6912.0;
if(m_nSubMode==4) toneSpacing=16*12000.0/6912.0;
Q_EMIT sendMessage (NUM_QRA64_SYMBOLS,
6912.0, ui->TxFreqSpinBox->value () - m_XIT,
toneSpacing, m_soundOutput, m_config.audio_output_channel (),