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

Display the "CQ Only" checkbox only in modes where it may be useful. 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8539 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2018-02-28 13:50:58 +00:00
parent 8475b826fd
commit 2a307b776c
3 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
displayWidgets.txt
View File

@ -1,28 +1,28 @@
Here are the "displayWidgets()" strings for WSJT-X modes Here are the "displayWidgets()" strings for WSJT-X modes
1 2 3 1 2 3
01234567890123456789012345678901 012345678901234567890123456789012
---------------------------------------------- ----------------------------------------------
JT4 11101000000011100011000000000000 JT4 111010000000111000110000000000000
JT4/VHF 11111001001011111011110000000000 JT4/VHF 111110010010111110111100000000000
JT9 11101000000011100001000000000000 JT9 111010000000111000010000000000001
JT9/VHF 11111010100011111001000000000000 JT9/VHF 111110101000111110010000000000000
JT9+JT65 11101000000111100001000000000000 JT9+JT65 111010000001111000010000000000001
JT65 11101000000011100001000000000000 JT65 111010000000111000010000000000001
JT65/VHF 11111001000011111010110001000000 JT65/VHF 111110010000111110101100010000000
QRA64 11111001011011111000000000100000 QRA64 111110010110111110000000001000000
ISCAT 10011100000000011000000000000000 ISCAT 100111000000000110000000000000000
MSK144 10111111010000000001000100001000 MSK144 101111110100000000010001000010000
WSPR 00000000000000000101000000000000 WSPR 000000000000000001010000000000000
Echo 00000000000000000000001000000000 Echo 000000000000000000000010000000000
FCal 00110100000000000000000000000100 FCal 001101000000000000000000000001000
FT8 11101000010011100001000010010000 FT8 111010000100111000010000100100001
FT8/VHF 11101000010011100001000010011000 FT8/VHF 111010000100111000010000100110001
FT8/Fox 11101000010011100001000000000010 FT8/Fox 111010000100111000010000000000100
FT8/Hound 11101000010011100001000000000011 FT8/Hound 111010000100111000010000000000110
---------------------------------------------- ----------------------------------------------
1 2 3 1 2 3
01234567890123456789012345678901 012345678901234567890123456789012
---------------------------------------------- ----------------------------------------------
Mapping of column numbers to widgets Mapping of column numbers to widgets
@ -59,3 +59,4 @@ Mapping of column numbers to widgets
29. measure_check_box 29. measure_check_box
30. labDXped 30. labDXped
31. cbRxAll 31. cbRxAll
32. cbCQonly

36
mainwindow.cpp
View File

