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

MS & KB workshop: ICAO class renamings.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-05-12 22:46:17 +01:00
parent c136724cd0
commit b65232b202
71 changed files with 226 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackmisc/aviation/aircraft.h
View File

@@ -15,7 +15,7 @@
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/network/user.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/selcal.h"
#include "blackmisc/aviation/transponder.h"
@@ -88,10 +88,10 @@ namespace BlackMisc
virtual void setPilot(const BlackMisc::Network::CUser &user);
//! Get ICAO info
const CAircraftIcao &getIcaoInfo() const { return m_icao; }
const CAircraftIcaoData &getIcaoInfo() const { return m_icao; }
//! Set ICAO info
virtual void setIcaoInfo(const CAircraftIcao &icao) { m_icao = icao; }
virtual void setIcaoInfo(const CAircraftIcaoData &icao) { m_icao = icao; }
//! Has valid realname?
bool hasValidRealName() const { return this->m_pilot.hasValidRealName(); }
@@ -285,7 +285,7 @@ namespace BlackMisc
CTransponder m_transponder;
CAircraftParts m_parts;
CSelcal m_selcal;
CAircraftIcao m_icao;
CAircraftIcaoData m_icao;
};
} // namespace
} // namespace

30
src/blackmisc/aviation/aircrafticao.cpp → src/blackmisc/aviation/aircrafticaodata.cpp
View File

