w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-30 13:22:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Assign WAE entities to the correct DXCC when "Include extra WAE entities" is not selected.

Browse Source
This commit is contained in:
Uwe Risse 2023-12-08 18:19:42 +01:00
parent 05931313b3
commit 6e9dc42881
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
logbook/AD1CCty.cpp
View File

@ -446,8 +446,8 @@ auto AD1CCty::lookup (QString const& call) const -> Record
if (p != m_->prefixes_.end ()) if (p != m_->prefixes_.end ())
{ {
impl::entity_by_id::iterator e = m_->lookup_entity (call, *p); impl::entity_by_id::iterator e = m_->lookup_entity (call, *p);
if ((m_->configuration_->include_WAE_entities () || !e->WAE_only_) // always lookup WAE entities, we substitute them later in displaytext.cpp if "Include extra WAE entites" is not selected
&& (!p->exact_ || call.size () == search_prefix.size ())) if (!p->exact_ || call.size () == search_prefix.size ())
{ {
return m_->fixup (*p, *e); return m_->fixup (*p, *e);
} }

11
widgets/displaytext.cpp
View File

@ -387,6 +387,17 @@ QString DisplayText::appendWorkedB4 (QString message, QString call, QString cons
countryName.replace ("European", "EU"); countryName.replace ("European", "EU");
countryName.replace ("African", "AF"); countryName.replace ("African", "AF");
// assign WAE entities to the correct DXCC when "Include extra WAE entities" is not selected
if (!(m_config->include_WAE_entities())) {
countryName.replace ("Bear Is.", "Svalbard");
countryName.replace ("Shetland Is.", "Scotland");
countryName.replace ("AF Italy", "Italy");
countryName.replace ("Sicily", "Italy");
countryName.replace ("Vienna Intl Ctr", "Austria");
countryName.replace ("AF Turkey", "Turkey");
countryName.replace ("EU Turkey", "Turkey");
}
extra += countryName; extra += countryName;
} }
} }