Merge branch 'develop' into map65

This commit is contained in:
Joe Taylor 2023-01-09 11:55:25 -05:00
commit 66c8390c61
8 changed files with 80 additions and 26 deletions

View File

@ -81,9 +81,9 @@ set (PROJECT_BUNDLE_NAME "WSJT-X")
set (PROJECT_VENDOR "Joe Taylor, K1JT") set (PROJECT_VENDOR "Joe Taylor, K1JT")
set (PROJECT_CONTACT "Joe Taylor <k1jt@arrl.net>") set (PROJECT_CONTACT "Joe Taylor <k1jt@arrl.net>")
set (PROJECT_COPYRIGHT "Copyright (C) 2001-2023 by Joe Taylor, K1JT") set (PROJECT_COPYRIGHT "Copyright (C) 2001-2023 by Joe Taylor, K1JT")
set (PROJECT_HOMEPAGE https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html) set (PROJECT_HOMEPAGE https://wsjt.sourceforge.io/wsjtx.html)
set (PROJECT_MANUAL wsjtx-main) set (PROJECT_MANUAL wsjtx-main)
set (PROJECT_MANUAL_DIRECTORY_URL https://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/) set (PROJECT_MANUAL_DIRECTORY_URL https://wsjt.sourceforge.io/wsjtx-doc/)
set (PROJECT_SAMPLES_URL http://downloads.sourceforge.net/project/wsjt/) set (PROJECT_SAMPLES_URL http://downloads.sourceforge.net/project/wsjt/)
set (PROJECT_SAMPLES_UPLOAD_DEST frs.sourceforge.net:/home/frs/project/wsjt/) set (PROJECT_SAMPLES_UPLOAD_DEST frs.sourceforge.net:/home/frs/project/wsjt/)

26
NEWS
View File

@ -11,14 +11,36 @@
Copyright 2001 - 2023 by Joe Taylor, K1JT, and the WSJT Development Team Copyright 2001 - 2023 by Joe Taylor, K1JT, and the WSJT Development Team
Release: WSJT-X 2.6.1
January 16, 2023
-------------------------
WSJT-X 2.6.1 is mostly a bug fix release for Q65. It has the following
changes since release 2.6.0:
- Fix a flaw in Q65 mode that prevented proper display of the T/R
period spinner.
- Correct the reference to "ARRL International Digital Contest" in the
Release Notes.
- Make the initialization of the decoded text font more robust.
- Better initialization when starting the program in FT8 Hound mode.
- Fix a compiler warning on macOS.
Release: WSJT-X 2.6.0 Release: WSJT-X 2.6.0
January 2, 2023 January 6, 2023
------------------------- -------------------------
WSJT-X 2.6.0 is a General Availability (GA) release, the first since WSJT-X 2.6.0 is a General Availability (GA) release, the first since
version 2.5.4. Its major enhancements include the following: version 2.5.4. Its major enhancements include the following:
- Support for the ARRL International DX Contest - Mode selection buttons on main window for FT4, FT8, JT65, MSK144,
Q65, and FT8's Hound mode
- Support for the ARRL International Digital Contest
- Performance enhancements for the FT8 and Q65 modes - Performance enhancements for the FT8 and Q65 modes
- New features for EME Echo mode, including calibrated SNR reports - New features for EME Echo mode, including calibrated SNR reports
- Several new convenience features for Fox operators - Several new convenience features for Fox operators

6
README
View File

@ -11,9 +11,9 @@
Copyright (C) 2001 - 2021 by Joe Taylor, K1JT. Copyright (C) 2001 - 2023 by Joe Taylor, K1JT.
WSJT-X Version 2.5 offers eleven different protocols or modes: FT4, WSJT-X Version 2.6.1 offers eleven different protocols or modes: FT4,
FT8, JT4, JT9, JT65, Q65, FST4, MSK144, WSPR, FST4W, and Echo. The FT8, JT4, JT9, JT65, Q65, FST4, MSK144, WSPR, FST4W, and Echo. The
first seven are designed for making reliable QSOs under weak-signal first seven are designed for making reliable QSOs under weak-signal
conditions. They use nearly identical message structure and source conditions. They use nearly identical message structure and source
@ -99,7 +99,7 @@ https://wsjtx.groups.io/g/main email reflector.
Project web site: Project web site:
https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html https://wsjt.sourceforge.io/wsjtx.html
Project mailing list (shared with other applications from the same Project mailing list (shared with other applications from the same
team): team):

View File

@ -11,14 +11,38 @@
Copyright 2001 - 2023 by Joe Taylor, K1JT, and the WSJT Development Team Copyright 2001 - 2023 by Joe Taylor, K1JT, and the WSJT Development Team
Release: WSJT-X 2.6.1
January 16, 2023
-------------------------
WSJT-X 2.6.1 is mostly a bug fix release for Q65. It has the following
changes since release 2.6.0:
- Fix a flaw in Q65 mode that prevented proper display of the T/R
period spinner.
- Make the initialization of the decoded text font more robust.
- Better initialization when starting the program in FT8 Hound mode.
- Fix a bug causing program crash with more than 100 decodes in a
single FT8 sequence.
- Fix a compiler warning on macOS.
- Correct the reference to "ARRL International Digital Contest" in the
Release Notes.
Release: WSJT-X 2.6.0 Release: WSJT-X 2.6.0
January 2, 2023 January 6, 2023
------------------------- -------------------------
WSJT-X 2.6.0 is a General Availability (GA) release, the first since WSJT-X 2.6.0 is a General Availability (GA) release, the first since
version 2.5.4. Its major enhancements include the following: version 2.5.4. Its major enhancements include the following:
- Support for the ARRL International DX Contest - Mode selection buttons on main window for FT4, FT8, JT65, MSK144,
Q65, and FT8's Hound mode
- Support for the ARRL International Digital Contest
- Performance enhancements for the FT8 and Q65 modes - Performance enhancements for the FT8 and Q65 modes
- New features for EME Echo mode, including calibrated SNR reports - New features for EME Echo mode, including calibrated SNR reports
- Several new convenience features for Fox operators - Several new convenience features for Fox operators

View File

@ -54,7 +54,7 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes.
:raspbian: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx_{VERSION}_armhf.deb[wsjtx_{VERSION}_armhf.deb] :raspbian: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx_{VERSION}_armhf.deb[wsjtx_{VERSION}_armhf.deb]
:raspbian64: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx_{VERSION}_arm64.deb[wsjtx_{VERSION}_arm64.deb] :raspbian64: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx_{VERSION}_arm64.deb[wsjtx_{VERSION}_arm64.deb]
:debian: https://www.debian.org/[Debian] :debian: https://www.debian.org/[Debian]
:dev_guide: https://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/wsjt-dev-guide.html[Dev-Guide] :dev_guide: https://wsjt.sourceforge.io/wsjtx-doc/wsjt-dev-guide.html[Dev-Guide]
:devsvn: https://sourceforge.net/p/wsjt/wsjt/HEAD/tree/[Devel-SVN] :devsvn: https://sourceforge.net/p/wsjt/wsjt/HEAD/tree/[Devel-SVN]
:devrepo: https://sourceforge.net/p/wsjt/wsjtx/ci/master/tree/[SourceForge] :devrepo: https://sourceforge.net/p/wsjt/wsjtx/ci/master/tree/[SourceForge]
:dimension4: http://www.thinkman.com/dimension4/[Thinking Man Software] :dimension4: http://www.thinkman.com/dimension4/[Thinking Man Software]
@ -67,11 +67,11 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes.
:fmt_arrl: https://www.arrl.org/frequency-measuring-test[ARRL FMT Info] :fmt_arrl: https://www.arrl.org/frequency-measuring-test[ARRL FMT Info]
:fmt_group: https://groups.yahoo.com/neo/groups/FMT-nuts/info[FMT Group] :fmt_group: https://groups.yahoo.com/neo/groups/FMT-nuts/info[FMT Group]
:fmt_k5cm: http://www.k5cm.com/[FMT Event Info] :fmt_k5cm: http://www.k5cm.com/[FMT Event Info]
:fmt_wspr: https://www.physics.princeton.edu/pulsar/K1JT/FMT_User.pdf[Accurate Frequency Measurements with your WSPR Setup] :fmt_wspr: https://wsjt.sourceforge.io/FMT_User.pdf[Accurate Frequency Measurements with your WSPR Setup]
:ft4_protocol: https://physics.princeton.edu/pulsar/k1jt/FT4_Protocol.pdf[The FT4 Protocol for Digital Contesting] :ft4_protocol: https://wsjt.sourceforge.io/FT4_Protocol.pdf[The FT4 Protocol for Digital Contesting]
:ft4_ft8_protocols: https://physics.princeton.edu/pulsar/k1jt/FT4_FT8_QEX.pdf[The FT4 and FT8 Communication Protocols] :ft4_ft8_protocols: https://wsjt.sourceforge.io/FT4_FT8_QEX.pdf[The FT4 and FT8 Communication Protocols]
:ft8_tips: https://www.g4ifb.com/FT8_Hinson_tips_for_HF_DXers.pdf[FT8 Operating Guide] :ft8_tips: https://www.g4ifb.com/FT8_Hinson_tips_for_HF_DXers.pdf[FT8 Operating Guide]
:ft8_DXped: https://physics.princeton.edu/pulsar/k1jt/FT8_DXpedition_Mode.pdf[FT8 DXpedition Mode] :ft8_DXped: https://wsjt.sourceforge.io/FT8_DXpedition_Mode.pdf[FT8 DXpedition Mode]
:gnu_gpl: https://www.gnu.org/licenses/gpl-3.0.txt[GNU General Public License] :gnu_gpl: https://www.gnu.org/licenses/gpl-3.0.txt[GNU General Public License]
:homepage: https://wsjt.sourceforge.io/index.html[WSJT Home Page] :homepage: https://wsjt.sourceforge.io/index.html[WSJT Home Page]
:hrd: http://www.hrdsoftwarellc.com/[Ham Radio Deluxe] :hrd: http://www.hrdsoftwarellc.com/[Ham Radio Deluxe]
@ -81,7 +81,7 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes.
:launchpadki7mt: https://launchpad.net/~ki7mt[KI7MT PPA's] :launchpadki7mt: https://launchpad.net/~ki7mt[KI7MT PPA's]
:log4om: https://www.log4om.com[Log4OM] :log4om: https://www.log4om.com[Log4OM]
:lunarEchoes: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/LunarEchoes_QEX.pdf[QEX] :lunarEchoes: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/LunarEchoes_QEX.pdf[QEX]
:msk144: https://physics.princeton.edu/pulsar/k1jt/MSK144_Protocol_QEX.pdf[QEX] :msk144: https://wsjt.sourceforge.io/MSK144_Protocol_QEX.pdf[QEX]
:msvcpp_redist: https://www.microsoft.com/en-ph/download/details.aspx?id=40784[Microsoft VC++ 2013 Redistributable] :msvcpp_redist: https://www.microsoft.com/en-ph/download/details.aspx?id=40784[Microsoft VC++ 2013 Redistributable]
:msys_url: https://sourceforge.net/projects/mingwbuilds/files/external-binary-packages/[MSYS Download] :msys_url: https://sourceforge.net/projects/mingwbuilds/files/external-binary-packages/[MSYS Download]
:n1mm_logger: https://n1mm.hamdocs.com/tiki-index.php[N1MM Logger+] :n1mm_logger: https://n1mm.hamdocs.com/tiki-index.php[N1MM Logger+]
@ -100,7 +100,7 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes.
:wsjtx_group: https://groups.io/g/WSJTX[WSJTX Group] :wsjtx_group: https://groups.io/g/WSJTX[WSJTX Group]
:wsjtx_group2: https://groups.io/g/WSJTX[join the group] :wsjtx_group2: https://groups.io/g/WSJTX[join the group]
:wsjtx: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx.html[WSJT-X] :wsjtx: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx.html[WSJT-X]
:wspr0_guide: https://www.physics.princeton.edu/pulsar/K1JT/WSPR0_Instructions.TXT[WSPR0 Guide] :wspr0_guide: https://wsjt.sourceforge.io/WSPR0_Instructions.TXT[WSPR0 Guide]
:wspr: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wspr.html[WSPR Home Page] :wspr: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wspr.html[WSPR Home Page]
:wsprnet: https://wsprnet.org/drupal/[WSPRnet] :wsprnet: https://wsprnet.org/drupal/[WSPRnet]
:wsprnet_activity: https://wsprnet.org/drupal/wsprnet/activity[WSPRnet Activity page] :wsprnet_activity: https://wsprnet.org/drupal/wsprnet/activity[WSPRnet Activity page]

View File

@ -70,7 +70,7 @@ and slope of a straight line to the whole sequence of calibration
measurements, as shown for these measurements in the graph plotted measurements, as shown for these measurements in the graph plotted
below. Software tools for completing this task are included with the below. Software tools for completing this task are included with the
_WSJT-X_ installation, and detailed instructions for their use are _WSJT-X_ installation, and detailed instructions for their use are
available at https://physics.princeton.edu/pulsar/k1jt/FMT_User.pdf. available at https://wsjt.sourceforge.io/FMT_User.pdf.
Using these tools and no specialized hardware beyond your Using these tools and no specialized hardware beyond your
CAT-interfaced radio, you can calibrate the radio to better than 1 Hz CAT-interfaced radio, you can calibrate the radio to better than 1 Hz

View File

@ -2545,7 +2545,7 @@ Yellow when too low</source>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="1377"/> <location filename="../widgets/mainwindow.ui" line="1377"/>
<source></source> <source></source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="1384"/> <location filename="../widgets/mainwindow.ui" line="1384"/>
@ -4050,7 +4050,7 @@ list. The list can be maintained in Settings (F2).</source>
&lt;/tr&gt; &lt;/tr&gt;
&lt;/table&gt;</source> &lt;/table&gt;</source>
<extracomment>Mouse commands help window contents</extracomment> <extracomment>Mouse commands help window contents</extracomment>
<translation>&lt;table cellpadding=5&gt; <translation type="unfinished">&lt;table cellpadding=5&gt;
&lt;tr&gt; &lt;tr&gt;
&lt;th align=&quot;right&quot;&gt;Клик на&lt;/th&gt; &lt;th align=&quot;right&quot;&gt;Клик на&lt;/th&gt;
&lt;th align=&quot;left&quot;&gt;Действие&lt;/th&gt; &lt;th align=&quot;left&quot;&gt;Действие&lt;/th&gt;
@ -4068,9 +4068,9 @@ list. The list can be maintained in Settings (F2).</source>
&lt;td&gt;&lt;b&gt;Двойной-клик&lt;/b&gt; копирует второй позывной в окно Позывной DX l,&lt;br/&gt; &lt;td&gt;&lt;b&gt;Двойной-клик&lt;/b&gt; копирует второй позывной в окно Позывной DX l,&lt;br/&gt;
локатор в QTH локатор меняет Rx и Tx частоты к&lt;br/&gt; локатор в QTH локатор меняет Rx и Tx частоты к&lt;br/&gt;
частоте декодированного сигнала ,формирует стандартные сообщения.&lt;br/&gt; частоте декодированного сигнала ,формирует стандартные сообщения.&lt;br/&gt;
......Если установлен флажок &lt;b&gt;Hold Tx Freq&lt;/b&gt; или первый позывной в сообщении&lt;br/&gt; Если установлен флажок &lt;b&gt;Hold Tx Freq&lt;/b&gt; или первый позывной в сообщении&lt;br/&gt;
является вашим собственным вызовом, частота Tx не изменяется.&lt;br/&gt; является вашим собственным вызовом, частота Tx не изменяется.&lt;br/&gt;
......&lt;b&gt;Ctrl&lt;/b&gt; удерживается.&lt;br/&gt; &lt;b&gt;Ctrl&lt;/b&gt; удерживается.&lt;br/&gt;
&lt;/td&gt; &lt;/td&gt;
&lt;/tr&gt; &lt;/tr&gt;
&lt;tr&gt; &lt;tr&gt;

View File

@ -686,9 +686,9 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
connect (ui->decodedTextBrowser2, &DisplayText::erased, this, &MainWindow::rx_frequency_activity_cleared); connect (ui->decodedTextBrowser2, &DisplayText::erased, this, &MainWindow::rx_frequency_activity_cleared);
// initialize decoded text font and hook up font change signals // initialize decoded text font and hook up font change signals
// defer initialization until after construction otherwise menu // defer initialization until after construction otherwise menu fonts do not get set
// fonts do not get set // with 50 ms delay we are on the save side
QTimer::singleShot (0, this, SLOT (initialize_fonts ())); QTimer::singleShot (50, this, SLOT (initialize_fonts ()));
connect (&m_config, &Configuration::text_font_changed, [this] (QFont const& font) { connect (&m_config, &Configuration::text_font_changed, [this] (QFont const& font) {
set_application_font (font); set_application_font (font);
}); });
@ -827,7 +827,9 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
config_label.hide (); config_label.hide ();
} }
statusUpdate (); statusUpdate ();
#if defined(Q_OS_WIN)
QTimer::singleShot (250, [=] {setRig (m_lastMonitoredFrequency);}); // This is needed for Hamradio Deluxe QTimer::singleShot (250, [=] {setRig (m_lastMonitoredFrequency);}); // This is needed for Hamradio Deluxe
#endif
}); });
m_multi_settings->create_menu_actions (this, ui->menuConfig); m_multi_settings->create_menu_actions (this, ui->menuConfig);
m_configurations_button = m_rigErrorMessageBox.addButton (tr ("Configurations...") m_configurations_button = m_rigErrorMessageBox.addButton (tr ("Configurations...")
@ -1060,6 +1062,12 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
} }
m_specOp=m_config.special_op_id(); m_specOp=m_config.special_op_id();
// Starting in FT8 Hound mode needs this initialization
if (m_specOp==SpecOp::HOUND) {
on_ft8Button_clicked();
ui->houndButton->click();
}
ui->labDXped->setVisible(SpecOp::NONE != m_specOp); ui->labDXped->setVisible(SpecOp::NONE != m_specOp);
ui->labDXped->setStyleSheet("QLabel {background-color: red; color: white;}"); ui->labDXped->setStyleSheet("QLabel {background-color: red; color: white;}");
ui->pbBestSP->setVisible(m_mode=="FT4"); ui->pbBestSP->setVisible(m_mode=="FT4");
@ -4875,9 +4883,9 @@ void MainWindow::guiUpdate()
if(m_transmitting) { if(m_transmitting) {
char s[42]; char s[42];
if(SpecOp::FOX==m_specOp and ui->tabWidget->currentIndex()==1) { if(SpecOp::FOX==m_specOp and ui->tabWidget->currentIndex()==1) {
sprintf(s,"Tx: %d Slots",foxcom_.nslots); snprintf(s,sizeof(s),"Tx: %d Slots",foxcom_.nslots);
} else { } else {
sprintf(s,"Tx: %s",msgsent); snprintf(s,sizeof(s),"Tx: %s",msgsent);
} }
m_nsendingsh=0; m_nsendingsh=0;
if(s[4]==64) m_nsendingsh=1; if(s[4]==64) m_nsendingsh=1;