@@ -7,7 +7,7 @@
* contained in the LICENSE file.
*/
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/variant.h"
@@ -20,11 +20,11 @@ namespace BlackMisc
namespace Aviation
{
CAircraftIcao::CAircraftIcao(const QString &icao, const QString &airline)
CAircraftIcaoData::CAircraftIcaoData(const QString &icao, const QString &airline)
: m_aircraftDesignator(icao.trimmed().toUpper()), m_airlineDesignator(airline.trimmed().toUpper())
{}
QString CAircraftIcao::convertToQString(bool i18n) const
QString CAircraftIcaoData::convertToQString(bool i18n) const
{
Q_UNUSED(i18n);
QString s(this->m_aircraftDesignator);
@@ -35,23 +35,23 @@ namespace BlackMisc
return s;
}
bool CAircraftIcao::hasAircraftDesignator() const
bool CAircraftIcaoData::hasAircraftDesignator() const
{
return !this->m_aircraftDesignator.isEmpty();
}
bool CAircraftIcao::hasKnownAircraftDesignator() const
bool CAircraftIcaoData::hasKnownAircraftDesignator() const
{
return (this->hasAircraftDesignator() && this->getAircraftDesignator() != "ZZZZ");
}
QString CAircraftIcao::getEngineType() const
QString CAircraftIcaoData::getEngineType() const
{
if (this->m_aircraftCombinedType.length() != 3) return "";
return this->m_aircraftCombinedType.right(1);
}
QString CAircraftIcao::asString() const
QString CAircraftIcaoData::asString() const
{
if (this->m_aircraftDesignator.isEmpty()) { return ""; }
QString s(this->m_aircraftDesignator);
@@ -68,7 +68,7 @@ namespace BlackMisc
return s;
}
void CAircraftIcao::updateMissingParts(const CAircraftIcao &icao)
void CAircraftIcaoData::updateMissingParts(const CAircraftIcaoData &icao)
{
if (this->m_aircraftDesignator.isEmpty()) { this->setAircraftDesignator(icao.getAircraftDesignator()); }
if (this->m_airlineDesignator.isEmpty()) { this->setAirlineDesignator(icao.getAirlineDesignator()); }
@@ -77,7 +77,7 @@ namespace BlackMisc
if (this->m_livery.isEmpty()) { this->setLivery(icao.getLivery()); }
}
bool CAircraftIcao::matchesWildcardIcao(const CAircraftIcao &otherIcao) const
bool CAircraftIcaoData::matchesWildcardIcao(const CAircraftIcaoData &otherIcao) const
{
if ((*this) == otherIcao) return true;
if (otherIcao.hasAircraftDesignator() && otherIcao.getAircraftDesignator() != this->getAircraftDesignator()) { return false; }
@@ -88,7 +88,7 @@ namespace BlackMisc
return true;
}
bool CAircraftIcao::isVtol() const
bool CAircraftIcaoData::isVtol() const
{
// special designators
if (
@@ -109,7 +109,7 @@ namespace BlackMisc
return false;
}
CVariant CAircraftIcao::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
CVariant CAircraftIcaoData::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
{
if (index.isMyself()) { return this->toCVariant(); }
ColumnIndex i = index.frontCasted<ColumnIndex>();
@@ -132,7 +132,7 @@ namespace BlackMisc
}
}
void CAircraftIcao::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
void CAircraftIcaoData::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
{
if (index.isMyself())
{
@@ -161,21 +161,21 @@ namespace BlackMisc
}
}
bool CAircraftIcao::isValidDesignator(const QString &designator)
bool CAircraftIcaoData::isValidDesignator(const QString &designator)
{
static QRegularExpression regexp("^[A-Z]+[A-Z0-9]*$");
if (designator.length() < 2 || designator.length() > 5) { return false; }
return (regexp.match(designator).hasMatch());
}
bool CAircraftIcao::isValidCombinedType(const QString &combinedType)
bool CAircraftIcaoData::isValidCombinedType(const QString &combinedType)
{
static QRegularExpression regexp("^[A-Z][0-9][A-Z]$");
if (combinedType.length() != 3) return false;
return (regexp.match(combinedType).hasMatch());
}
bool CAircraftIcao::isValidAirlineDesignator(const QString &airline)
bool CAircraftIcaoData::isValidAirlineDesignator(const QString &airline)
{
static QRegularExpression regexp("^[A-Z]+[A-Z0-9]*$");
if (airline.length() < 2 || airline.length() > 5) return false;

26
src/blackmisc/aviation/aircrafticao.h → src/blackmisc/aviation/aircrafticaodata.h
View File

@@ -9,8 +9,8 @@
//! \file
#ifndef BLACKMISC_AVIATION_AIRCRAFTICAO_H
#define BLACKMISC_AVIATION_AIRCRAFTICAO_H
#ifndef BLACKMISC_AVIATION_AIRCRAFTICAODATA_H
#define BLACKMISC_AVIATION_AIRCRAFTICAODATA_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/valueobject.h"
@@ -22,13 +22,13 @@ namespace BlackMisc
namespace Aviation
{
//! Value object for ICAO classification
class BLACKMISC_EXPORT CAircraftIcao : public CValueObject<CAircraftIcao>
class BLACKMISC_EXPORT CAircraftIcaoData : public CValueObject<CAircraftIcaoData>
{
public:
//! Properties by index
enum ColumnIndex
{
IndexAircraftDesignator = BlackMisc::CPropertyIndex::GlobalIndexCAircraftIcao,
IndexAircraftDesignator = BlackMisc::CPropertyIndex::GlobalIndexCAircraftIcaoData,
IndexCombinedAircraftType,
IndexAirlineDesignator,
IndexAircraftColor,
@@ -37,15 +37,15 @@ namespace BlackMisc
};
//! Default constructor.
CAircraftIcao() = default;
CAircraftIcaoData() = default;
//! Constructor.
explicit CAircraftIcao(const QString &icao) : m_aircraftDesignator(icao.trimmed().toUpper()) {}
explicit CAircraftIcaoData(const QString &icao) : m_aircraftDesignator(icao.trimmed().toUpper()) {}
//! Constructor.
//! \param icao "B737"
//! \param airline "DLH"
CAircraftIcao(const QString &icao, const QString &airline);
CAircraftIcaoData(const QString &icao, const QString &airline);
/*!
* Constructor.
@@ -55,7 +55,7 @@ namespace BlackMisc
* \param livery "FREIGHT"
* \param color "CCFFDD" (RGB)
*/
CAircraftIcao(const QString &icao, const QString &combinedType, const QString &airline, const QString &livery, const QString &color)
CAircraftIcaoData(const QString &icao, const QString &combinedType, const QString &airline, const QString &livery, const QString &color)
: m_aircraftDesignator(icao.trimmed().toUpper()), m_aircraftCombinedType(combinedType.trimmed().toUpper()), m_airlineDesignator(airline.trimmed().toUpper()),
m_livery(livery.trimmed().toUpper()), m_aircraftColor(color.trimmed().toUpper()) {}
@@ -121,10 +121,10 @@ namespace BlackMisc
void setAircraftCombinedType(const QString &type) { this->m_aircraftCombinedType = type.trimmed().toUpper(); }
//! Missing parts from another ICAO object
void updateMissingParts(const CAircraftIcao &icao);
void updateMissingParts(const CAircraftIcaoData &icao);
//! Matches wildcard icao object
bool matchesWildcardIcao(const CAircraftIcao &otherIcao) const;
bool matchesWildcardIcao(const CAircraftIcaoData &otherIcao) const;
//! Is VTOL aircraft
bool isVtol() const;
@@ -148,7 +148,7 @@ namespace BlackMisc
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftIcao)
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftIcaoData)
QString m_aircraftDesignator; //!< "B737"
QString m_aircraftCombinedType; //!< "L2J"
QString m_airlineDesignator; //!< "DLH"
@@ -158,8 +158,8 @@ namespace BlackMisc
} // namespace
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftIcao)
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftIcao, (
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftIcaoData)
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftIcaoData, (
o.m_aircraftDesignator,
o.m_aircraftCombinedType,
o.m_airlineDesignator,

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

@@ -56,8 +56,8 @@ namespace BlackMisc
if (!aircraftToBeUpdated.hasValidId()) user.setId(currentDataFileAircraft.getPilotId());
aircraftToBeUpdated.setPilot(user);
CAircraftIcao icao = aircraftToBeUpdated.getIcaoInfo();
CAircraftIcao dataFileIcao = currentDataFileAircraft.getIcaoInfo();
CAircraftIcaoData icao = aircraftToBeUpdated.getIcaoInfo();
CAircraftIcaoData dataFileIcao = currentDataFileAircraft.getIcaoInfo();
if (!icao.hasAircraftDesignator()) icao.setAircraftDesignator(dataFileIcao.getAircraftDesignator());
if (!icao.hasAirlineDesignator()) icao.setAirlineDesignator(dataFileIcao.getAirlineDesignator());
if (!icao.hasAircraftCombinedType()) icao.setAircraftCombinedType(dataFileIcao.getAircraftCombinedType());

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

@@ -27,11 +27,11 @@ namespace BlackMisc
m_icao(icao)
{ }
CAirport::CAirport(const CAirportIcao &icao, const BlackMisc::Geo::CCoordinateGeodetic &position) :
CAirport::CAirport(const CAirportIcaoCode &icao, const BlackMisc::Geo::CCoordinateGeodetic &position) :
m_icao(icao), m_position(position)
{ }
CAirport::CAirport(const CAirportIcao &icao, const BlackMisc::Geo::CCoordinateGeodetic &position, const QString &descriptiveName) :
CAirport::CAirport(const CAirportIcaoCode &icao, const BlackMisc::Geo::CCoordinateGeodetic &position, const QString &descriptiveName) :
m_icao(icao), m_descriptiveName(descriptiveName), m_position(position)
{ }

12
src/blackmisc/aviation/airport.h
View File

@@ -13,7 +13,7 @@
#define BLACKMISC_AVIATION_AIRPORT_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/aviation/airporticao.h"
#include "blackmisc/aviation/airporticaocode.h"
#include "blackmisc/geo/coordinategeodetic.h"
#include "blackmisc/propertyindex.h"
@@ -43,19 +43,19 @@ namespace BlackMisc
CAirport(const QString &icao);
//! ATC station constructor
CAirport(const CAirportIcao &icao, const BlackMisc::Geo::CCoordinateGeodetic &position);
CAirport(const CAirportIcaoCode &icao, const BlackMisc::Geo::CCoordinateGeodetic &position);
//! ATC station constructor
CAirport(const CAirportIcao &icao, const BlackMisc::Geo::CCoordinateGeodetic &position, const QString &descriptiveName);
CAirport(const CAirportIcaoCode &icao, const BlackMisc::Geo::CCoordinateGeodetic &position, const QString &descriptiveName);
//! Get ICAO code.
const CAirportIcao &getIcao() const { return m_icao; }
const CAirportIcaoCode &getIcao() const { return m_icao; }
//! Get ICAO code as string.
QString getIcaoAsString() const { return m_icao.asString(); }
//! Set ICAO code.
void setIcao(const CAirportIcao &icao) { m_icao = icao; }
void setIcao(const CAirportIcaoCode &icao) { m_icao = icao; }
//! Get descriptive name
QString getDescriptiveName() const { return m_descriptiveName; }
@@ -107,7 +107,7 @@ namespace BlackMisc
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAirport)
CAirportIcao m_icao;
CAirportIcaoCode m_icao;
QString m_descriptiveName;
BlackMisc::Geo::CCoordinateGeodetic m_position;
};

