mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-15 16:42:12 -05:00
Enable Sh (for Tx4 and Tx5 only) in MSK144 Contest Mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7397 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
3220578bc4
commit
d98253f3c8
@ -3537,11 +3537,15 @@ void MainWindow::genStdMsgs(QString rpt)
|
|||||||
|
|
||||||
if(m_mode=="MSK144") {
|
if(m_mode=="MSK144") {
|
||||||
if(m_config.contestMode()) {
|
if(m_config.contestMode()) {
|
||||||
rpt=m_config.my_grid().mid(0,4);
|
t=t0 + m_config.my_grid().mid(0,4);
|
||||||
|
msgtype(t, ui->tx2);
|
||||||
|
t=t0 + "R " + m_config.my_grid().mid(0,4);
|
||||||
|
msgtype(t, ui->tx3);
|
||||||
}
|
}
|
||||||
if(m_bShMsgs) {
|
if(m_bShMsgs) {
|
||||||
int i=t0.length()-1;
|
int i=t0.length()-1;
|
||||||
t0="<" + t0.mid(0,i) + "> ";
|
t0="<" + t0.mid(0,i) + "> ";
|
||||||
|
if(!m_config.contestMode()) {
|
||||||
if(n<=-2) n=-3;
|
if(n<=-2) n=-3;
|
||||||
if(n>=-1 and n<=1) n=0;
|
if(n>=-1 and n<=1) n=0;
|
||||||
if(n>=2 and n<=4) n=3;
|
if(n>=2 and n<=4) n=3;
|
||||||
@ -3552,14 +3556,13 @@ void MainWindow::genStdMsgs(QString rpt)
|
|||||||
rpt.sprintf("%+2.2d",n);
|
rpt.sprintf("%+2.2d",n);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
if(m_mode!="MSK144" or !m_config.contestMode()) {
|
||||||
t=t00 + rpt;
|
t=t00 + rpt;
|
||||||
msgtype(t, ui->tx2);
|
msgtype(t, ui->tx2);
|
||||||
if(m_mode=="MSK144" and m_config.contestMode()) {
|
|
||||||
t=t0 + "R " + rpt;
|
|
||||||
} else {
|
|
||||||
t=t0 + "R" + rpt;
|
t=t0 + "R" + rpt;
|
||||||
}
|
|
||||||
msgtype(t, ui->tx3);
|
msgtype(t, ui->tx3);
|
||||||
|
}
|
||||||
t=t0 + "RRR";
|
t=t0 + "RRR";
|
||||||
if(m_mode=="JT4" and m_bShMsgs) t="@1500 (RRR)";
|
if(m_mode=="JT4" and m_bShMsgs) t="@1500 (RRR)";
|
||||||
msgtype(t, ui->tx4);
|
msgtype(t, ui->tx4);
|
||||||
|
Loading…
Reference in New Issue
Block a user