@ -4891,6 +4891,7 @@ qint64 MainWindow::nWidgets(QString t)
void MainWindow::displayWidgets(qint64 n) void MainWindow::displayWidgets(qint64 n)
{ {
/* See text file "displayWidgets.txt" for widget numbers */
qint64 j=qint64(1)<<(N_WIDGETS-1); qint64 j=qint64(1)<<(N_WIDGETS-1);
bool b; bool b;
for(int i=0; i<N_WIDGETS; i++) { for(int i=0; i<N_WIDGETS; i++) {
@ -4936,6 +4937,7 @@ void MainWindow::displayWidgets(qint64 n)
if(i==29) ui->measure_check_box->setVisible(b); if(i==29) ui->measure_check_box->setVisible(b);
if(i==30) ui->labDXped->setVisible(b); if(i==30) ui->labDXped->setVisible(b);
if(i==31) ui->cbRxAll->setVisible(b); if(i==31) ui->cbRxAll->setVisible(b);
if(i==32) ui->cbCQonly->setVisible(b);
j=j>>1; j=j>>1;
} }
m_lastCallsign.clear (); // ensures Tx5 is updated for new modes m_lastCallsign.clear (); // ensures Tx5 is updated for new modes
@ -4978,11 +4980,11 @@ void MainWindow::on_actionFT8_triggered()
ui->decodedTextLabel->setText( " UTC dB DT Freq Message"); ui->decodedTextLabel->setText( " UTC dB DT Freq Message");
} }
if(!bVHF) { if(!bVHF) {
displayWidgets(nWidgets("11101000010011100001000010010000")); displayWidgets(nWidgets("111010000100111000010000100100001"));
// Make sure that VHF contest mode is unchecked if VHF features is not enabled. // Make sure that VHF contest mode is unchecked if VHF features is not enabled.
ui->cbVHFcontest->setChecked(false); ui->cbVHFcontest->setChecked(false);
} else { } else {
displayWidgets(nWidgets("11101000010011100001000010011000")); displayWidgets(nWidgets("111010000100111000010000100110001"));
} }
ui->txrb2->setEnabled(true); ui->txrb2->setEnabled(true);
ui->txrb4->setEnabled(true); ui->txrb4->setEnabled(true);
@ -5001,7 +5003,7 @@ void MainWindow::on_actionFT8_triggered()
ui->cbAutoSeq->setEnabled(false); ui->cbAutoSeq->setEnabled(false);
ui->tabWidget->setCurrentIndex(2); ui->tabWidget->setCurrentIndex(2);
ui->TxFreqSpinBox->setValue(300); ui->TxFreqSpinBox->setValue(300);
displayWidgets(nWidgets("11101000010011100001000000000010")); displayWidgets(nWidgets("111010000100111000010000000000100"));
ui->labDXped->setText("DXpedition: Fox"); ui->labDXped->setText("DXpedition: Fox");
on_actionFox_Log_triggered(); on_actionFox_Log_triggered();
} }
@ -5011,7 +5013,7 @@ void MainWindow::on_actionFT8_triggered()
ui->cbAutoSeq->setEnabled(false); ui->cbAutoSeq->setEnabled(false);
ui->tabWidget->setCurrentIndex(0); ui->tabWidget->setCurrentIndex(0);
ui->cbHoldTxFreq->setChecked(true); ui->cbHoldTxFreq->setChecked(true);
displayWidgets(nWidgets("11101000010011000001000000000011")); displayWidgets(nWidgets("111010000100110000010000000000110"));
ui->labDXped->setText("DXpedition: Hound"); ui->labDXped->setText("DXpedition: Hound");
ui->txrb1->setChecked(true); ui->txrb1->setChecked(true);
ui->txrb2->setEnabled(false); ui->txrb2->setEnabled(false);
@ -5070,9 +5072,9 @@ void MainWindow::on_actionJT4_triggered()
ui->sbSubmode->setValue(0); ui->sbSubmode->setValue(0);
} }
if(bVHF) { if(bVHF) {
displayWidgets(nWidgets("11111001011011111011110000000000")); displayWidgets(nWidgets("111110010110111110111100000000000"));
} else { } else {
displayWidgets(nWidgets("11101000000011100011000000000000")); displayWidgets(nWidgets("111010000000111000110000000000000"));
} }
fast_config(false); fast_config(false);
statusChanged(); statusChanged();
@ -5125,9 +5127,9 @@ void MainWindow::on_actionJT9_triggered()
ui->label_6->setText("Band Activity"); ui->label_6->setText("Band Activity");
ui->label_7->setText("Rx Frequency"); ui->label_7->setText("Rx Frequency");
if(bVHF) { if(bVHF) {
displayWidgets(nWidgets("11111010110011111001000000000000")); displayWidgets(nWidgets("111110101100111110010000000000000"));
} else { } else {
displayWidgets(nWidgets("11101000000011100001000000000000")); displayWidgets(nWidgets("111010000000111000010000000000001"));
} }
fast_config(m_bFastMode); fast_config(m_bFastMode);
ui->cbAutoSeq->setVisible(m_bFast9); ui->cbAutoSeq->setVisible(m_bFast9);
@ -5166,7 +5168,7 @@ void MainWindow::on_actionJT9_JT65_triggered()
ui->label_7->setText("Rx Frequency"); ui->label_7->setText("Rx Frequency");
ui->decodedTextLabel->setText("UTC dB DT Freq Message"); ui->decodedTextLabel->setText("UTC dB DT Freq Message");
ui->decodedTextLabel2->setText("UTC dB DT Freq Message"); ui->decodedTextLabel2->setText("UTC dB DT Freq Message");
displayWidgets(nWidgets("11101000000111100001000000000000")); displayWidgets(nWidgets("111010000001111000010000000000001"));
fast_config(false); fast_config(false);
statusChanged(); statusChanged();
} }
@ -5213,9 +5215,9 @@ void MainWindow::on_actionJT65_triggered()
ui->label_7->setText("Rx Frequency"); ui->label_7->setText("Rx Frequency");
} }
if(bVHF) { if(bVHF) {
displayWidgets(nWidgets("11111001010011111010110001000000")); displayWidgets(nWidgets("111110010100111110101100010000000"));
} else { } else {
displayWidgets(nWidgets("11101000000011100001000000000000")); displayWidgets(nWidgets("111010000000111000010000000000001"));
} }
fast_config(false); fast_config(false);
statusChanged(); statusChanged();
@ -5247,7 +5249,7 @@ void MainWindow::on_actionQRA64_triggered()
"Using old QRA64 sync pattern."); "Using old QRA64 sync pattern.");
m_bQRAsyncWarned=true; m_bQRAsyncWarned=true;
} }
displayWidgets(nWidgets("11111001011011111000000000100000")); displayWidgets(nWidgets("111110010110111110000000001000000"));
statusChanged(); statusChanged();
} }
@ -5283,7 +5285,7 @@ void MainWindow::on_actionISCAT_triggered()
ui->sbSubmode->setMaximum(1); ui->sbSubmode->setMaximum(1);
if(m_nSubMode==0) ui->TxFreqSpinBox->setValue(1012); if(m_nSubMode==0) ui->TxFreqSpinBox->setValue(1012);
if(m_nSubMode==1) ui->TxFreqSpinBox->setValue(560); if(m_nSubMode==1) ui->TxFreqSpinBox->setValue(560);
displayWidgets(nWidgets("10011100000000011000000000000000")); displayWidgets(nWidgets("100111000000000110000000000000000"));
fast_config(true); fast_config(true);
statusChanged (); statusChanged ();
} }
@ -5324,7 +5326,7 @@ void MainWindow::on_actionMSK144_triggered()
ui->rptSpinBox->setValue(0); ui->rptSpinBox->setValue(0);
ui->rptSpinBox->setSingleStep(1); ui->rptSpinBox->setSingleStep(1);
ui->sbFtol->values ({20, 50, 100, 200}); ui->sbFtol->values ({20, 50, 100, 200});
displayWidgets(nWidgets("10111111010000000001000100001000")); displayWidgets(nWidgets("101111110100000000010001000010000"));
fast_config(m_bFastMode); fast_config(m_bFastMode);
statusChanged(); statusChanged();
} }
@ -5352,7 +5354,7 @@ void MainWindow::on_actionWSPR_triggered()
m_bFastMode=false; m_bFastMode=false;
m_bFast9=false; m_bFast9=false;
ui->TxFreqSpinBox->setValue(ui->WSPRfreqSpinBox->value()); ui->TxFreqSpinBox->setValue(ui->WSPRfreqSpinBox->value());
displayWidgets(nWidgets("00000000000000000101000000000000")); displayWidgets(nWidgets("000000000000000001010000000000000"));
fast_config(false); fast_config(false);
statusChanged(); statusChanged();
} }
@ -5402,7 +5404,7 @@ void MainWindow::on_actionEcho_triggered()
m_bFast9=false; m_bFast9=false;
WSPR_config(true); WSPR_config(true);
ui->decodedTextLabel->setText(" UTC N Level Sig DF Width Q"); ui->decodedTextLabel->setText(" UTC N Level Sig DF Width Q");
displayWidgets(nWidgets("00000000000000000000001000000000")); displayWidgets(nWidgets("000000000000000000000010000000000"));
fast_config(false); fast_config(false);
statusChanged(); statusChanged();
} }
@ -5427,7 +5429,7 @@ void MainWindow::on_actionFreqCal_triggered()
// 18:15:47 0 1 1500 1550.349 0.100 3.5 10.2 // 18:15:47 0 1 1500 1550.349 0.100 3.5 10.2
ui->decodedTextLabel->setText(" UTC Freq CAL Offset fMeas DF Level S/N"); ui->decodedTextLabel->setText(" UTC Freq CAL Offset fMeas DF Level S/N");
ui->measure_check_box->setChecked (false); ui->measure_check_box->setChecked (false);
displayWidgets(nWidgets("00110100000000000000000000000100")); displayWidgets(nWidgets("001101000000000000000000000001000"));
statusChanged(); statusChanged();
} }

2
mainwindow.h
View File

@ -49,7 +49,7 @@
#define NUM_FT8_SYMBOLS 79 #define NUM_FT8_SYMBOLS 79
#define NUM_CW_SYMBOLS 250 #define NUM_CW_SYMBOLS 250
#define TX_SAMPLE_RATE 48000 #define TX_SAMPLE_RATE 48000
#define N_WIDGETS 32 #define N_WIDGETS 33
extern int volatile itone[NUM_ISCAT_SYMBOLS]; //Audio tones for all Tx symbols extern int volatile itone[NUM_ISCAT_SYMBOLS]; //Audio tones for all Tx symbols
extern int volatile icw[NUM_CW_SYMBOLS]; //Dits for CW ID extern int volatile icw[NUM_CW_SYMBOLS]; //Dits for CW ID