w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-23 20:48:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop

Browse Source
This commit is contained in:
Joe Taylor 2023-10-16 12:23:57 -04:00
commit 64f53f30ff
2 changed files with 17 additions and 7 deletions

22
models/FrequencyList.cpp
View File

@ -1335,8 +1335,10 @@ FrequencyList_v2_101::FrequencyItems FrequencyList_v2_101::from_json_file(QFile
{
throw ReadFileException{tr ("No Frequencies were found")};
}
int valid_entry_count [[maybe_unused]] = 0;
int skipped_entry_count [[maybe_unused]] = 0;
#ifdef DUMP_ENTRY_COUNTS
int valid_entry_count = 0;
int skipped_entry_count = 0;
#endif
for (auto const &item: arr)
{
QString mode_s, region_s;
@ -1359,13 +1361,21 @@ FrequencyList_v2_101::FrequencyItems FrequencyList_v2_101::from_json_file(QFile
freq.isSane())
{
list.push_back(freq);
#ifdef DUMP_ENTRY_COUNTS
valid_entry_count++;
} else
#endif
} else {
#ifdef DUMP_ENTRY_COUNTS
skipped_entry_count++;
#endif
}
}
//MessageBox::information_message(this, tr("Loaded Frequencies from %1").arg(file_name),
// tr("Entries Valid/Skipped %1").arg(QString::number(valid_entry_count) + "/" +
// QString::number(skipped_entry_count)));
#ifdef DUMP_ENTRY_COUNTS
MessageBox::information_message(this, tr("Loaded Frequencies from %1").arg(file_name),
tr("Entries Valid/Skipped %1").arg(QString::number(valid_entry_count) + "/" +
QString::number(skipped_entry_count)));
#endif
return list;
}
// write JSON format to a file

2
widgets/mainwindow.cpp
View File

@ -5539,7 +5539,7 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
QString firstcall = message.call();
if(firstcall.length()>=4 and firstcall.mid(0,3)=="CQ ") firstcall="CQ";
if(!m_bFastMode and (!m_config.enable_VHF_features() or m_mode=="FT8")) {
if(!m_bFastMode and (!m_config.enable_VHF_features() or m_mode=="FT8" or m_mode=="FT4" or m_mode=="FST4")) {
// Don't change Tx freq if in a fast mode, or VHF features enabled; also not if a
// station is calling me, unless CTRL or SHIFT is held down.
if ((Radio::is_callsign (firstcall)