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

Formatting

Browse Source
This commit is contained in:
Klaus Basan
2017-08-08 18:36:06 +02:00
committed by Mathew Sutcliffe
parent 2805979577
commit 0117558ea7
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/context/contextownaircraft.h
View File

@@ -113,7 +113,7 @@ namespace BlackCore
//! Update own cockpit
virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator) = 0;
//! Tune in a com frequency
//! Tune in a COM frequency
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit comUnit, const BlackMisc::CIdentifier &originator) = 0;
//! Set current pilot

6
src/blackmisc/aviation/airportlist.h
View File

@@ -46,6 +46,9 @@ namespace BlackMisc
//! Find 0..n airports by ICAO code
CAirportList findByIcao(const CAirportIcaoCode &icao) const;
//! Find first station by callsign, if not return given value / default
CAirport findFirstByIcao(const CAirportIcaoCode &icao, const CAirport &ifNotFound = CAirport()) const;
//! Containing an airport with given ICAO code?
bool containsAirportWithIcaoCode(const CAirportIcaoCode &icao) const;
@@ -55,9 +58,6 @@ namespace BlackMisc
//! Update this list from the other list
void updateMissingParts(const CAirportList &updateFromList);
//! Find first station by callsign, if not return given value / default
CAirport findFirstByIcao(const CAirportIcaoCode &icao, const CAirport &ifNotFound = CAirport()) const;
//! All ICAO codes
QStringList allIcaoCodes(bool sorted) const;

2
src/blackmisc/aviation/altitude.h
View File

@@ -78,7 +78,7 @@ namespace BlackMisc
//! Constructor
CAltitude(double value, ReferenceDatum datum, const BlackMisc::PhysicalQuantities::CLengthUnit &unit) : CLength(value, unit), m_datum(datum) {}
//! Constructor
//! Constructor, value as CAltitude::MeanSeaLevel
CAltitude(double value, const BlackMisc::PhysicalQuantities::CLengthUnit &unit) : CLength(value, unit), m_datum(MeanSeaLevel) {}
//! Altitude as string

16
src/blackmisc/geo/coordinategeodetic.cpp
View File

@@ -27,14 +27,14 @@ namespace BlackMisc
{
QString CCoordinateGeodetic::convertToQString(bool i18n) const
{
QString s = "Geodetic: {%1, %2, %3}";
static const QString s = "Geodetic: {%1, %2, %3}";
return s.arg(this->latitude().valueRoundedWithUnit(6, i18n), this->longitude().valueRoundedWithUnit(6, i18n), this->m_geodeticHeight.valueRoundedWithUnit(6, i18n));
}
CCoordinateGeodetic CCoordinateGeodetic::fromWgs84(const QString &latitudeWgs84, const QString &longitudeWgs84, const CAltitude &geodeticHeight)
{
CLatitude lat = CLatitude::fromWgs84(latitudeWgs84);
CLongitude lon = CLongitude::fromWgs84(longitudeWgs84);
const CLatitude lat = CLatitude::fromWgs84(latitudeWgs84);
const CLongitude lon = CLongitude::fromWgs84(longitudeWgs84);
return CCoordinateGeodetic(lat, lon, geodeticHeight);
}
@@ -89,7 +89,7 @@ namespace BlackMisc
{
if (!index.isMyself())
{
ColumnIndex i = index.frontCasted<ColumnIndex>();
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexLatitude:
@@ -120,7 +120,7 @@ namespace BlackMisc
{
if (!index.isMyself())
{
ColumnIndex i = index.frontCasted<ColumnIndex>();
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexLatitude:
@@ -285,7 +285,7 @@ namespace BlackMisc
if (ICoordinateGeodetic::canHandleIndex(index)) { return ICoordinateGeodetic::propertyByIndex(index); }
if (!index.isMyself())
{
ColumnIndex i = index.frontCasted<ColumnIndex>();
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexRelativeBearing:
@@ -306,7 +306,7 @@ namespace BlackMisc
if (ICoordinateGeodetic::canHandleIndex(index)) { return; }
if (!index.isMyself())
{
ColumnIndex i = index.frontCasted<ColumnIndex>();
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexRelativeBearing:
@@ -328,7 +328,7 @@ namespace BlackMisc
if (ICoordinateGeodetic::canHandleIndex(index)) { return ICoordinateGeodetic::comparePropertyByIndex(index, compareValue); }
if (!index.isMyself())
{
ColumnIndex i = index.frontCasted<ColumnIndex>();
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexRelativeBearing:

1
src/blackmisc/simulation/ownaircraftprovider.h
View File

@@ -43,7 +43,6 @@ namespace BlackMisc
class BLACKMISC_EXPORT IOwnAircraftProvider
{
public:
//! Own aircraft
//! \threadsafe
virtual CSimulatedAircraft getOwnAircraft() const = 0;