12
src/blackmisc/aviation/airporticao.cpp → src/blackmisc/aviation/airporticaocode.cpp
View File

@@ -1,22 +1,22 @@
#include "blackmisc/aviation/airporticao.h"
#include "blackmisc/aviation/airporticaocode.h"
namespace BlackMisc
{
namespace Aviation
{
QString CAirportIcao::convertToQString(bool /** i18n **/) const
QString CAirportIcaoCode::convertToQString(bool /** i18n **/) const
{
return this->m_icaoCode;
}
bool CAirportIcao::equalsString(const QString &icaoCode) const
bool CAirportIcaoCode::equalsString(const QString &icaoCode) const
{
CAirportIcao other(icaoCode);
CAirportIcaoCode other(icaoCode);
return other == (*this);
}
QString CAirportIcao::unifyAirportCode(const QString &icaoCode)
QString CAirportIcaoCode::unifyAirportCode(const QString &icaoCode)
{
QString code = icaoCode.trimmed().toUpper();
if (code.length() != 4) return "";
@@ -24,7 +24,7 @@ namespace BlackMisc
return (reg.exactMatch(code)) ? code : "";
}
bool CAirportIcao::isValidIcaoDesignator(const QString &icaoCode)
bool CAirportIcaoCode::isValidIcaoDesignator(const QString &icaoCode)
{
QString icao = unifyAirportCode(icaoCode);
return icao.length() == 4;

18
src/blackmisc/aviation/airporticao.h → src/blackmisc/aviation/airporticaocode.h
View File

@@ -9,8 +9,8 @@
//! \file
#ifndef BLACKMISC_AVIATION_AIRPORTICAO_H
#define BLACKMISC_AVIATION_AIRPORTICAO_H
#ifndef BLACKMISC_AVIATION_AIRPORTICAOCODE_H
#define BLACKMISC_AVIATION_AIRPORTICAOCODE_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/valueobject.h"
@@ -21,17 +21,17 @@ namespace BlackMisc
namespace Aviation
{
//! Value object encapsulating information of airport ICAO data.
class BLACKMISC_EXPORT CAirportIcao : public CValueObject<CAirportIcao>
class BLACKMISC_EXPORT CAirportIcaoCode : public CValueObject<CAirportIcaoCode>
{
public:
//! Default constructor.
CAirportIcao() = default;
CAirportIcaoCode() = default;
//! Constructor
CAirportIcao(const QString &icaoCode) : m_icaoCode(CAirportIcao::unifyAirportCode(icaoCode)) {}
CAirportIcaoCode(const QString &icaoCode) : m_icaoCode(CAirportIcaoCode::unifyAirportCode(icaoCode)) {}
//! Constructor, needed to disambiguate implicit conversion from string literal.
CAirportIcao(const char *icaoCode) : m_icaoCode(CAirportIcao::unifyAirportCode(icaoCode)) {}
CAirportIcaoCode(const char *icaoCode) : m_icaoCode(CAirportIcaoCode::unifyAirportCode(icaoCode)) {}
//! Is empty?
bool isEmpty() const { return this->m_icaoCode.isEmpty(); }
@@ -55,15 +55,15 @@ namespace BlackMisc
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAirportIcao)
BLACK_ENABLE_TUPLE_CONVERSION(CAirportIcaoCode)
QString m_icaoCode;
};
} // namespace
} // namespace
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAirportIcao, (
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAirportIcaoCode, (
attr(o.m_icaoCode, flags<CaseInsensitiveComparison>())
))
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAirportIcao)
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAirportIcaoCode)
#endif // guard

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

