flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T664, validate callsign in TM against aircraft/ATC stations in range and use callsign "as set" where applicable

Browse Source
This commit is contained in:
Klaus Basan
2019-05-18 20:10:35 +02:00
parent 9cd0d5554c
commit 3f76c87ce9
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/blackgui/components/textmessagecomponent.cpp
View File

@@ -615,6 +615,27 @@ namespace BlackGui
return m_usedAsOverlayWidget ? true : this->isVisibleWidget();
}
CCallsign CTextMessageComponent::getCallsignPropertyForTab(int tabIndex, bool validated) const
{
if (tabIndex < 0 || tabIndex >= ui->tw_TextMessages->count()) { return {}; }
QWidget *tab = ui->tw_TextMessages->widget(tabIndex);
if (tab && !tab->property("callsign").toString().isEmpty())
{
const CCallsign cs(tab->property("callsign").toString());
if (!validated) { return cs; }
if (!sGui && sGui->getIContextNetwork())
{
const CAtcStation atc = sGui->getIContextNetwork()->getOnlineStationForCallsign(cs);
if (atc.hasCallsign()) { return atc.getCallsign(); } // first hand callsign diretcly from network context
const CSimulatedAircraft aircraft = sGui->getIContextNetwork()->getAircraftInRangeForCallsign(cs);
if (aircraft.hasCallsign()) { return aircraft.getCallsign(); } // first hand callsign diretcly from network context
}
return cs;
}
return {};
}
void CTextMessageComponent::emitDisplayInInfoWindow(const CVariant &message, int displayDurationMs)
{
if (m_usedAsOverlayWidget) { return; }
@@ -681,7 +702,17 @@ namespace BlackGui
}
else
{
cmd.append(selectedTabText);
// selectedTabText expected to be the callsign
// with T664 we resolve against the callsigns in the context if possible
const CCallsign cs = this->getCallsignPropertyForTab(index, true);
if (cs.isEmpty())
{
cmd.append(selectedTabText);
}
else
{
cmd.append(cs.isAtcCallsign() ? cs.getStringAsSet() : cs.asString());
}
}
}
else

3
src/blackgui/components/textmessagecomponent.h
View File

@@ -235,6 +235,9 @@ namespace BlackGui
//! Visible widget hack
bool isVisibleWidgetHack() const;
//! Callsign from prpoerty of given tab
BlackMisc::Aviation::CCallsign getCallsignPropertyForTab(int tabIndex, bool validated) const;
//! Emit the display in info window signal
void emitDisplayInInfoWindow(const BlackMisc::CVariant &message, int displayDurationMs);