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

Formatting (#879)

Browse Source
This commit is contained in:
Klaus Basan
2017-02-12 22:28:55 +01:00
committed by Mathew Sutcliffe
parent 20921b79b8
commit f71cb04cd2
13 changed files with 55 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackmisc/aviation/atcstation.cpp
View File

@@ -185,8 +185,8 @@ namespace BlackMisc
{
// we already have some booking dates, we will verify those now
// and will set the most appropriate booking dates
CTime timeDiffBooking(bookedStation.bookedWhen());
CTime timeDiffOnline(this->bookedWhen()); // diff to now
const CTime timeDiffBooking(bookedStation.bookedWhen());
const CTime timeDiffOnline(this->bookedWhen()); // diff to now
if (timeDiffBooking.isNegativeWithEpsilonConsidered() && timeDiffOnline.isNegativeWithEpsilonConsidered())
{
// both in past

2
src/blackmisc/aviation/callsignset.cpp
View File

@@ -20,7 +20,6 @@ namespace BlackMisc
{
namespace Aviation
{
CCallsignSet::CCallsignSet() { }
CCallsignSet::CCallsignSet(const CCollection<CCallsign> &other) :
@@ -37,6 +36,5 @@ namespace BlackMisc
qDBusRegisterMetaType<CCallsignSet>();
registerMetaValueType<CCallsignSet>();
}
} // namespace
} // namespace

1
src/blackmisc/aviation/callsignset.h
View File

@@ -41,7 +41,6 @@ namespace BlackMisc
//! Register metadata
static void registerMetadata();
};
} //namespace
} // namespace

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

@@ -10,36 +10,52 @@
#include "blackmisc/aviation/flightplan.h"
#include "blackmisc/iconlist.h"
#include "blackmisc/icons.h"
#include <QStringBuilder>
namespace BlackMisc
{
namespace Aviation
{
CFlightPlan::CFlightPlan() { }
CFlightPlan::CFlightPlan(const QString &equipmentIcao, const CAirportIcaoCode &originAirportIcao, const CAirportIcaoCode &destinationAirportIcao, const CAirportIcaoCode &alternateAirportIcao, QDateTime takeoffTimePlanned, 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),
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_enrouteTime.switchUnit(BlackMisc::PhysicalQuantities::CTimeUnit::hrmin());
m_fuelTime.switchUnit(BlackMisc::PhysicalQuantities::CTimeUnit::hrmin());
}
QString CFlightPlan::convertToQString(bool i18n) const
{
QString s;
s.append(m_equipmentIcao);
s.append(" ").append(m_originAirportIcao.toQString(i18n));
s.append(" ").append(m_destinationAirportIcao.toQString(i18n));
s.append(" ").append(m_alternateAirportIcao.toQString(i18n));
s.append(" ").append(m_takeoffTimePlanned.toString("ddhhmm"));
s.append(" ").append(m_takeoffTimeActual.toString("ddhhmm"));
s.append(" ").append(m_enrouteTime.toQString(i18n));
s.append(" ").append(m_fuelTime.toQString(i18n));
s.append(" ").append(m_cruiseAltitude.toQString(i18n));
s.append(" ").append(m_cruiseTrueAirspeed.toQString(i18n));
switch (m_flightRules)
{
case VFR: s.append(" VFR"); break;
case IFR: s.append(" IFR"); break;
case SVFR: s.append(" SVFR"); break;
default: s.append(" ???"); break;
}
s.append(" ").append(m_route);
s.append(" / ").append(m_remarks);
const QString s = m_equipmentIcao
% QLatin1Char(' ') % m_originAirportIcao.toQString(i18n)
% QLatin1Char(' ') % m_destinationAirportIcao.toQString(i18n)
% QLatin1Char(' ') % m_alternateAirportIcao.toQString(i18n)
% QLatin1Char(' ') % m_takeoffTimePlanned.toString("ddhhmm")
% QLatin1Char(' ') % m_takeoffTimeActual.toString("ddhhmm")
% QLatin1Char(' ') % m_enrouteTime.toQString(i18n)
% QLatin1Char(' ') % m_fuelTime.toQString(i18n)
% QLatin1Char(' ') % m_cruiseAltitude.toQString(i18n)
% QLatin1Char(' ') % m_cruiseTrueAirspeed.toQString(i18n)
% QLatin1Char(' ') % m_route
% QLatin1Char(' ') % m_remarks;
return s;
}
const QString CFlightPlan::flightruleToString(CFlightPlan::FlightRules rule)
{
switch (rule)
{
case VFR: return QLatin1Literal("VFR");
case IFR: return QLatin1Literal("IFR");
case SVFR: return QLatin1Literal("SVFR");
default: return QLatin1Literal("???");
}
}
BlackMisc::CIcon CFlightPlan::toIcon() const
{
return BlackMisc::CIcon::iconByIndex(CIcons::StandardIconAppFlightPlan16);

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

@@ -49,20 +49,12 @@ namespace BlackMisc
static constexpr int MaxRouteLength = 150; //!< Max route length
//! Default constructor
CFlightPlan() = default;
CFlightPlan();
//! Constructor
CFlightPlan(const QString &equipmentIcao, const CAirportIcaoCode &originAirportIcao, const CAirportIcaoCode &destinationAirportIcao, const CAirportIcaoCode &alternateAirportIcao,
QDateTime takeoffTimePlanned, QDateTime takeoffTimeActual, const PhysicalQuantities::CTime &enrouteTime, const PhysicalQuantities::CTime &fuelTime,
const CAltitude &cruiseAltitude, const PhysicalQuantities::CSpeed &cruiseTrueAirspeed, FlightRules flightRules, const QString &route, const QString &remarks)
: 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_enrouteTime.switchUnit(BlackMisc::PhysicalQuantities::CTimeUnit::hrmin());
m_fuelTime.switchUnit(BlackMisc::PhysicalQuantities::CTimeUnit::hrmin());
}
const CAltitude &cruiseAltitude, const PhysicalQuantities::CSpeed &cruiseTrueAirspeed, FlightRules flightRules, const QString &route, const QString &remarks);
//! Set ICAO aircraft equipment code string (e.g. "T/A320/F")
void setEquipmentIcao(const QString &equipmentIcao) { m_equipmentIcao = equipmentIcao; }
@@ -178,7 +170,7 @@ namespace BlackMisc
//! Flight plan already sent
bool wasSentOrLoaded() const { return m_lastSentOrLoaded.isValid() && !m_lastSentOrLoaded.isNull(); }
//! \brief Received before n ms
//! Received before n ms
qint64 timeDiffSentOrLoadedMs() const
{
return this->m_lastSentOrLoaded.msecsTo(QDateTime::currentDateTimeUtc());
@@ -193,8 +185,11 @@ namespace BlackMisc
//! \copydoc BlackMisc::Mixin::String::toQString()
QString convertToQString(bool i18n = false) const;
//! Rules to string
static const QString flightruleToString(FlightRules rule);
private:
QString m_equipmentIcao;
QString m_equipmentIcao; //!< e.g. "T/A320/F"
CAirportIcaoCode m_originAirportIcao;
CAirportIcaoCode m_destinationAirportIcao;
CAirportIcaoCode m_alternateAirportIcao;