@@ -30,7 +30,7 @@ namespace BlackMisc
registerMetaValueType<CAirportList>();
}
CAirportList CAirportList::findByIcao(const CAirportIcao &icao) const
CAirportList CAirportList::findByIcao(const CAirportIcaoCode &icao) const
{
return this->findBy(&CAirport::getIcao, icao);
}
@@ -41,7 +41,7 @@ namespace BlackMisc
this->replaceOrAdd(&CAirport::getIcao, addedOrReplacedAirport.getIcao(), addedOrReplacedAirport);
}
CAirport CAirportList::findFirstByIcao(const CAirportIcao &icao, const CAirport &ifNotFound) const
CAirport CAirportList::findFirstByIcao(const CAirportIcaoCode &icao, const CAirport &ifNotFound) const
{
return this->findByIcao(icao).frontOrDefault(ifNotFound);
}

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

@@ -39,13 +39,13 @@ namespace BlackMisc
CAirportList(const CSequence<CAirport> &other);
//! Find 0..n airports by ICAO code
CAirportList findByIcao(const CAirportIcao &icao) const;
CAirportList findByIcao(const CAirportIcaoCode &icao) const;
//! Replace or add based on same ICAO code
void replaceOrAddByIcao(const CAirport &addedOrReplacedAirport);
//! Find first station by callsign, if not return given value / default
CAirport findFirstByIcao(const CAirportIcao &icao, const CAirport &ifNotFound = CAirport()) const;
CAirport findFirstByIcao(const CAirportIcaoCode &icao, const CAirport &ifNotFound = CAirport()) const;
//! \copydoc CValueObject::toQVariant
QVariant toQVariant() const { return QVariant::fromValue(*this); }

5
src/blackmisc/aviation/aviation.h
View File

@@ -22,10 +22,15 @@
#include "blackmisc/aviation/callsignset.h"
#include "blackmisc/aviation/atcstation.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/aviation/aircrafticaocodelist.h"
#include "blackmisc/aviation/aircraftlist.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/aviation/aircraftsituationlist.h"
#include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/aviation/airlineicaocodelist.h"
#include "blackmisc/aviation/airport.h"
#include "blackmisc/aviation/airporticaocode.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/aviation/informationmessage.h"
#include "blackmisc/aviation/selcal.h"

6
src/blackmisc/aviation/blackmiscfreefunctions_avmeta.cpp
View File

@@ -36,8 +36,10 @@ void BlackMisc::Aviation::registerMetadata()
CAirportList::registerMetadata();
CAircraftSituation::registerMetadata();
CAircraftSituationList::registerMetadata();
CAircraftIcao::registerMetadata();
CAirportIcao::registerMetadata();
CAircraftIcaoCode::registerMetadata();
CAircraftIcaoData::registerMetadata();
CAirlineIcaoCode::registerMetadata();
CAirportIcaoCode::registerMetadata();
CSelcal::registerMetadata();
CFlightPlan::registerMetadata();
CAircraftEngine::registerMetadata();

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

