mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-21 19:55:20 -05:00
Select-next-caller is now functional, needs testing. Still to do is "TU; ..." message.
This commit is contained in:
Joe Taylor
parent
6e843a960b
commit
4a478184ca
@ -12,11 +12,11 @@ JT65 111010000000111000010000000000001
|
||||
JT65/VHF 111110010000111110101100010000000
|
||||
QRA64 111110010110111110000000001000000
|
||||
ISCAT 100111000000000110000000000000000
|
||||
MSK144 101111110100000000010001000010000
|
||||
MSK144 101111110100000000010001000000000
|
||||
WSPR 000000000000000001010000000000000
|
||||
Echo 000000000000000000000010000000000
|
||||
FCal 001101000000000000000000000001000
|
||||
FT8 111010000100111000010000100100001
|
||||
FT8 111010000100111000010000100110001
|
||||
FT8/VHF 111010000100111000010000100110001
|
||||
FT8/Fox 111010000100111000010000000000100
|
||||
FT8/Hound 111010000100111000010000000000110
|
||||
@ -55,7 +55,7 @@ Mapping of column numbers to widgets
|
||||
25. AP JT65
|
||||
26. AP DX Call
|
||||
27. cbFirst
|
||||
28. cbVHFcontest
|
||||
28. labNextCall
|
||||
29. measure_check_box
|
||||
30. labDXped
|
||||
31. cbRxAll
|
||||
|
||||
@ -728,6 +728,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
|
||||
m_msg[0][0]=0;
|
||||
ui->labDXped->setVisible(false);
|
||||
ui->labDXped->setStyleSheet("QLabel {background-color: red; color: white;}");
|
||||
ui->labNextCall->setText("");
|
||||
ui->labNextCall->setVisible(false);
|
||||
|
||||
for(int i=0; i<28; i++) { //Initialize dBm values
|
||||
float dbm=(10.0*i)/3.0 - 30.0;
|
||||
@ -3619,11 +3621,27 @@ void MainWindow::guiUpdate()
|
||||
|
||||
bool b=(m_mode=="FT8") and ui->cbAutoSeq->isChecked();
|
||||
if(is_73 and (m_config.disable_TX_on_73() or b)) {
|
||||
auto_tx_mode (false);
|
||||
if(b) {
|
||||
m_ntx=6;
|
||||
ui->txrb6->setChecked(true);
|
||||
m_QSOProgress = CALLING;
|
||||
if(m_nextCall!="") {
|
||||
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);
|
||||
} else {
|
||||
auto_tx_mode (false);
|
||||
if(b) {
|
||||
m_ntx=6;
|
||||
ui->txrb6->setChecked(true);
|
||||
m_QSOProgress = CALLING;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -4383,7 +4401,8 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
|
||||
}
|
||||
}
|
||||
else if (m_QSOProgress >= ROGERS
|
||||
&& message_words.size () > 2 && message_words.at (1).contains (m_baseCall) && message_words.at (2) == "73") {
|
||||
&& message_words.size () > 2 && message_words.at (1).contains (m_baseCall)
|
||||
&& message_words.at (2) == "73") {
|
||||
// 73 back to compound call holder
|
||||
if(ui->tabWidget->currentIndex()==1) {
|
||||
gen_msg = 5;
|
||||
@ -4397,7 +4416,8 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
|
||||
m_QSOProgress = SIGNOFF;
|
||||
}
|
||||
else if (!(m_bAutoReply && m_QSOProgress > CALLING)) {
|
||||
if ((message_words.size () > 4 && message_words.at (1).contains (m_baseCall) && message_words.at (4) == "OOO")) {
|
||||
if ((message_words.size () > 4 && message_words.at (1).contains (m_baseCall)
|
||||
&& message_words.at (4) == "OOO")) {
|
||||
// EME short code report or MSK144/FT8 contest mode reply, send back Tx3
|
||||
m_ntx=3;
|
||||
m_QSOProgress = ROGER_REPORT;
|
||||
@ -4428,6 +4448,16 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
|
||||
}
|
||||
}
|
||||
else { // nothing for us
|
||||
if(message_words.size () > 3 // enough fields for a normal message
|
||||
&& (message_words.at(1).contains(m_baseCall) || "DE" == message_words.at(1))
|
||||
&& (!message_words.at(2).contains(qso_partner_base_call) and !bEU_VHF_w2)) {
|
||||
// Queue up the next QSO partner
|
||||
m_nextCall=message_words.at(2);
|
||||
m_nextGrid=message_words.at(3);
|
||||
m_nextRpt=message.report();
|
||||
ui->labNextCall->setText(m_nextCall);
|
||||
ui->labNextCall->setStyleSheet("QLabel {background-color: #66ff66}");
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
@ -4471,7 +4501,8 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
|
||||
ui->txrb5->setChecked(true);
|
||||
}
|
||||
m_QSOProgress = SIGNOFF;
|
||||
} else {// just work them
|
||||
} else {
|
||||
// just work them
|
||||
if (ui->tx1->isEnabled ()) {
|
||||
m_ntx = 1;
|
||||
m_QSOProgress = REPLYING;
|
||||
@ -5297,7 +5328,7 @@ void MainWindow::displayWidgets(qint64 n)
|
||||
if(i==25) ui->actionEnable_AP_JT65->setVisible (b);
|
||||
if(i==26) ui->actionEnable_AP_DXcall->setVisible (b);
|
||||
if(i==27) ui->cbFirst->setVisible(b);
|
||||
// if(i==28) ui->cbVHFcontest->setVisible(b);
|
||||
if(i==28) ui->labNextCall->setVisible(b);
|
||||
if(i==29) ui->measure_check_box->setVisible(b);
|
||||
if(i==30) ui->labDXped->setVisible(b);
|
||||
if(i==31) ui->cbRxAll->setVisible(b);
|
||||
@ -5346,7 +5377,7 @@ void MainWindow::on_actionFT8_triggered()
|
||||
ui->label_6->setText("Band Activity");
|
||||
ui->decodedTextLabel->setText( " UTC dB DT Freq Message");
|
||||
}
|
||||
displayWidgets(nWidgets("111010000100111000010000100100001"));
|
||||
displayWidgets(nWidgets("111010000100111000010000100110001"));
|
||||
ui->txrb2->setEnabled(true);
|
||||
ui->txrb4->setEnabled(true);
|
||||
ui->txrb5->setEnabled(true);
|
||||
|
||||
@ -586,6 +586,7 @@ private:
|
||||
QString m_modeTx;
|
||||
QString m_fnameWE; // save path without extension
|
||||
QString m_rpt;
|
||||
QString m_nextRpt;
|
||||
QString m_rptSent;
|
||||
QString m_rptRcvd;
|
||||
QString m_qsoStart;
|
||||
@ -603,6 +604,8 @@ private:
|
||||
QString m_xSent; //Contest exchange sent
|
||||
QString m_xRcvd; //Contest exchange received
|
||||
QString m_currentBand;
|
||||
QString m_nextCall;
|
||||
QString m_nextGrid;
|
||||
|
||||
QSet<QString> m_pfx;
|
||||
QSet<QString> m_sfx;
|
||||
|
||||
@ -1046,6 +1046,16 @@ QLabel[oob="true"] {
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QLabel" name="labNextCall">
|
||||
<property name="text">
|
||||
<string>Next Call</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user