w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 05:38:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Preparing for v2.0-rc1 candidate release.

Browse Source 
- Add file  contrib/lotw-user-activity.csv, install in data_dir().
 - Add suggested frequencies on 20 and 40m for testing FT8 v2.0 messages.
 - Add a timeout date (Nov 1 2018) beyond which -rc1 will not run.
 - Change Versions.cmake to indicate v2.0.0-rc1.
This commit is contained in:
Joe Taylor 2018-09-10 13:07:30 -04:00
parent 7c235bafa2
commit a8d708af67
5 changed files with 120905 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -1526,6 +1526,7 @@ install (FILES
install (FILES
contrib/Ephemeris/JPLEPH
contrib/lotw-user-activity.csv
DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}
#COMPONENT runtime
)

2
FrequencyList.cpp
View File

@ -67,6 +67,7 @@ namespace
{7038600, Modes::WSPR, IARURegions::ALL},
{7074000, Modes::FT8, IARURegions::ALL},
{7076000, Modes::JT65, IARURegions::ALL},
{7078000, Modes::FT8, IARURegions::ALL},
{7078000, Modes::JT9, IARURegions::ALL},
{10136000, Modes::FT8, IARURegions::ALL},
@ -77,6 +78,7 @@ namespace
{14095600, Modes::WSPR, IARURegions::ALL},
{14074000, Modes::FT8, IARURegions::ALL},
{14076000, Modes::JT65, IARURegions::ALL},
{14078000, Modes::FT8, IARURegions::ALL},
{14078000, Modes::JT9, IARURegions::ALL},
{18100000, Modes::FT8, IARURegions::ALL},

6
Versions.cmake
View File

@ -1,6 +1,6 @@
# Version number components
set (WSJTX_VERSION_MAJOR 1)
set (WSJTX_VERSION_MINOR 10)
set (WSJTX_VERSION_MAJOR 2)
set (WSJTX_VERSION_MINOR 0)
set (WSJTX_VERSION_PATCH 0)
set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions
set (WSJTX_RC 1) # release candidate number, comment out or zero for development versions
set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build

120885
contrib/lotw-user-activity.csv Normal file
View File

File diff suppressed because it is too large Load Diff

37
mainwindow.cpp
View File

@ -909,31 +909,18 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
splashTimer.setSingleShot (true);
splashTimer.start (20 * 1000);
/*
if(m_config.my_callsign()=="K1JT" or m_config.my_callsign()=="K9AN" or
m_config.my_callsign()=="G4WJS" or
m_config.my_callsign().contains("KH7Z")) {
ui->actionWSPR_LF->setEnabled(true);
} else {
QString errorMsg;
MessageBox::critical_message (this,
"Code in the WSJT-X development branch is\n"
"not currently available for on-the-air use.\n\n"
"Please use WSJT-X v1.9.1\n", errorMsg);
Q_EMIT finished ();
}
if(QCoreApplication::applicationVersion().contains("-devel") or
QCoreApplication::applicationVersion().contains("-rc")) {
QTimer::singleShot (0, this, SLOT (not_GA_warning_message ()));
}
*/
if(!ui->cbMenus->isChecked()) {
ui->cbMenus->setChecked(true);
ui->cbMenus->setChecked(false);
}
QFile f("c:/tmp/lotw-user-activity.csv");
// QFile f("c:/tmp/lotw-user-activity.csv");
QFile f{m_config.data_dir().absoluteFilePath ("lotw-user-activity.csv")};
if(f.open(QIODevice::ReadOnly | QIODevice::Text)) {
QTextStream s(&f);
QString line,call;
@ -941,7 +928,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
int i1;
QDateTime now=QDateTime::currentDateTime();
QDateTime callDateTime;
// Read and process the file of Hound callers.
// Read and process the file of LoTW-active stations
while(!s.atEnd()) {
line=s.readLine();
i1=line.indexOf(",");
@ -964,12 +951,17 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
void MainWindow::not_GA_warning_message ()
{
QDateTime now=QDateTime::currentDateTime();
QDateTime timeout=QDateTime(QDate(2018,10,1));
MessageBox::critical_message (this,
"This version of WSJT-X was built from code in the\n"
"development branch, or is a beta-level Release Candidate.\n\n"
"This version of WSJT-X is a beta-level Release Candidate.\n\n"
"On-the-air use carries an obligation to report problems\n"
"to the WSJT Development group and to upgrade to a GA\n"
"(General Availability) release when that is released.\n\n");
"(General Availability) release when it becomes available.\n\n"
"This version cannot be used after October 1, 2018\n\n");
if(now.daysTo(timeout) < 0) Q_EMIT finished();
}
void MainWindow::initialize_fonts ()
@ -3760,7 +3752,8 @@ void MainWindow::guiUpdate()
//Once per second:
if(nsec != m_sec0) {
// qDebug() << "OneSec:" << m_config.ppfx();
// qDebug() << "OneSec:";
if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) {
if(!m_bVHFwarned) vhfWarning();
} else {
@ -4296,8 +4289,6 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
m_nContest=EU_VHF;
if(m_transmitting) m_restart=true;
ui->decodedTextBrowser2->displayQSY (QString{"Enabled EU VHF Contest messages."});
// MessageBox::information_message (this, tr ("EU VHF Contest messages enabled."));
QString t0=" Tx2.0 EU VHF";
ui->labDXped->setVisible(true);
ui->labDXped->setText(t0);