@@ -15,7 +15,7 @@
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/valueobject.h"
#include "blackmisc/aviation/altitude.h"
#include "blackmisc/aviation/airporticao.h"
#include "blackmisc/aviation/airporticaocode.h"
#include "blackmisc/pq/time.h"
#include "blackmisc/pq/speed.h"
#include <QDateTime>
@@ -44,7 +44,7 @@ namespace BlackMisc
CFlightPlan() = default;
//! Constructor
CFlightPlan(const QString &equipmentIcao, const CAirportIcao &originAirportIcao, const CAirportIcao &destinationAirportIcao, const CAirportIcao &alternateAirportIcao,
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),
@@ -63,19 +63,19 @@ namespace BlackMisc
void setOriginAirportIcao(const QString &originAirportIcao) { m_originAirportIcao = originAirportIcao; }
//! Set origin airport ICAO code
void setOriginAirportIcao(const CAirportIcao &originAirportIcao) { m_originAirportIcao = originAirportIcao; }
void setOriginAirportIcao(const CAirportIcaoCode &originAirportIcao) { m_originAirportIcao = originAirportIcao; }
//! Set destination airport ICAO code
void setDestinationAirportIcao(const QString &destinationAirportIcao) { m_destinationAirportIcao = destinationAirportIcao; }
//! Set destination airport ICAO code
void setDestinationAirportIcao(const CAirportIcao &destinationAirportIcao) { m_destinationAirportIcao = destinationAirportIcao; }
void setDestinationAirportIcao(const CAirportIcaoCode &destinationAirportIcao) { m_destinationAirportIcao = destinationAirportIcao; }
//! Set alternate destination airport ICAO code
void setAlternateAirportIcao(const QString &alternateAirportIcao) { m_alternateAirportIcao = alternateAirportIcao; }
//! Set alternate destination airport ICAO code
void setAlternateAirportIcao(const CAirportIcao &alternateAirportIcao) { m_alternateAirportIcao = alternateAirportIcao; }
void setAlternateAirportIcao(const CAirportIcaoCode &alternateAirportIcao) { m_alternateAirportIcao = alternateAirportIcao; }
//! Set planned takeoff time
void setTakeoffTimePlanned(QDateTime takeoffTimePlanned) { m_takeoffTimePlanned = takeoffTimePlanned; }
@@ -120,13 +120,13 @@ namespace BlackMisc
const QString &getEquipmentIcao() const { return m_equipmentIcao; }
//! Get origin airport ICAO code
const CAirportIcao &getOriginAirportIcao() const { return m_originAirportIcao; }
const CAirportIcaoCode &getOriginAirportIcao() const { return m_originAirportIcao; }
//! Get destination airport ICAO code
const CAirportIcao &getDestinationAirportIcao() const { return m_destinationAirportIcao; }
const CAirportIcaoCode &getDestinationAirportIcao() const { return m_destinationAirportIcao; }
//! Get alternate destination airport ICAO code
const CAirportIcao &getAlternateAirportIcao() const { return m_alternateAirportIcao; }
const CAirportIcaoCode &getAlternateAirportIcao() const { return m_alternateAirportIcao; }
//! Get planned takeoff time (planned)
const QDateTime &getTakeoffTimePlanned() const { return m_takeoffTimePlanned; }
@@ -188,9 +188,9 @@ namespace BlackMisc
private:
BLACK_ENABLE_TUPLE_CONVERSION(CFlightPlan)
QString m_equipmentIcao;
CAirportIcao m_originAirportIcao;
CAirportIcao m_destinationAirportIcao;
CAirportIcao m_alternateAirportIcao;
CAirportIcaoCode m_originAirportIcao;
CAirportIcaoCode m_destinationAirportIcao;
CAirportIcaoCode m_alternateAirportIcao;
QDateTime m_takeoffTimePlanned;
QDateTime m_takeoffTimeActual;
PhysicalQuantities::CTime m_enrouteTime;

12
src/blackmisc/network/aircraftmapping.h
View File

@@ -13,7 +13,7 @@
#define BLACKMISC_NETWORK_AIRCRAFTMAPPING_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/valueobject.h"
@@ -51,10 +51,10 @@ namespace BlackMisc
void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
//! ICAO
void setIcao(const BlackMisc::Aviation::CAircraftIcao &icao) { this->m_icao = icao; }
void setIcao(const BlackMisc::Aviation::CAircraftIcaoData &icao) { this->m_icao = icao; }
//! ICAO
const BlackMisc::Aviation::CAircraftIcao &getIcao() const { return this->m_icao; }
const BlackMisc::Aviation::CAircraftIcaoData &getIcao() const { return this->m_icao; }
//! Model
void setModel(const BlackMisc::Simulation::CAircraftModel &model) { this->m_model = model; }
@@ -66,15 +66,15 @@ namespace BlackMisc
bool matchesModelString(const QString &modelString, Qt::CaseSensitivity sensitivity) const;
//! Matches wildcard icao object
bool matchesWildcardIcao(const BlackMisc::Aviation::CAircraftIcao &otherIcao) const { return m_icao.matchesWildcardIcao(otherIcao); }
bool matchesWildcardIcao(const BlackMisc::Aviation::CAircraftIcaoData &otherIcao) const { return m_icao.matchesWildcardIcao(otherIcao); }
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftMapping)
QString m_source; //!< source, e.g. database, vPilot
QString m_packageName; //!< something like WoA, ..
BlackMisc::Aviation::CAircraftIcao m_icao; //!< ICAO code
BlackMisc::Simulation::CAircraftModel m_model; //!< aircraft model
BlackMisc::Aviation::CAircraftIcaoData m_icao; //!< ICAO code
BlackMisc::Simulation::CAircraftModel m_model; //!< aircraft model
// BlackMisc::Simulation::CSimulatorPluginInfo m_simulatorInfo; //!< Mapping is for simulator
};

