Ref T129, added callsign in flight plan and made flight plan timestamp interface compliant

This commit is contained in:
Klaus Basan
2017-10-01 00:10:01 +02:00
committed by Mathew Sutcliffe
parent 5f75943bbb
commit 1daa640972
6 changed files with 120 additions and 40 deletions

View File

@@ -18,19 +18,69 @@ namespace BlackMisc
{
CFlightPlan::CFlightPlan() { }
CFlightPlan::CFlightPlan(const QString &equipmentIcao, const CAirportIcaoCode &originAirportIcao, const CAirportIcaoCode &destinationAirportIcao, const CAirportIcaoCode &alternateAirportIcao, const QDateTime &takeoffTimePlanned, const QDateTime &takeoffTimeActual, const PhysicalQuantities::CTime &enrouteTime, const PhysicalQuantities::CTime &fuelTime, const CAltitude &cruiseAltitude, const PhysicalQuantities::CSpeed &cruiseTrueAirspeed, CFlightPlan::FlightRules flightRules, const QString &route, const QString &remarks)
: m_equipmentIcao(equipmentIcao), m_originAirportIcao(originAirportIcao), m_destinationAirportIcao(destinationAirportIcao), m_alternateAirportIcao(alternateAirportIcao),
CFlightPlan::CFlightPlan(const CCallsign &callsign, const QString &equipmentIcao, const CAirportIcaoCode &originAirportIcao, const CAirportIcaoCode &destinationAirportIcao,
const CAirportIcaoCode &alternateAirportIcao, const QDateTime &takeoffTimePlanned, const QDateTime &takeoffTimeActual, const PhysicalQuantities::CTime &enrouteTime,
const PhysicalQuantities::CTime &fuelTime, const CAltitude &cruiseAltitude, const PhysicalQuantities::CSpeed &cruiseTrueAirspeed, CFlightPlan::FlightRules flightRules,
const QString &route, const QString &remarks)
: m_callsign(callsign),
m_equipmentIcao(equipmentIcao), m_originAirportIcao(originAirportIcao), m_destinationAirportIcao(destinationAirportIcao), m_alternateAirportIcao(alternateAirportIcao),
m_takeoffTimePlanned(takeoffTimePlanned), m_takeoffTimeActual(takeoffTimeActual), m_enrouteTime(enrouteTime), m_fuelTime(fuelTime),
m_cruiseAltitude(cruiseAltitude), m_cruiseTrueAirspeed(cruiseTrueAirspeed), m_flightRules(flightRules),
m_route(route.trimmed().left(MaxRouteLength).toUpper()), m_remarks(remarks.trimmed().left(MaxRemarksLength).toUpper())
{
m_callsign.setTypeHint(CCallsign::Aircraft);
m_enrouteTime.switchUnit(BlackMisc::PhysicalQuantities::CTimeUnit::hrmin());
m_fuelTime.switchUnit(BlackMisc::PhysicalQuantities::CTimeUnit::hrmin());
}
void CFlightPlan::setCallsign(const CCallsign &callsign)
{
m_callsign = callsign;
m_callsign.setTypeHint(CCallsign::Aircraft);
}
CVariant CFlightPlan::propertyByIndex(const CPropertyIndex &index) const
{
if (index.isMyself()) { return CVariant::from(*this); }
if (ITimestampBased::canHandleIndex(index)) { return ITimestampBased::propertyByIndex(index); }
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexAlternateAirportIcao: return m_alternateAirportIcao.propertyByIndex(index.copyFrontRemoved());
case IndexDestinationAirportIcao: return m_destinationAirportIcao.propertyByIndex(index.copyFrontRemoved());
case IndexOriginAirportIcao: return m_originAirportIcao.propertyByIndex(index.copyFrontRemoved());
case IndexCallsign: return this->m_callsign.propertyByIndex(index.copyFrontRemoved());
case IndexRemarks: return CVariant::from(m_remarks);
default: return CValueObject::propertyByIndex(index);
}
}
void CFlightPlan::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant)
{
if (index.isMyself()) { (*this) = variant.to<CFlightPlan>(); return; }
if (ITimestampBased::canHandleIndex(index))
{
ITimestampBased::setPropertyByIndex(index, variant);
return;
}
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexAlternateAirportIcao: m_alternateAirportIcao.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexDestinationAirportIcao: m_destinationAirportIcao.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexOriginAirportIcao: m_originAirportIcao.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexCallsign: m_callsign.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexRemarks: this->setRemarks(variant.toQString()); break;
default: CValueObject::setPropertyByIndex(index, variant); break;
}
}
QString CFlightPlan::convertToQString(bool i18n) const
{
const QString s = m_equipmentIcao
const QString s = m_callsign.toQString(i18n)
% QLatin1Char(' ') % m_equipmentIcao
% QLatin1Char(' ') % m_originAirportIcao.toQString(i18n)
% QLatin1Char(' ') % m_destinationAirportIcao.toQString(i18n)
% QLatin1Char(' ') % m_alternateAirportIcao.toQString(i18n)
@@ -56,9 +106,9 @@ namespace BlackMisc
}
}
BlackMisc::CIcon CFlightPlan::toIcon() const
CIcon CFlightPlan::toIcon() const
{
return BlackMisc::CIcon::iconByIndex(CIcons::StandardIconAppFlightPlan16);
return CIcon::iconByIndex(CIcons::StandardIconAppFlightPlan16);
}
} // namespace
} // namespace