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

Fix several more bugs in generating new-style messages. Use DXped label for contest ID.

This commit is contained in:
Joe Taylor 2018-07-07 14:47:33 -04:00
parent a9bb1924f9
commit df26a762dd
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mainwindow.cpp
View File

@ -4566,12 +4566,13 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
QString rs=rst.mid(0,2);
if(m_config.bEU_VHF_Contest()) {
QString a;
a.sprintf(" %d ",ui->sbSerialNumber->value());
t=t0 + rs + a + m_config.my_grid();
QString t1,a;
t1=t0.split(" ").at(0);
a.sprintf("%4.4d ",ui->sbSerialNumber->value());
t=t1 + " " + rs + a + m_config.my_grid();
msgtype(t, ui->tx2);
a.sprintf(" %d ",ui->sbSerialNumber->value());
t=t0 + "R " + rs + a + m_config.my_grid();
a.sprintf("%4.4d ",ui->sbSerialNumber->value());
t=t1 + " R " + rs + a + m_config.my_grid();
msgtype(t, ui->tx3);
m_send_RR73=true;
}
@ -5176,6 +5177,19 @@ void MainWindow::on_actionFT8_triggered()
ui->txb6->setEnabled(false);
}
QString t0="";
if(m_config.bEU_VHF_Contest()) t0="EU VHF";
if(m_config.bNA_VHF_Contest()) t0="NA VHF";
if(m_config.bFieldDay()) t0="FD";
if(m_config.bRTTYroundup()) t0=="RTTY";
if(m_config.bGenerate77()) t0+=" 2";
if(t0=="") {
ui->labDXped->setVisible(false);
} else {
ui->labDXped->setVisible(true);
ui->labDXped->setText("*** " + t0 + " ***");
}
if((m_config.bFox() or m_config.bHound()) and !m_config.split_mode() and !m_bWarnedSplit) {
QString errorMsg;
MessageBox::critical_message (this,