10
src/blackmisc/network/aircraftmappinglist.cpp
View File

@@ -23,7 +23,7 @@ namespace BlackMisc
CSequence<CAircraftMapping>(other)
{ }
CAircraftMappingList CAircraftMappingList::findByIcaoCodeWildcard(const CAircraftIcao &searchIcao) const
CAircraftMappingList CAircraftMappingList::findByIcaoCodeWildcard(const CAircraftIcaoData &searchIcao) const
{
return this->findBy([ = ](const CAircraftMapping & mapping)
{
@@ -31,7 +31,7 @@ namespace BlackMisc
});
}
CAircraftMappingList CAircraftMappingList::findByIcaoAircraftDesignator(const CAircraftIcao &searchIcao) const
CAircraftMappingList CAircraftMappingList::findByIcaoAircraftDesignator(const CAircraftIcaoData &searchIcao) const
{
const QString aircraftIcao = searchIcao.getAircraftDesignator();
if (aircraftIcao.isEmpty()) { return CAircraftMappingList(); }
@@ -41,7 +41,7 @@ namespace BlackMisc
});
}
CAircraftMappingList CAircraftMappingList::findByIcaoAirlineDesignator(const CAircraftIcao &searchIcao) const
CAircraftMappingList CAircraftMappingList::findByIcaoAirlineDesignator(const CAircraftIcaoData &searchIcao) const
{
const QString airlineIcao = searchIcao.getAircraftDesignator();
if (airlineIcao.isEmpty()) { return CAircraftMappingList(); }
@@ -51,7 +51,7 @@ namespace BlackMisc
});
}
CAircraftMappingList CAircraftMappingList::findByIcaoAircraftAndAirlineDesignator(const CAircraftIcao &searchIcao, bool allowRelaxedAirline) const
CAircraftMappingList CAircraftMappingList::findByIcaoAircraftAndAirlineDesignator(const CAircraftIcaoData &searchIcao, bool allowRelaxedAirline) const
{
CAircraftMappingList aircraftSearch = findByIcaoAircraftDesignator(searchIcao);
if (aircraftSearch.isEmpty()) { return aircraftSearch; }
@@ -61,7 +61,7 @@ namespace BlackMisc
return allowRelaxedAirline ? aircraftSearch : aircraftAndAirlineSearch;
}
CAircraftMappingList CAircraftMappingList::findByIcaoCodeExact(const CAircraftIcao &searchIcao) const
CAircraftMappingList CAircraftMappingList::findByIcaoCodeExact(const CAircraftIcaoData &searchIcao) const
{
return this->findBy(&CAircraftMapping::getIcao, searchIcao);
}

10
src/blackmisc/network/aircraftmappinglist.h
View File

@@ -35,19 +35,19 @@ namespace BlackMisc
CAircraftMappingList(const CSequence<CAircraftMapping> &other);
//! Find by ICAO code, empty fields treated as wildcards
CAircraftMappingList findByIcaoCodeWildcard(const BlackMisc::Aviation::CAircraftIcao &searchIcao) const;
CAircraftMappingList findByIcaoCodeWildcard(const BlackMisc::Aviation::CAircraftIcaoData &searchIcao) const;
//! Find by ICAO aircraft designator
CAircraftMappingList findByIcaoAircraftDesignator(const BlackMisc::Aviation::CAircraftIcao &searchIcao) const;
CAircraftMappingList findByIcaoAircraftDesignator(const BlackMisc::Aviation::CAircraftIcaoData &searchIcao) const;
//! Find by ICAO airline designator
CAircraftMappingList findByIcaoAirlineDesignator(const BlackMisc::Aviation::CAircraftIcao &searchIcao) const;
CAircraftMappingList findByIcaoAirlineDesignator(const BlackMisc::Aviation::CAircraftIcaoData &searchIcao) const;
//! Find by ICAO aircraft and airline designator
CAircraftMappingList findByIcaoAircraftAndAirlineDesignator(const BlackMisc::Aviation::CAircraftIcao &searchIcao, bool allowRelaxedAirline) const;
CAircraftMappingList findByIcaoAircraftAndAirlineDesignator(const BlackMisc::Aviation::CAircraftIcaoData &searchIcao, bool allowRelaxedAirline) const;
//! Find by ICAO code, empty fields treated literally
CAircraftMappingList findByIcaoCodeExact(const BlackMisc::Aviation::CAircraftIcao &searchIcao) const;
CAircraftMappingList findByIcaoCodeExact(const BlackMisc::Aviation::CAircraftIcaoData &searchIcao) const;
//! Find by model string
CAircraftMappingList findByModelString(const QString &modelString, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const;

4
src/blackmisc/network/user.cpp
View File

@@ -8,7 +8,7 @@
*/
#include "blackmisc/network/user.h"
#include "blackmisc/aviation/airporticao.h"
#include "blackmisc/aviation/airporticaocode.h"
#include "blackmisc/icon.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/propertyindex.h"
@@ -86,7 +86,7 @@ namespace BlackMisc
int pos = match.capturedStart(0);
QString icao = match.captured(0).trimmed().right(4);
rn = rn.left(pos).trimmed();
this->setHomebase(CAirportIcao(icao));
this->setHomebase(CAirportIcaoCode(icao));
}
}

