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

feat: Parse ICAO equipment code from SimBrief flightplans

Browse Source
This commit is contained in:
Lars Toenning
2023-12-31 11:06:58 +01:00
parent dbfc9dca82
commit b5cdef2f4e
2 changed files with 15 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/blackmisc/aviation/flightplan.cpp
View File

@@ -138,31 +138,6 @@ namespace BlackMisc::Aviation
} }
} }
void CFlightPlanRemarks::setIcaoEquipmentCodes(const QString &eq)
{
// https://en.wikipedia.org/wiki/Equipment_codes
const QString r = eq.toUpper().trimmed();
QStringList remarks;
if (r.isEmpty()) { return; }
if (r.contains('W'))
{
if (r.contains('G')) { remarks << "/L"; }
else if (r.contains('D') || r.contains('L') || r.contains('O')) { remarks << "/Z"; }
else if (r.contains('A')) { remarks << "/W"; }
}
else
{
if (r.contains('G')) { remarks << "/G"; }
else if (r.contains('D') || r.contains('L') || r.contains('O')) { remarks << "/I"; }
}
if (r.contains('G')) { remarks << "NAV/GPSRNAV"; }
else if (r.contains('D') || r.contains('L') || r.contains('O')) { remarks << "NAV/VORNDB"; }
m_remarks = remarks.join(" ");
this->parseFlightPlanRemarks(true);
}
QString CFlightPlanRemarks::getRemark(const QString &remarks, const QString &marker) QString CFlightPlanRemarks::getRemark(const QString &remarks, const QString &marker)
{ {
const int maxIndex = remarks.size() - 1; const int maxIndex = remarks.size() - 1;
@@ -535,15 +510,25 @@ namespace BlackMisc::Aviation
const int b = equipment.indexOf('-'); const int b = equipment.indexOf('-');
const int e = equipment.indexOf('/'); const int e = equipment.indexOf('/');
CFlightPlanRemarks r = fp.getFlightPlanRemarks();
bool remarksChanged = false;
if (e > b && e >= 0 && b >= 0 && equipment.size() > e) if (e > b && e >= 0 && b >= 0 && equipment.size() > e)
{ {
const QString icao = equipment.mid(b + 1, e - b - 1); // Do not read aircraft ICAO code as this is read/overwritten from the simulator
r.setIcaoEquipmentCodes(icao);
remarksChanged = true; const QChar wtcChar = equipment.mid(0, 1).at(0);
const CWakeTurbulenceCategory wtc(wtcChar);
const QString comNavEquipmentString = equipment.mid(b + 1, e - b - 1);
const CComNavEquipment comNavEquipment(comNavEquipmentString);
const QString ssrEquipmentString = equipment.mid(e + 1);
const CSsrEquipment ssrEquipment(ssrEquipmentString);
const CFlightPlanAircraftInfo info(fp.getAircraftInfo().getAircraftIcao(), comNavEquipment, ssrEquipment, wtc);
fp.setAircraftInfo(info);
} }
CFlightPlanRemarks r = fp.getFlightPlanRemarks();
bool remarksChanged = false;
const QString selcal = aircraft.firstChildElement("selcal").text(); const QString selcal = aircraft.firstChildElement("selcal").text();
if (selcal.length() == 4) if (selcal.length() == 4)
{ {
@@ -557,7 +542,6 @@ namespace BlackMisc::Aviation
} }
} }
// read FP
return fp; return fp;
} }

3
src/blackmisc/aviation/flightplan.h
View File

@@ -99,9 +99,6 @@ namespace BlackMisc::Aviation
//! Empty remarks? //! Empty remarks?
bool isEmpty() const { return m_remarks.isEmpty(); } bool isEmpty() const { return m_remarks.isEmpty(); }
//! Equipment codes (ICAO)
void setIcaoEquipmentCodes(const QString &eq);
//! Already parsed? //! Already parsed?
bool isParsed() const { return m_isParsed; } bool isParsed() const { return m_isParsed; }