Tx2 should use full calls, even with "Sh" checked in MSK144 mode.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7152 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-10-05 14:20:25 +00:00
parent 65e9f3a719
commit 61a643c5a5

View File

@ -3564,6 +3564,7 @@ void MainWindow::genStdMsgs(QString rpt)
QString hisBase = Radio::base_callsign (hisCall); QString hisBase = Radio::base_callsign (hisCall);
QString t0=hisBase + " " + m_baseCall + " "; QString t0=hisBase + " " + m_baseCall + " ";
QString t00=t0;
t=t0 + m_config.my_grid ().mid(0,4); t=t0 + m_config.my_grid ().mid(0,4);
msgtype(t, ui->tx1); msgtype(t, ui->tx1);
if(ui->cbShMsgs->isVisible() and ui->cbShMsgs->isChecked() and if(ui->cbShMsgs->isVisible() and ui->cbShMsgs->isChecked() and
@ -3588,7 +3589,7 @@ void MainWindow::genStdMsgs(QString rpt)
if(n>=15) n=16; if(n>=15) n=16;
rpt.sprintf("%+2.2d",n); rpt.sprintf("%+2.2d",n);
} }
t=t0 + rpt; t=t00 + rpt;
msgtype(t, ui->tx2); msgtype(t, ui->tx2);
t=t0 + "R" + rpt; t=t0 + "R" + rpt;
msgtype(t, ui->tx3); msgtype(t, ui->tx3);