8
src/blackmisc/network/user.h
View File

@@ -14,7 +14,7 @@
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/airporticao.h"
#include "blackmisc/aviation/airporticaocode.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/statusmessagelist.h"
@@ -104,10 +104,10 @@ namespace BlackMisc
void setId(const QString &id) { m_id = id.trimmed(); }
//! Homebase
const BlackMisc::Aviation::CAirportIcao &getHomebase() const { return this->m_homebase; }
const BlackMisc::Aviation::CAirportIcaoCode &getHomebase() const { return this->m_homebase; }
//! Set homebase
void setHomebase(const BlackMisc::Aviation::CAirportIcao &homebase) { this->m_homebase = homebase; }
void setHomebase(const BlackMisc::Aviation::CAirportIcaoCode &homebase) { this->m_homebase = homebase; }
//! Get associated callsign.
const BlackMisc::Aviation::CCallsign &getCallsign() const { return m_callsign; }
@@ -150,7 +150,7 @@ namespace BlackMisc
QString m_email;
QString m_password;
BlackMisc::Aviation::CCallsign m_callsign;
BlackMisc::Aviation::CAirportIcao m_homebase;
BlackMisc::Aviation::CAirportIcaoCode m_homebase;
};
} // namespace
} // namespace

2
src/blackmisc/propertyindex.h
View File

@@ -59,7 +59,7 @@ namespace BlackMisc
GlobalIndexCAircraftLights = 1600,
GlobalIndexCModulator = 2000,
GlobalIndexCTransponder = 2100,
GlobalIndexCAircraftIcao = 2500,
GlobalIndexCAircraftIcaoData = 2500,
GlobalIndexCAircraftIcaoCode = 2600,
GlobalIndexCAirlineIcaoCode = 2700,
GlobalIndexCAirportIcaoCode = 2800,

14
src/blackmisc/simulation/aircraftmodel.h
View File

@@ -14,7 +14,7 @@
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/aviation/aircraft.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/network/user.h"
#include "blackmisc/propertyindex.h"
@@ -59,7 +59,7 @@ namespace BlackMisc
CAircraftModel(const QString &model, ModelType type) : m_modelString(model), m_modelType(type) {}
//! Constructor.
CAircraftModel(const QString &model, ModelType type, const QString &description, const BlackMisc::Aviation::CAircraftIcao &icao) :
CAircraftModel(const QString &model, ModelType type, const QString &description, const BlackMisc::Aviation::CAircraftIcaoData &icao) :
m_icao(icao), m_modelString(model), m_description(description), m_modelType(type) {}
//! Constructor
@@ -96,15 +96,15 @@ namespace BlackMisc
void setQueriedModelString(const QString &model) { this->m_modelString = model; this->m_modelType = TypeQueriedFromNetwork; }
//! ICAO code
BlackMisc::Aviation::CAircraftIcao getIcao() const { return this->m_icao; }
BlackMisc::Aviation::CAircraftIcaoData getIcao() const { return this->m_icao; }
//! Set ICAO info
void setIcao(const BlackMisc::Aviation::CAircraftIcao &icao) { this->m_icao = icao; }
void setIcao(const BlackMisc::Aviation::CAircraftIcaoData &icao) { this->m_icao = icao; }
//! \copydoc CAircraftIcao::hasAircraftAndAirlineDesignator
//! \copydoc CAircraftIcaoData::hasAircraftAndAirlineDesignator
bool hasAircraftAndAirlineDesignator() const { return this->m_icao.hasAircraftAndAirlineDesignator(); }
//! \copydoc CAircraftIcao::hasAircraftDesignator
//! \copydoc CAircraftIcaoData::hasAircraftDesignator
bool hasAircraftDesignator() const { return this->m_icao.hasAircraftDesignator(); }
//! Model type
@@ -146,7 +146,7 @@ namespace BlackMisc
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftModel)
BlackMisc::Aviation::CCallsign m_callsign; //!< aircraft's callsign
BlackMisc::Aviation::CAircraftIcao m_icao; //!< ICAO data if available
BlackMisc::Aviation::CAircraftIcaoData m_icao; //!< ICAO data if available
QString m_modelString; //!< Simulator model string
QString m_description; //!< descriptive text
QString m_fileName; //!< file name

10
src/blackmisc/simulation/fscommon/aircraftmapper.cpp
View File

