w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-10 09:52:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Start of code for use of "TU; ..." messages in RTTY contest.

Browse Source
This commit is contained in:
Joe Taylor 2018-10-08 09:08:52 -04:00
parent 6cecef42aa
commit b22703f8dd
2 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
mainwindow.cpp
View File

@ -3622,19 +3622,7 @@ void MainWindow::guiUpdate()
bool b=(m_mode=="FT8") and ui->cbAutoSeq->isChecked(); bool b=(m_mode=="FT8") and ui->cbAutoSeq->isChecked();
if(is_73 and (m_config.disable_TX_on_73() or b)) { if(is_73 and (m_config.disable_TX_on_73() or b)) {
if(m_nextCall!="") { if(m_nextCall!="") {
ui->dxCallEntry->setText(m_nextCall); useNextCall();
m_nextCall="";
ui->labNextCall->setStyleSheet("");
ui->labNextCall->setText("");
if(m_nextGrid.contains(grid_regexp)) {
ui->dxGridEntry->setText(m_nextGrid);
m_ntx=2;
ui->txrb2->setChecked(true);
} else {
m_ntx=3;
ui->txrb3->setChecked(true);
}
genStdMsgs(m_nextRpt);
} else { } else {
auto_tx_mode (false); auto_tx_mode (false);
if(b) { if(b) {
@ -3861,6 +3849,22 @@ void MainWindow::guiUpdate()
m_btxok0=m_btxok; m_btxok0=m_btxok;
} //End of guiUpdate } //End of guiUpdate
void MainWindow::useNextCall()
{
ui->dxCallEntry->setText(m_nextCall);
m_nextCall="";
ui->labNextCall->setStyleSheet("");
ui->labNextCall->setText("");
if(m_nextGrid.contains(grid_regexp)) {
ui->dxGridEntry->setText(m_nextGrid);
m_ntx=2;
ui->txrb2->setChecked(true);
} else {
m_ntx=3;
ui->txrb3->setChecked(true);
}
genStdMsgs(m_nextRpt);
}
void MainWindow::startTx2() void MainWindow::startTx2()
{ {
@ -4366,10 +4370,19 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
gen_msg = 5; gen_msg = 5;
if (ui->rbGenMsg->isChecked ()) m_ntx=7; if (ui->rbGenMsg->isChecked ()) m_ntx=7;
m_gen_message_is_cq = false; m_gen_message_is_cq = false;
} else {
m_bTUmsg=false;
if(m_nContest==RTTY and m_nextCall!="") {
useNextCall();
QString t="TU; " + ui->tx3->text();
qDebug() << "aa" << t;
ui->tx3->setText(t);
m_bTUmsg=true;
} else { } else {
m_ntx=5; m_ntx=5;
ui->txrb5->setChecked(true); ui->txrb5->setChecked(true);
} }
}
m_QSOProgress = SIGNOFF; m_QSOProgress = SIGNOFF;
} else if((m_QSOProgress >= REPORT } else if((m_QSOProgress >= REPORT
|| (m_QSOProgress >= REPLYING && (m_mode=="MSK144" or m_mode=="FT8"))) || (m_QSOProgress >= REPLYING && (m_mode=="MSK144" or m_mode=="FT8")))
@ -4568,7 +4581,9 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
} }
ui->rptSpinBox->setValue(n); ui->rptSpinBox->setValue(n);
if (!m_nTx73) { // Don't genStdMsgs if we're already sending 73. // Don't genStdMsgs if we're already sending 73 or a "TU; " msg is queued.
if (!m_nTx73 and !m_bTUmsg) {
qDebug() << "bb";
genStdMsgs(rpt); genStdMsgs(rpt);
if (gen_msg) { if (gen_msg) {
switch (gen_msg) { switch (gen_msg) {
@ -4680,6 +4695,11 @@ bool MainWindow::stdCall(QString w)
void MainWindow::genStdMsgs(QString rpt, bool unconditional) void MainWindow::genStdMsgs(QString rpt, bool unconditional)
{ {
if(ui->tx3->text().left(4)=="TU; ") {
qDebug() << "cc" << ui->tx3->text();
return;
}
genCQMsg (); genCQMsg ();
auto const& hisCall=ui->dxCallEntry->text(); auto const& hisCall=ui->dxCallEntry->text();
if(!hisCall.size ()) { if(!hisCall.size ()) {

2
mainwindow.h
View File

@ -503,6 +503,7 @@ private:
bool m_bAutoReply; bool m_bAutoReply;
bool m_bCheckedContest; bool m_bCheckedContest;
bool m_bWarnedSplit=false; bool m_bWarnedSplit=false;
bool m_bTUmsg;
enum enum
{ {
@ -701,6 +702,7 @@ private:
void fast_config(bool b); void fast_config(bool b);
void CQTxFreq(); void CQTxFreq();
void cabLog(); void cabLog();
void useNextCall();
bool isWorked(int itype, QString key, float fMHz=0, QString=""); bool isWorked(int itype, QString key, float fMHz=0, QString="");
QString save_wave_file (QString const& name QString save_wave_file (QString const& name