From e07ca51595fe8ca36ce35fd8db2e6fa5f545a6b7 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sun, 14 Oct 2018 14:53:45 -0400 Subject: [PATCH 1/7] Two more bug fixes for correct handling of EU VHF contest messages. --- mainwindow.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index e06532c22..40a1d0d04 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -3127,7 +3127,7 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler } } bool bEU_VHF_w2=(nrpt>=520001 and nrpt<=594000); - if(bEU_VHF_w2) m_xRcvd=message.string().left(45).trimmed().right(13); + if(bEU_VHF_w2) m_xRcvd=message.string().trimmed().right(13); if (m_auto && (m_QSOProgress==REPLYING or (!ui->tx1->isEnabled () and m_QSOProgress==REPORT)) && qAbs (ui->TxFreqSpinBox->value () - df) <= int (stop_tolerance) @@ -5234,6 +5234,9 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button if(m_nContest==EU_VHF) { m_rptSent=m_xSent.split(" ").at(0).left(2); m_rptRcvd=m_xRcvd.split(" ").at(0).left(2); + m_hisGrid=m_xRcvd.split(" ").at(1); + grid=m_hisGrid; + ui->dxGridEntry->setText(grid); } if(m_nContest==FIELD_DAY) { m_rptSent=m_xSent.split(" ").at(0); From c9c471df1fc5c5aecd5486fc947337d2cfb49a7e Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sun, 14 Oct 2018 20:54:14 -0400 Subject: [PATCH 2/7] Add a Help-menu link to open "Quick-Start Guide to WSJT-X 2.0". --- mainwindow.cpp | 6 ++++++ mainwindow.h | 1 + mainwindow.ui | 6 ++++++ 3 files changed, 13 insertions(+) diff --git a/mainwindow.cpp b/mainwindow.cpp index 40a1d0d04..269720ecb 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -2212,6 +2212,12 @@ void MainWindow::on_actionFT8_DXpedition_Mode_User_Guide_triggered() { QDesktopServices::openUrl (QUrl {"http://physics.princeton.edu/pulsar/k1jt/FT8_DXpedition_Mode.pdf"}); } + +void MainWindow::on_actionQuick_Start_Guide_v2_triggered() +{ + QDesktopServices::openUrl (QUrl {"https://physics.princeton.edu/pulsar/k1jt/Quick_Start_WSJT-X_2.0.pdf"}); +} + void MainWindow::on_actionOnline_User_Guide_triggered() //Display manual { #if defined (CMAKE_BUILD) diff --git a/mainwindow.h b/mainwindow.h index 5a35cbfaa..03bdf96e2 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -140,6 +140,7 @@ private slots: void on_stopButton_clicked(); void on_actionRelease_Notes_triggered (); void on_actionFT8_DXpedition_Mode_User_Guide_triggered(); + void on_actionQuick_Start_Guide_v2_triggered(); void on_actionOnline_User_Guide_triggered(); void on_actionLocal_User_Guide_triggered(); void on_actionWide_Waterfall_triggered(); diff --git a/mainwindow.ui b/mainwindow.ui index ec71499f0..1457a2caa 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -2697,6 +2697,7 @@ QPushButton[state="ok"] { + @@ -3341,6 +3342,11 @@ QPushButton[state="ok"] { Export Cabrillo log + + + Quick-Start Guide to WSJT-X 2.0 + + From 66ea958370a6ef8492e0497a298f566f329f92ba Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 15 Oct 2018 11:09:54 -0400 Subject: [PATCH 3/7] Fix bug that started Fox with NSlots=5, until the spinner was changed. --- mainwindow.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 269720ecb..7b817509a 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1091,7 +1091,8 @@ void MainWindow::readSettings() ui->cbFirst->setChecked(m_settings->value("CallFirst",true).toBool()); ui->comboBoxHoundSort->setCurrentIndex(m_settings->value("HoundSort",3).toInt()); ui->sbNlist->setValue(m_settings->value("FoxNlist",12).toInt()); - ui->sbNslots->setValue(m_settings->value("FoxNslots",5).toInt()); + m_Nslots=m_settings->value("FoxNslots",5).toInt(); + ui->sbNslots->setValue(m_Nslots); ui->sbMax_dB->setValue(m_settings->value("FoxMaxDB",30).toInt()); m_settings->endGroup(); @@ -3757,7 +3758,7 @@ void MainWindow::guiUpdate() //Once per second: if(nsec != m_sec0) { -// qDebug() << "OneSec:" << m_nContest << m_msgAvgWidget; +// qDebug() << "OneSec:" << m_nContest << m_Nslots; if(!m_msgAvgWidget and m_nContest>0 and m_nContest<6) on_actionFox_Log_triggered(); if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) { if(!m_bVHFwarned) vhfWarning(); From 9c2ecdd4b8d0d35e933076450597cf5926b55f98 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 15 Oct 2018 13:45:02 -0400 Subject: [PATCH 4/7] Use mode designator DG rather than RY in the Cabrillo log, per ARRL request. --- mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 7b817509a..2dd38b7a2 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -5274,7 +5274,7 @@ void MainWindow::cabLog() int nfreq=m_freqNominal/1000; if(m_freqNominal>50000000) nfreq=m_freqNominal/1000000; QString t; - t.sprintf("QSO: %5d RY ",nfreq); + t.sprintf("QSO: %5d DG ",nfreq); t=t + QDateTime::currentDateTimeUtc().toString("yyyy-MM-dd hhmm ") + m_config.my_callsign().leftJustified(13,' ') + m_xSent.leftJustified(14,' ') + m_hisCall.leftJustified(13,' ') + m_xRcvd; From 398555a20f7d6260cb2accbee462826a65d3e01d Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 16 Oct 2018 10:52:06 -0400 Subject: [PATCH 5/7] For NA VHF contest with Sh checked, Tx3 should use long format with R+grid. --- mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 2dd38b7a2..8703aa271 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -4817,7 +4817,7 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional) t=t0 + "R" + rpt; msgtype(t, ui->tx3); } - if(m_mode=="MSK144" and m_bShMsgs) { + if(m_mode=="MSK144" and m_bShMsgs and m_nContest==NONE) { t=t0 + "R" + rpt; msgtype(t, ui->tx3); m_send_RR73=false; From ac690c138a2abeea34babb51c80e6d54cdf357c2 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 16 Oct 2018 13:01:40 -0400 Subject: [PATCH 6/7] Ctrl+Shift+F11/F12 to move dial frequency down/up by 2 kHz. --- mainwindow.cpp | 42 ++++++++++++++++++++++++++++++------------ shortcuts.txt | 2 ++ 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 8703aa271..593bcdf39 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1852,21 +1852,33 @@ void MainWindow::keyPressEvent (QKeyEvent * e) on_actionOpen_next_in_directory_triggered(); return; case Qt::Key_F11: - n=11; - if(e->modifiers() & Qt::ControlModifier) n+=100; - if(e->modifiers() & Qt::ShiftModifier) { - ui->TxFreqSpinBox->setValue(ui->TxFreqSpinBox->value()-60); - } else{ - bumpFqso(n); + if((e->modifiers() & Qt::ControlModifier) and (e->modifiers() & Qt::ControlModifier)) { + m_bandEdited = true; + band_changed(m_freqNominal-2000); +// qDebug() << "Down" << m_freqNominal; + } else { + n=11; + if(e->modifiers() & Qt::ControlModifier) n+=100; + if(e->modifiers() & Qt::ShiftModifier) { + ui->TxFreqSpinBox->setValue(ui->TxFreqSpinBox->value()-60); + } else{ + bumpFqso(n); + } } return; case Qt::Key_F12: - n=12; - if(e->modifiers() & Qt::ControlModifier) n+=100; - if(e->modifiers() & Qt::ShiftModifier) { - ui->TxFreqSpinBox->setValue(ui->TxFreqSpinBox->value()+60); + if((e->modifiers() & Qt::ControlModifier) and (e->modifiers() & Qt::ControlModifier)) { + m_bandEdited = true; + band_changed(m_freqNominal+2000); +// qDebug() << "Up " << m_freqNominal; } else { - bumpFqso(n); + n=12; + if(e->modifiers() & Qt::ControlModifier) n+=100; + if(e->modifiers() & Qt::ShiftModifier) { + ui->TxFreqSpinBox->setValue(ui->TxFreqSpinBox->value()+60); + } else { + bumpFqso(n); + } } return; case Qt::Key_X: @@ -1928,7 +1940,13 @@ void MainWindow::keyPressEvent (QKeyEvent * e) return; } break; - } + case Qt::Key_PageUp: + + break; + case Qt::Key_PageDown: + band_changed(m_freqNominal-2000); + qDebug() << "Down" << m_freqNominal; + break; } QMainWindow::keyPressEvent (e); } diff --git a/shortcuts.txt b/shortcuts.txt index ee7d0a436..892f13790 100644 --- a/shortcuts.txt +++ b/shortcuts.txt @@ -14,9 +14,11 @@ F11 Move Rx frequency down 1 Hz Ctrl+F11 Move identical Rx and Tx frequencies down 1 Hz Shift+F11 Move Tx frequency down 60 Hz + Ctrl+Shift+F11 Move dial frequency down 2000 Hz F12 Move Rx frequency up 1 Hz Ctrl+F12 Move identical Rx and Tx frequencies up 1 Hz Shift+F12 Move Tx frequency up 60 Hz + Ctrl+Shift+F12 Move dial frequency up 2000 Hz Alt+1-6 Set now transmission to this number on Tab 1 Ctl+1-6 Set next transmission to this number on Tab 1 Alt+D Decode again at QSO frequency From 6ec945204f6005df7ef416a4ec5974644c79ccf0 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 16 Oct 2018 13:08:15 -0400 Subject: [PATCH 7/7] Fix two typos. --- mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 593bcdf39..f5964f7a0 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1852,7 +1852,7 @@ void MainWindow::keyPressEvent (QKeyEvent * e) on_actionOpen_next_in_directory_triggered(); return; case Qt::Key_F11: - if((e->modifiers() & Qt::ControlModifier) and (e->modifiers() & Qt::ControlModifier)) { + if((e->modifiers() & Qt::ControlModifier) and (e->modifiers() & Qt::ShiftModifier)) { m_bandEdited = true; band_changed(m_freqNominal-2000); // qDebug() << "Down" << m_freqNominal; @@ -1867,7 +1867,7 @@ void MainWindow::keyPressEvent (QKeyEvent * e) } return; case Qt::Key_F12: - if((e->modifiers() & Qt::ControlModifier) and (e->modifiers() & Qt::ControlModifier)) { + if((e->modifiers() & Qt::ControlModifier) and (e->modifiers() & Qt::ShiftModifier)) { m_bandEdited = true; band_changed(m_freqNominal+2000); // qDebug() << "Up " << m_freqNominal;