w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 05:38:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanyup associated with removing Tab 2.

Browse Source
This commit is contained in:
Joe Taylor 2020-09-05 15:22:18 -04:00
parent 7aeb9d5e2e
commit 4ab8780dd8
2 changed files with 17 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
widgets/mainwindow.cpp
View File

@ -4767,7 +4767,6 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
// Determine appropriate response to received message // Determine appropriate response to received message
auto dtext = " " + message.string () + " "; auto dtext = " " + message.string () + " ";
dtext=dtext.remove("<").remove(">"); dtext=dtext.remove("<").remove(">");
int gen_msg {0};
if(dtext.contains (" " + m_baseCall + " ") if(dtext.contains (" " + m_baseCall + " ")
|| dtext.contains ("<" + m_baseCall + "> ") || dtext.contains ("<" + m_baseCall + "> ")
//###??? || dtext.contains ("<" + m_baseCall + " " + hiscall + "> ") //###??? || dtext.contains ("<" + m_baseCall + " " + hiscall + "> ")
@ -4826,46 +4825,46 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
or bEU_VHF_w2 or (m_QSOProgress==CALLING))) { or bEU_VHF_w2 or (m_QSOProgress==CALLING))) {
if(message_words.at(3).contains(grid_regexp) and SpecOp::EU_VHF!=m_config.special_op_id()) { if(message_words.at(3).contains(grid_regexp) and SpecOp::EU_VHF!=m_config.special_op_id()) {
if(SpecOp::NA_VHF==m_config.special_op_id() or SpecOp::WW_DIGI==m_config.special_op_id()){ if(SpecOp::NA_VHF==m_config.special_op_id() or SpecOp::WW_DIGI==m_config.special_op_id()){
gen_msg=setTxMsg(3); setTxMsg(3);
m_QSOProgress=ROGER_REPORT; m_QSOProgress=ROGER_REPORT;
} else { } else {
if(m_mode=="JT65" and message_words.size()>4 and message_words.at(4)=="OOO") { if(m_mode=="JT65" and message_words.size()>4 and message_words.at(4)=="OOO") {
gen_msg=setTxMsg(3); setTxMsg(3);
m_QSOProgress=ROGER_REPORT; m_QSOProgress=ROGER_REPORT;
} else { } else {
gen_msg=setTxMsg(2); setTxMsg(2);
m_QSOProgress=REPORT; m_QSOProgress=REPORT;
} }
} }
} else if(w34.contains(grid_regexp) and SpecOp::EU_VHF==m_config.special_op_id()) { } else if(w34.contains(grid_regexp) and SpecOp::EU_VHF==m_config.special_op_id()) {
if(nrpt==0) { if(nrpt==0) {
gen_msg=setTxMsg(2); setTxMsg(2);
m_QSOProgress=REPORT; m_QSOProgress=REPORT;
} else { } else {
if(w2=="R") { if(w2=="R") {
gen_msg=setTxMsg(4); setTxMsg(4);
m_QSOProgress=ROGERS; m_QSOProgress=ROGERS;
} else { } else {
gen_msg=setTxMsg(3); setTxMsg(3);
m_QSOProgress=ROGER_REPORT; m_QSOProgress=ROGER_REPORT;
} }
} }
} else if(SpecOp::RTTY == m_config.special_op_id() and bRTTY) { } else if(SpecOp::RTTY == m_config.special_op_id() and bRTTY) {
if(w2=="R") { if(w2=="R") {
gen_msg=setTxMsg(4); setTxMsg(4);
m_QSOProgress=ROGERS; m_QSOProgress=ROGERS;
} else { } else {
gen_msg=setTxMsg(3); setTxMsg(3);
m_QSOProgress=ROGER_REPORT; m_QSOProgress=ROGER_REPORT;
} }
m_xRcvd=t[n-2] + " " + t[n-1]; m_xRcvd=t[n-2] + " " + t[n-1];
} else if(SpecOp::FIELD_DAY==m_config.special_op_id() and bFieldDay_msg) { } else if(SpecOp::FIELD_DAY==m_config.special_op_id() and bFieldDay_msg) {
if(t0=="R") { if(t0=="R") {
gen_msg=setTxMsg(4); setTxMsg(4);
m_QSOProgress=ROGERS; m_QSOProgress=ROGERS;
} else { } else {
gen_msg=setTxMsg(3); setTxMsg(3);
m_QSOProgress=ROGER_REPORT; m_QSOProgress=ROGER_REPORT;
} }
} else { // no grid on end of msg } else { // no grid on end of msg
@ -4905,24 +4904,19 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
if(nRpt>=529 and nRpt<=599) m_xRcvd=t[n-2] + " " + t[n-1]; if(nRpt>=529 and nRpt<=599) m_xRcvd=t[n-2] + " " + t[n-1];
} }
ui->txrb4->setChecked(true); ui->txrb4->setChecked(true);
if(ui->tabWidget->currentIndex()==1) {
gen_msg = 4;
m_ntx=7;
m_gen_message_is_cq = false;
}
} else if(m_QSOProgress>=CALLING and } else if(m_QSOProgress>=CALLING and
((r.toInt()>=-50 && r.toInt()<=49) or (r.toInt()>=529 && r.toInt()<=599))) { ((r.toInt()>=-50 && r.toInt()<=49) or (r.toInt()>=529 && r.toInt()<=599))) {
if(SpecOp::EU_VHF==m_config.special_op_id() or if(SpecOp::EU_VHF==m_config.special_op_id() or
SpecOp::FIELD_DAY==m_config.special_op_id() or SpecOp::FIELD_DAY==m_config.special_op_id() or
SpecOp::RTTY==m_config.special_op_id()) { SpecOp::RTTY==m_config.special_op_id()) {
gen_msg=setTxMsg(2); setTxMsg(2);
m_QSOProgress=REPORT; m_QSOProgress=REPORT;
} else { } else {
if(r.left(2)=="R-" or r.left(2)=="R+") { if(r.left(2)=="R-" or r.left(2)=="R+") {
gen_msg=setTxMsg(4); setTxMsg(4);
m_QSOProgress=ROGERS; m_QSOProgress=ROGERS;
} else { } else {
gen_msg=setTxMsg(3); setTxMsg(3);
m_QSOProgress=ROGER_REPORT; m_QSOProgress=ROGER_REPORT;
} }
} }
@ -4946,21 +4940,10 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
m_ntx=3; m_ntx=3;
m_QSOProgress = ROGER_REPORT; m_QSOProgress = ROGER_REPORT;
ui->txrb3->setChecked (true); ui->txrb3->setChecked (true);
if (ui->tabWidget->currentIndex () == 1) {
gen_msg = 3;
m_ntx = 7;
m_gen_message_is_cq = false;
}
} else if (!is_73) { // don't respond to sign off messages } else if (!is_73) { // don't respond to sign off messages
m_ntx=2; m_ntx=2;
m_QSOProgress = REPORT; m_QSOProgress = REPORT;
ui->txrb2->setChecked(true); ui->txrb2->setChecked(true);
if(ui->tabWidget->currentIndex()==1) {
gen_msg = 2;
m_ntx=7;
m_gen_message_is_cq = false;
}
if (m_bDoubleClickAfterCQnnn and m_transmitting) { if (m_bDoubleClickAfterCQnnn and m_transmitting) {
on_stopTxButton_clicked(); on_stopTxButton_clicked();
TxAgainTimer.start(1500); TxAgainTimer.start(1500);
@ -4989,14 +4972,8 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
else if (firstcall == "DE" && message_words.size () > 3 && message_words.at (3) == "73") { else if (firstcall == "DE" && message_words.size () > 3 && message_words.at (3) == "73") {
if (m_QSOProgress >= ROGERS && base_call == qso_partner_base_call && m_currentMessageType) { if (m_QSOProgress >= ROGERS && base_call == qso_partner_base_call && m_currentMessageType) {
// 73 back to compound call holder // 73 back to compound call holder
if(ui->tabWidget->currentIndex()==1) { m_ntx=5;
gen_msg = 5; ui->txrb5->setChecked(true);
m_ntx=7;
m_gen_message_is_cq = false;
} else {
m_ntx=5;
ui->txrb5->setChecked(true);
}
m_QSOProgress = SIGNOFF; m_QSOProgress = SIGNOFF;
} else { } else {
// treat like a CQ/QRZ // treat like a CQ/QRZ
@ -5009,11 +4986,6 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
m_QSOProgress = REPORT; m_QSOProgress = REPORT;
ui->txrb2->setChecked (true); ui->txrb2->setChecked (true);
} }
if(ui->tabWidget->currentIndex()==1) {
gen_msg = 1;
m_ntx=7;
m_gen_message_is_cq = false;
}
} }
} }
else if (is_73 && !message.isStandardMessage ()) { else if (is_73 && !message.isStandardMessage ()) {
@ -5031,11 +5003,6 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
m_QSOProgress = REPORT; m_QSOProgress = REPORT;
ui->txrb2->setChecked (true); ui->txrb2->setChecked (true);
} }
if (1 == ui->tabWidget->currentIndex ()) {
gen_msg = m_ntx;
m_ntx=7;
m_gen_message_is_cq = false;
}
} }
// if we get here then we are reacting to the message // if we get here then we are reacting to the message
if (m_bAutoReply) m_bCallingCQ = CALLING == m_QSOProgress; if (m_bAutoReply) m_bCallingCQ = CALLING == m_QSOProgress;
@ -5097,10 +5064,9 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
} }
if(m_config.quick_call() && m_bDoubleClicked) auto_tx_mode(true); if(m_config.quick_call() && m_bDoubleClicked) auto_tx_mode(true);
m_bDoubleClicked=false; m_bDoubleClicked=false;
if(gen_msg==-999) return; //Silence compiler warning
} }
int MainWindow::setTxMsg(int n) void MainWindow::setTxMsg(int n)
{ {
m_ntx=n; m_ntx=n;
if(n==1) ui->txrb1->setChecked(true); if(n==1) ui->txrb1->setChecked(true);
@ -5109,11 +5075,6 @@ int MainWindow::setTxMsg(int n)
if(n==4) ui->txrb4->setChecked(true); if(n==4) ui->txrb4->setChecked(true);
if(n==5) ui->txrb5->setChecked(true); if(n==5) ui->txrb5->setChecked(true);
if(n==6) ui->txrb6->setChecked(true); if(n==6) ui->txrb6->setChecked(true);
if(ui->tabWidget->currentIndex()==1) {
m_ntx=7; //### FIX THIS ###
m_gen_message_is_cq = false;
}
return n;
} }
void MainWindow::genCQMsg () void MainWindow::genCQMsg ()

2
widgets/mainwindow.h
View File

@ -310,7 +310,7 @@ private slots:
void checkMSK144ContestType(); void checkMSK144ContestType();
void on_pbBestSP_clicked(); void on_pbBestSP_clicked();
void on_RoundRobin_currentTextChanged(QString text); void on_RoundRobin_currentTextChanged(QString text);
int setTxMsg(int n); void setTxMsg(int n);
bool stdCall(QString const& w); bool stdCall(QString const& w);
void remote_configure (QString const& mode, quint32 frequency_tolerance, QString const& submode void remote_configure (QString const& mode, quint32 frequency_tolerance, QString const& submode
, bool fast_mode, quint32 tr_period, quint32 rx_df, QString const& dx_call , bool fast_mode, quint32 tr_period, quint32 rx_df, QString const& dx_call