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

Ref T353, remove "." from FP route

Browse Source
This commit is contained in:
Klaus Basan
2018-09-14 16:57:55 +02:00
parent 6c9804a1df
commit 99313bd272
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/blackcore/vatsim/networkvatlib.cpp
View File

@@ -301,6 +301,14 @@ namespace BlackCore
} }
} }
QByteArray CNetworkVatlib::toFSDnoColon(const QString &qstr) const
{
if (!qstr.contains(':')) { return toFSD(qstr); }
BLACK_VERIFY_X(false, Q_FUNC_INFO, "Illegal char :");
QString copy(qstr);
return toFSD(copy.remove(':'));
}
QByteArray CNetworkVatlib::toFSD(const QString &qstr) const QByteArray CNetworkVatlib::toFSD(const QString &qstr) const
{ {
Q_ASSERT_X(m_fsdTextCodec, Q_FUNC_INFO, "Missing codec"); Q_ASSERT_X(m_fsdTextCodec, Q_FUNC_INFO, "Missing codec");
@@ -625,20 +633,24 @@ namespace BlackCore
Q_ASSERT_X(isConnected(), Q_FUNC_INFO, "Can't send to server when disconnected"); Q_ASSERT_X(isConnected(), Q_FUNC_INFO, "Can't send to server when disconnected");
VatFlightPlan vatlibFP; VatFlightPlan vatlibFP;
const QString route = QString(flightPlan.getRoute()).replace(" ", ".");
const QString remarks = QString(flightPlan.getRemarks()).replace(":", ";").trimmed(); // Removed with T353 although it is standard
// const QString route = QString(flightPlan.getRoute()).replace(" ", ".");
const QString route = flightPlan.getRoute();
const QString remarks = QString(flightPlan.getRemarks());
const QString alt = flightPlan.getCruiseAltitude().asFpAltitudeSimpleVatsimString(); const QString alt = flightPlan.getCruiseAltitude().asFpAltitudeSimpleVatsimString();
//! \fixme that would be the official string, can this be used //! \fixme that would be the official string, can this be used?
// const QString alt = flightPlan.getCruiseAltitude().asFpAltitudeString(); // const QString alt = flightPlan.getCruiseAltitude().asFpAltitudeString();
QByteArray acTypeTemp, altAptTemp, cruiseAltTemp, depAptTemp, destAptTemp, routeTemp, remarksTemp; QByteArray acTypeTemp, altAptTemp, cruiseAltTemp, depAptTemp, destAptTemp, routeTemp, remarksTemp;
vatlibFP.aircraftType = acTypeTemp = toFSD(flightPlan.getCombinedPrefixIcaoSuffix()); vatlibFP.aircraftType = acTypeTemp = toFSDnoColon(flightPlan.getCombinedPrefixIcaoSuffix());
vatlibFP.alternateAirport = altAptTemp = toFSD(flightPlan.getAlternateAirportIcao().asString()); vatlibFP.alternateAirport = altAptTemp = toFSDnoColon(flightPlan.getAlternateAirportIcao().asString());
vatlibFP.cruiseAltitude = cruiseAltTemp = toFSD(alt); vatlibFP.cruiseAltitude = cruiseAltTemp = toFSDnoColon(alt);
vatlibFP.departAirport = depAptTemp = toFSD(flightPlan.getOriginAirportIcao().asString()); vatlibFP.departAirport = depAptTemp = toFSDnoColon(flightPlan.getOriginAirportIcao().asString());
vatlibFP.departTimeActual = flightPlan.getTakeoffTimeActual().toUTC().toString("hhmm").toInt(); vatlibFP.departTimeActual = flightPlan.getTakeoffTimeActual().toUTC().toString("hhmm").toInt();
vatlibFP.departTime = flightPlan.getTakeoffTimePlanned().toUTC().toString("hhmm").toInt(); vatlibFP.departTime = flightPlan.getTakeoffTimePlanned().toUTC().toString("hhmm").toInt();
vatlibFP.destAirport = destAptTemp = toFSD(flightPlan.getDestinationAirportIcao().asString()); vatlibFP.destAirport = destAptTemp = toFSDnoColon(flightPlan.getDestinationAirportIcao().asString());
QList<int> timeParts = flightPlan.getEnrouteTime().getHrsMinSecParts(); QList<int> timeParts = flightPlan.getEnrouteTime().getHrsMinSecParts();
vatlibFP.enrouteHrs = timeParts[CTime::Hours]; vatlibFP.enrouteHrs = timeParts[CTime::Hours];
@@ -647,8 +659,8 @@ namespace BlackCore
timeParts = flightPlan.getFuelTime().getHrsMinSecParts(); timeParts = flightPlan.getFuelTime().getHrsMinSecParts();
vatlibFP.fuelHrs = timeParts[CTime::Hours]; vatlibFP.fuelHrs = timeParts[CTime::Hours];
vatlibFP.fuelMins = timeParts[CTime::Minutes]; vatlibFP.fuelMins = timeParts[CTime::Minutes];
vatlibFP.remarks = remarksTemp = toFSD(remarks); vatlibFP.remarks = remarksTemp = toFSDnoColon(remarks);
vatlibFP.route = routeTemp = toFSD(route); vatlibFP.route = routeTemp = toFSDnoColon(route);
vatlibFP.trueCruisingSpeed = flightPlan.getCruiseTrueAirspeed().valueInteger(CSpeedUnit::kts()); vatlibFP.trueCruisingSpeed = flightPlan.getCruiseTrueAirspeed().valueInteger(CSpeedUnit::kts());
switch (flightPlan.getFlightRules()) switch (flightPlan.getFlightRules())
{ {

1
src/blackcore/vatsim/networkvatlib.h
View File

@@ -171,6 +171,7 @@ namespace BlackCore
static void onRawFsdMessage(VatFsdClient *, const char *message, void *cbvar); static void onRawFsdMessage(VatFsdClient *, const char *message, void *cbvar);
//! @} //! @}
QByteArray toFSDnoColon(const QString &qstr) const;
QByteArray toFSD(const QString &qstr) const; QByteArray toFSD(const QString &qstr) const;
QByteArray toFSD(const BlackMisc::Aviation::CCallsign &callsign) const; QByteArray toFSD(const BlackMisc::Aviation::CCallsign &callsign) const;
std::function<const char **()> toFSD(const QStringList &qstrList) const; std::function<const char **()> toFSD(const QStringList &qstrList) const;