@@ -62,11 +62,11 @@ namespace BlackMisc
return m_init;
}
CAircraftIcao CAircraftMapper::getIcaoForModelString(const QString &modelString) const
CAircraftIcaoData CAircraftMapper::getIcaoForModelString(const QString &modelString) const
{
if (modelString.isEmpty() || !this->isInitialized()) { return CAircraftIcao(); }
if (modelString.isEmpty() || !this->isInitialized()) { return CAircraftIcaoData(); }
CAircraftMappingList mappings = this->m_mappings->getMappingList().findByModelString(modelString);
if (mappings.isEmpty()) { return CAircraftIcao(); }
if (mappings.isEmpty()) { return CAircraftIcaoData(); }
return mappings.front().getIcao();
}
@@ -80,7 +80,7 @@ namespace BlackMisc
CAircraftCfgEntriesList el = this->m_entries.findByTitle(title, caseSensitivity);
if (el.isEmpty()) { return CAircraftModel(); }
CAircraftModel model = el.front().toAircraftModel();
CAircraftIcao icao = this->getIcaoForModelString(model.getModelString());
CAircraftIcaoData icao = this->getIcaoForModelString(model.getModelString());
model.setIcao(icao);
return model;
}
@@ -111,7 +111,7 @@ namespace BlackMisc
"Boeing 737-800 Paint1",
CAircraftModel::TypeModelMatchingDefaultModel,
"B737-800 default model",
CAircraftIcao("B738", "L2J", "", "", "FFFFFF")
CAircraftIcaoData("B738", "L2J", "", "", "FFFFFF")
);
return aircraftModel;
}

2
src/blackmisc/simulation/fscommon/aircraftmapper.h
View File

@@ -78,7 +78,7 @@ namespace BlackMisc
const BlackMisc::Network::CAircraftMappingList &getAircraftMappingList() const { return m_mappings->getMappingList(); }
//! Inverse lookup
BlackMisc::Aviation::CAircraftIcao getIcaoForModelString(const QString &modelString) const;
BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const;
//! Number of aircraft entries
int countAircraftCfgEntries() const { return m_entries.size(); }

2
src/blackmisc/simulation/ownaircraftprovider.cpp
View File

@@ -90,7 +90,7 @@ namespace BlackMisc
return this->m_ownAircraftProvider->updateOwnCallsign(callsign);
}
bool COwnAircraftAware::updateOwnIcaoData(const CAircraftIcao &icaoData)
bool COwnAircraftAware::updateOwnIcaoData(const CAircraftIcaoData &icaoData)
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->updateOwnIcaoData(icaoData);

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

@@ -51,7 +51,7 @@ namespace BlackMisc
//! Update ICAO data
//! \threadsafe
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcao &icaoData) = 0;
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcaoData &icaoData) = 0;
//! Update model
//! \threadsafe
@@ -114,7 +114,7 @@ namespace BlackMisc
virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign);
//! \copydoc IOwnAircraftProvider::updateOwnIcaoData
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcao &icaoData);
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcaoData &icaoData);
//! \copydoc IOwnAircraftProvider::updateOwnModel
virtual bool updateOwnModel(const BlackMisc::Simulation::CAircraftModel &model);

2
src/blackmisc/simulation/ownaircraftproviderdummy.cpp
View File

@@ -88,7 +88,7 @@ namespace BlackMisc
return true;
}
bool COwnAircraftProviderDummy::updateOwnIcaoData(const CAircraftIcao &icaoData)
bool COwnAircraftProviderDummy::updateOwnIcaoData(const CAircraftIcaoData &icaoData)
{
m_ownAircraft.setIcaoInfo(icaoData);
return true;

2
src/blackmisc/simulation/ownaircraftproviderdummy.h
View File

@@ -65,7 +65,7 @@ namespace BlackMisc
virtual bool updateOwnModel(const BlackMisc::Simulation::CAircraftModel &model) override;
//! \copydoc IOwnAircraftProvider::updateOwnIcaoData
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcao &icaoData) override;
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcaoData &icaoData) override;
//! \copydoc IOwnAircraftProvider::updateOwnSituation
virtual bool updateOwnSituation(const BlackMisc::Aviation::CAircraftSituation &situation) override;

4
src/blackmisc/simulation/simulatedaircraft.cpp
View File

@@ -117,10 +117,10 @@ namespace BlackMisc
this->m_client.setUserCallsign(getCallsign());
}
void CSimulatedAircraft::setIcaoInfo(const CAircraftIcao &icao)
void CSimulatedAircraft::setIcaoInfo(const CAircraftIcaoData &icao)
{
// snyc ICAO info
CAircraftIcao newIcao(icao);
CAircraftIcaoData newIcao(icao);
newIcao.updateMissingParts(this->getIcaoInfo());
newIcao.updateMissingParts(this->getModel().getIcao());

2
src/blackmisc/simulation/simulatedaircraft.h
View File

@@ -67,7 +67,7 @@ namespace BlackMisc
virtual void setCallsign(const BlackMisc::Aviation::CCallsign &callsign) override;
//! \copydoc CAircraft::setIcaoInfo
virtual void setIcaoInfo(const BlackMisc::Aviation::CAircraftIcao &icao) override;
virtual void setIcaoInfo(const BlackMisc::Aviation::CAircraftIcaoData &icao) override;
//! \copydoc CAircraft::setPilot
virtual void setPilot(const BlackMisc::Network::CUser &user) override;