w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-10-31 04:50:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.4.0' of bitbucket.org:k1jt/wsjtx into release-2.4.0

Browse Source
This commit is contained in:
Joe Taylor 2021-04-02 10:12:51 -04:00
commit 19fa7fd848
8 changed files with 74 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Audio/tools/record_time_signal.cpp
View File

@ -3,8 +3,7 @@
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
#include <memory> #include <memory>
#include <locale>
#include <locale.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QTextStream> #include <QTextStream>
@ -239,11 +238,9 @@ int main(int argc, char *argv[])
QCoreApplication app {argc, argv}; QCoreApplication app {argc, argv};
try try
{ {
::setlocale (LC_NUMERIC, "C"); // ensure number forms are in // ensure number forms are in consistent format, do this after
// consistent format, do this // instantiating QApplication so that Qt has correct l18n
// after instantiating std::locale::global (std::locale::classic ());
// QApplication so that Qt has
// correct l18n
// Override programs executable basename as application name. // Override programs executable basename as application name.
app.setApplicationName ("WSJT-X Record Time Signal"); app.setApplicationName ("WSJT-X Record Time Signal");

9
UDPExamples/MessageAggregator.cpp
View File

@ -31,7 +31,7 @@
// menu that allows each dock window to be hidden or revealed. // menu that allows each dock window to be hidden or revealed.
// //
#include <clocale> #include <locale>
#include <iostream> #include <iostream>
#include <exception> #include <exception>
@ -52,10 +52,9 @@ int main (int argc, char * argv[])
QApplication app {argc, argv}; QApplication app {argc, argv};
try try
{ {
setlocale (LC_NUMERIC, "C"); // ensure number forms are in // ensure number forms are in consistent format, do this after
// consistent format, do this after // instantiating QApplication so that GUI has correct l18n
// instantiating QApplication so std::locale::global (std::locale::classic ());
// that GUI has correct l18n
app.setApplicationName ("WSJT-X Reference UDP Message Aggregator Server"); app.setApplicationName ("WSJT-X Reference UDP Message Aggregator Server");
app.setApplicationVersion ("1.0"); app.setApplicationVersion ("1.0");

8
UDPExamples/UDPDaemon.cpp
View File

@ -17,6 +17,7 @@
#include <iostream> #include <iostream>
#include <exception> #include <exception>
#include <locale>
#include <cstdlib> #include <cstdlib>
#include <QCoreApplication> #include <QCoreApplication>
@ -263,10 +264,9 @@ int main (int argc, char * argv[])
QCoreApplication app {argc, argv}; QCoreApplication app {argc, argv};
try try
{ {
setlocale (LC_NUMERIC, "C"); // ensure number forms are in // ensure number forms are in consistent format, do this after
// consistent format, do this after // instantiating QApplication so that GUI has correct l18n
// instantiating QApplication so std::locale::global (std::locale::classic ());
// that GUI has correct l18n
app.setApplicationName ("WSJT-X UDP Message Server Daemon"); app.setApplicationName ("WSJT-X UDP Message Server Daemon");
app.setApplicationVersion ("1.0"); app.setApplicationVersion ("1.0");

8
main.cpp
View File

@ -130,12 +130,8 @@ int main(int argc, char *argv[])
QLocale locale; // get the current system locale QLocale locale; // get the current system locale
// Set C/C++ locale used for logging etc. // reset the C+ & C global locales to the classic C locale
#if defined (Q_OS_WIN) std::locale::global (std::locale::classic ());
std::locale::global (std::locale ("C"));
#else
std::locale::global (std::locale ("en_US.UTF-8"));
#endif
// Override programs executable basename as application name. // Override programs executable basename as application name.
a.setApplicationName ("WSJT-X"); a.setApplicationName ("WSJT-X");

12
translations/wsjtx_da.ts
View File

@ -2285,12 +2285,12 @@ Fejl(%2): %3</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3399"/> <location filename="../widgets/mainwindow.ui" line="3399"/>
<source>Quick-Start Guide to Q65</source> <source>Quick-Start Guide to Q65</source>
<translation type="unfinished"></translation> <translation>Quick Start Guide for Q65</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3407"/> <location filename="../widgets/mainwindow.ui" line="3407"/>
<source>Auto Clear Avg after decode</source> <source>Auto Clear Avg after decode</source>
<translation type="unfinished"></translation> <translation>Auto Slet Avg efter Dekodning</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="573"/> <location filename="../widgets/mainwindow.ui" line="573"/>
@ -2992,7 +2992,7 @@ listen. Makro listen kan også ændfres i Inderstillinger (F2).</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3383"/> <location filename="../widgets/mainwindow.ui" line="3383"/>
<source>Q65</source> <source>Q65</source>
<translation type="unfinished"></translation> <translation>Q65</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3391"/> <location filename="../widgets/mainwindow.ui" line="3391"/>
@ -4107,7 +4107,9 @@ listen. Makro listen kan også ændfres i Inderstillinger (F2).</translation>
<source>If you make fair use of any part of WSJT-X under terms of the GNU General Public License, you must display the following copyright notice prominently in your derivative work: <source>If you make fair use of any part of WSJT-X under terms of the GNU General Public License, you must display the following copyright notice prominently in your derivative work:
&quot;The algorithms, source code, look-and-feel of WSJT-X and related programs, and protocol specifications for the modes FSK441, FST4, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, Q65, MSK144 are Copyright (C) 2001-2021 by one or more of the following authors: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; and other members of the WSJT Development Group.&quot;</source> &quot;The algorithms, source code, look-and-feel of WSJT-X and related programs, and protocol specifications for the modes FSK441, FST4, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, Q65, MSK144 are Copyright (C) 2001-2021 by one or more of the following authors: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; and other members of the WSJT Development Group.&quot;</source>
<translation type="unfinished"></translation> <translation>If you make fair use of any part of WSJT-X under terms of the GNU General Public License, you must display the following copyright notice prominently in your derivative work:
&quot;The algorithms, source code, look-and-feel of WSJT-X and related programs, and protocol specifications for the modes FSK441, FST4, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, Q65, MSK144 are Copyright (C) 2001-2021 by one or more of the following authors: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; and other members of the WSJT Development Group.&quot;</translation>
</message> </message>
<message> <message>
<source>If you make fair use of any part of WSJT-X under terms of the GNU General Public License, you must display the following copyright notice prominently in your derivative work: <source>If you make fair use of any part of WSJT-X under terms of the GNU General Public License, you must display the following copyright notice prominently in your derivative work:
@ -5290,7 +5292,7 @@ Fejl(%2): %3</translation>
<message> <message>
<location filename="../widgets/widegraph.ui" line="340"/> <location filename="../widgets/widegraph.ui" line="340"/>
<source>Q65_Sync</source> <source>Q65_Sync</source>
<translation type="unfinished"></translation> <translation>Q65_Sync</translation>
</message> </message>
<message> <message>
<location filename="../widgets/widegraph.ui" line="348"/> <location filename="../widgets/widegraph.ui" line="348"/>

12
translations/wsjtx_es.ts
View File

@ -2480,12 +2480,12 @@ Error(%2): %3</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3399"/> <location filename="../widgets/mainwindow.ui" line="3399"/>
<source>Quick-Start Guide to Q65</source> <source>Quick-Start Guide to Q65</source>
<translation type="unfinished"></translation> <translation>Guía de inicio rápido de Q65</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3407"/> <location filename="../widgets/mainwindow.ui" line="3407"/>
<source>Auto Clear Avg after decode</source> <source>Auto Clear Avg after decode</source>
<translation type="unfinished"></translation> <translation>Auto Clear Avg después de decodificar</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="1588"/> <location filename="../widgets/mainwindow.ui" line="1588"/>
@ -2610,7 +2610,7 @@ Error(%2): %3</translation>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3383"/> <location filename="../widgets/mainwindow.ui" line="3383"/>
<source>Q65</source> <source>Q65</source>
<translation type="unfinished"></translation> <translation>Q65</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3391"/> <location filename="../widgets/mainwindow.ui" line="3391"/>
@ -4442,7 +4442,9 @@ Error al cargar datos de usuarios de LotW</translatorcomment>
<source>If you make fair use of any part of WSJT-X under terms of the GNU General Public License, you must display the following copyright notice prominently in your derivative work: <source>If you make fair use of any part of WSJT-X under terms of the GNU General Public License, you must display the following copyright notice prominently in your derivative work:
&quot;The algorithms, source code, look-and-feel of WSJT-X and related programs, and protocol specifications for the modes FSK441, FST4, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, Q65, MSK144 are Copyright (C) 2001-2021 by one or more of the following authors: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; and other members of the WSJT Development Group.&quot;</source> &quot;The algorithms, source code, look-and-feel of WSJT-X and related programs, and protocol specifications for the modes FSK441, FST4, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, Q65, MSK144 are Copyright (C) 2001-2021 by one or more of the following authors: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; and other members of the WSJT Development Group.&quot;</source>
<translation type="unfinished"></translation> <translation>Si hace un uso legítimo de cualquier parte del programa WSJT-X según los términos de la Licencia Pública General GNU, debe mostrar el siguiente aviso de derechos de autor en un lugar destacado en su trabajo derivado:
&quot;Los algoritmos, código fuente, apariencia de WSJT-X y programas relacionados, y especificaciones de protocolo para los modos FSK441, FST4, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, Q65, MSK144 son Copyright (C) 2001-2021 por uno o más de los siguientes autores: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; y otros miembros del Grupo de Desarrollo WSJT &quot;.</translation>
</message> </message>
<message> <message>
<source>If you make fair use of any part of WSJT-X under terms of the GNU General Public License, you must display the following copyright notice prominently in your derivative work: <source>If you make fair use of any part of WSJT-X under terms of the GNU General Public License, you must display the following copyright notice prominently in your derivative work:
@ -5698,7 +5700,7 @@ Error(%2): %3</translation>
<message> <message>
<location filename="../widgets/widegraph.ui" line="340"/> <location filename="../widgets/widegraph.ui" line="340"/>
<source>Q65_Sync</source> <source>Q65_Sync</source>
<translation type="unfinished"></translation> <translation>Q65_Sync</translation>
</message> </message>
<message> <message>
<location filename="../widgets/widegraph.ui" line="348"/> <location filename="../widgets/widegraph.ui" line="348"/>

18
widgets/displaytext.cpp
View File

@ -413,18 +413,20 @@ void DisplayText::displayDecodedText(DecodedText const& decodedText, QString con
else else
{ {
if (bCQonly) return; if (bCQonly) return;
if (myCall != "" && (decodedText.indexOf (" " + myCall + " ") >= 0 if (myCall.size ())
or decodedText.indexOf (" " + myCall + "/") >= 0 {
or decodedText.indexOf ("<" + myCall + "/") >= 0 QString regexp {"[ <]" + myCall + "[ >]"};
or decodedText.indexOf ("/" + myCall + " ") >= 0 if (Radio::is_compound_callsign (myCall))
or decodedText.indexOf ("/" + myCall + ">") >= 0 {
or decodedText.indexOf ("<" + myCall + " ") >= 0 regexp = "(?:" + regexp + "|[ <]" + Radio::base_callsign (myCall) + "[ >])";
or decodedText.indexOf ("<" + myCall + ">") >= 0 }
or decodedText.indexOf (" " + myCall + ">") >= 0)) { if ((decodedText.clean_string () + " ").contains (QRegularExpression {regexp}))
{
highlight_types types {Highlight::MyCall}; highlight_types types {Highlight::MyCall};
set_colours (m_config, &bg, &fg, types); set_colours (m_config, &bg, &fg, types);
} }
} }
}
auto message = decodedText.string(); auto message = decodedText.string();
QString dxCall; QString dxCall;
QString dxGrid; QString dxGrid;

47
widgets/mainwindow.cpp
View File

@ -1493,8 +1493,8 @@ void MainWindow::dataSink(qint64 frames)
freqcal_(&dec_data.d2[0],&k,&nkhz,&RxFreq,&ftol,&line[0],80); freqcal_(&dec_data.d2[0],&k,&nkhz,&RxFreq,&ftol,&line[0],80);
QString t=QString::fromLatin1(line); QString t=QString::fromLatin1(line);
DecodedText decodedtext {t}; DecodedText decodedtext {t};
ui->decodedTextBrowser->displayDecodedText (decodedtext,m_baseCall,m_mode,m_config.DXCC(), ui->decodedTextBrowser->displayDecodedText (decodedtext, m_config.my_callsign (), m_mode, m_config.DXCC (),
m_logBook,m_currentBand, m_config.ppfx()); m_logBook, m_currentBand, m_config.ppfx ());
if (ui->measure_check_box->isChecked ()) { if (ui->measure_check_box->isChecked ()) {
// Append results text to file "fmt.all". // Append results text to file "fmt.all".
QFile f {m_config.writeable_data_dir ().absoluteFilePath ("fmt.all")}; QFile f {m_config.writeable_data_dir ().absoluteFilePath ("fmt.all")};
@ -1748,8 +1748,8 @@ void MainWindow::fastSink(qint64 frames)
if(bmsk144 and (line[0]!=0)) { if(bmsk144 and (line[0]!=0)) {
QString message {QString::fromLatin1 (line)}; QString message {QString::fromLatin1 (line)};
DecodedText decodedtext {message.replace (QChar::LineFeed, "")}; DecodedText decodedtext {message.replace (QChar::LineFeed, "")};
ui->decodedTextBrowser->displayDecodedText (decodedtext,m_baseCall,m_mode,m_config.DXCC(), ui->decodedTextBrowser->displayDecodedText (decodedtext, m_config.my_callsign (), m_mode, m_config.DXCC(),
m_logBook,m_currentBand,m_config.ppfx()); m_logBook, m_currentBand, m_config.ppfx ());
m_bDecoded=true; m_bDecoded=true;
auto_sequence (decodedtext, ui->sbFtol->value (), std::numeric_limits<unsigned>::max ()); auto_sequence (decodedtext, ui->sbFtol->value (), std::numeric_limits<unsigned>::max ());
postDecode (true, decodedtext.string ()); postDecode (true, decodedtext.string ());
@ -3253,8 +3253,8 @@ void::MainWindow::fast_decode_done()
//Left (Band activity) window //Left (Band activity) window
DecodedText decodedtext {message.replace (QChar::LineFeed, "")}; DecodedText decodedtext {message.replace (QChar::LineFeed, "")};
if(!m_bFastDone) { if(!m_bFastDone) {
ui->decodedTextBrowser->displayDecodedText (decodedtext,m_baseCall,m_mode,m_config.DXCC(), ui->decodedTextBrowser->displayDecodedText (decodedtext, m_config.my_callsign (), m_mode, m_config.DXCC (),
m_logBook,m_currentBand,m_config.ppfx()); m_logBook, m_currentBand, m_config.ppfx ());
} }
t=message.mid(10,5).toFloat(); t=message.mid(10,5).toFloat();
@ -3460,14 +3460,14 @@ void MainWindow::readFromStdout() //readFromStdout
if(!m_bDisplayedOnce) { if(!m_bDisplayedOnce) {
// This hack sets the font. Surely there's a better way! // This hack sets the font. Surely there's a better way!
DecodedText dt{"."}; DecodedText dt{"."};
ui->decodedTextBrowser->displayDecodedText(dt,m_baseCall,m_mode,m_config.DXCC(), ui->decodedTextBrowser->displayDecodedText (dt, m_config.my_callsign (), m_mode, m_config.DXCC (),
m_logBook,m_currentBand,m_config.ppfx()); m_logBook, m_currentBand, m_config.ppfx ());
m_bDisplayedOnce=true; m_bDisplayedOnce=true;
} }
} else { } else {
DecodedText decodedtext1=decodedtext0; DecodedText decodedtext1=decodedtext0;
ui->decodedTextBrowser->displayDecodedText(decodedtext1,m_baseCall,m_mode,m_config.DXCC(), ui->decodedTextBrowser->displayDecodedText (decodedtext1, m_config.my_callsign (), m_mode, m_config.DXCC (),
m_logBook,m_currentBand,m_config.ppfx(), m_logBook, m_currentBand, m_config.ppfx (),
ui->cbCQonly->isVisible() && ui->cbCQonly->isChecked(), ui->cbCQonly->isVisible() && ui->cbCQonly->isChecked(),
haveFSpread, fSpread); haveFSpread, fSpread);
@ -3498,7 +3498,6 @@ void MainWindow::readFromStdout() //readFromStdout
bool bDisplayRight=bAvgMsg; bool bDisplayRight=bAvgMsg;
int audioFreq=decodedtext.frequencyOffset(); int audioFreq=decodedtext.frequencyOffset();
if(m_mode=="FT8" or m_mode=="FT4" or m_mode=="FST4" or m_mode=="Q65") { if(m_mode=="FT8" or m_mode=="FT4" or m_mode=="FST4" or m_mode=="Q65") {
// if(m_mode=="FT8" or m_mode=="FT4" or m_mode=="FST4") {
int ftol=10; int ftol=10;
if(m_mode=="Q65") ftol=ui->sbFtol->value(); if(m_mode=="Q65") ftol=ui->sbFtol->value();
auto const& parts = decodedtext.string().remove("<").remove(">") auto const& parts = decodedtext.string().remove("<").remove(">")
@ -3506,7 +3505,23 @@ void MainWindow::readFromStdout() //readFromStdout
if (parts.size() > 6) { if (parts.size() > 6) {
auto for_us = parts[5].contains (m_baseCall) auto for_us = parts[5].contains (m_baseCall)
|| ("DE" == parts[5] && qAbs (ui->RxFreqSpinBox->value () - audioFreq) <= ftol); || ("DE" == parts[5] && qAbs (ui->RxFreqSpinBox->value () - audioFreq) <= ftol);
if(m_baseCall==m_config.my_callsign() and m_baseCall!=parts[5]) for_us=false; if(m_baseCall == m_config.my_callsign())
{
if (m_baseCall != parts[5])
{
for_us=false;
}
}
else
{
if (m_config.my_callsign () != parts[5])
{
for_us = false; // same base call as ours but
// different prefix or suffix, rare
// but can happen with multi station
// special events
}
}
if(m_bCallingCQ && !m_bAutoReply && for_us && ui->cbFirst->isChecked() and if(m_bCallingCQ && !m_bAutoReply && for_us && ui->cbFirst->isChecked() and
SpecOp::FOX > m_config.special_op_id()) { SpecOp::FOX > m_config.special_op_id()) {
m_bDoubleClicked=true; m_bDoubleClicked=true;
@ -3527,8 +3542,8 @@ void MainWindow::readFromStdout() //readFromStdout
// This msg is within 10 hertz of our tuned frequency, or a JT4 or JT65 avg, // This msg is within 10 hertz of our tuned frequency, or a JT4 or JT65 avg,
// or contains MyCall // or contains MyCall
if(!m_bBestSPArmed or m_mode!="FT4") { if(!m_bBestSPArmed or m_mode!="FT4") {
ui->decodedTextBrowser2->displayDecodedText(decodedtext0,m_baseCall,m_mode,m_config.DXCC(), ui->decodedTextBrowser2->displayDecodedText (decodedtext0, m_config.my_callsign (), m_mode, m_config.DXCC (),
m_logBook,m_currentBand,m_config.ppfx()); m_logBook, m_currentBand, m_config.ppfx ());
} }
m_QSOText = decodedtext.string ().trimmed (); m_QSOText = decodedtext.string ().trimmed ();
} }
@ -5194,8 +5209,8 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
QString s2 = message.clean_string ().trimmed(); QString s2 = message.clean_string ().trimmed();
if (s1!=s2 and !message.isTX()) { if (s1!=s2 and !message.isTX()) {
if (!s2.contains(m_baseCall) or m_mode=="MSK144") { // Taken care of elsewhere if for_us and slow mode if (!s2.contains(m_baseCall) or m_mode=="MSK144") { // Taken care of elsewhere if for_us and slow mode
ui->decodedTextBrowser2->displayDecodedText(message, m_baseCall,m_mode,m_config.DXCC(), ui->decodedTextBrowser2->displayDecodedText (message, m_config.my_callsign (), m_mode, m_config.DXCC (),
m_logBook,m_currentBand,m_config.ppfx()); m_logBook, m_currentBand, m_config.ppfx ());
} }
m_QSOText = s2; m_QSOText = s2;
} }