flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-21 04:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do NOT override METAR if user "manually entered some arbitrary callsign"

Browse Source 
See https://discordapp.com/channels/539048679160676382/539486309882789888/621787641976717323
This commit is contained in:
Klaus Basan
2019-09-12 23:30:23 +02:00
parent 29258719a4
commit ad2cc0fded
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackgui/components/atcstationcomponent.cpp
View File

@@ -249,9 +249,17 @@ namespace BlackGui
else if (!m_selectedCallsign.isEmpty() && onlineStations.containsCallsign(m_selectedCallsign)) else if (!m_selectedCallsign.isEmpty() && onlineStations.containsCallsign(m_selectedCallsign))
{ {
const CAtcStation lastSelected = onlineStations.findFirstByCallsign(m_selectedCallsign); const CAtcStation lastSelected = onlineStations.findFirstByCallsign(m_selectedCallsign);
if (lastSelected.hasCallsign())
{
// avoid override of manually entered METAR callsigns
const CCallsign currentCs(ui->le_AtcStationsOnlineMetar->text());
if (currentCs.isEmpty() || currentCs == lastSelected.getCallsign())
{
this->triggerOnlineAtcStationSelected(lastSelected); this->triggerOnlineAtcStationSelected(lastSelected);
} }
} }
} // stations
}
} }
else else
{ {
@@ -474,6 +482,7 @@ namespace BlackGui
(station.hasAtis() ? u"\n\n" % station.getAtis().getMessage() : QStringLiteral("")) % (station.hasAtis() ? u"\n\n" % station.getAtis().getMessage() : QStringLiteral("")) %
(station.hasMetar() ? u"\n\n" % station.getMetar().getMessage() : QStringLiteral("")); (station.hasMetar() ? u"\n\n" % station.getMetar().getMessage() : QStringLiteral(""));
ui->te_AtcStationsOnlineInfo->setText(infoMessage); ui->te_AtcStationsOnlineInfo->setText(infoMessage);
ui->le_AtcStationsOnlineMetar->setText(station.getCallsign().asString());
m_selectedCallsign = station.getCallsign(); m_selectedCallsign = station.getCallsign();
} }

2
src/blackgui/components/atcstationcomponent.ui
View File

@@ -229,7 +229,7 @@
<string extracomment="METAR: Airport ICAO code">METAR: Airport ICAO code</string> <string extracomment="METAR: Airport ICAO code">METAR: Airport ICAO code</string>
</property> </property>
<property name="maxLength"> <property name="maxLength">
<number>5</number> <number>10</number>
</property> </property>
<property name="placeholderText"> <property name="placeholderText">
<string>e.g. KLAX</string> <string>e.g. KLAX</string>