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

refs #396 move Blackmisc Aviation classes into subfolder

Browse Source
This commit is contained in:
Roland Winklmeier
2015-04-02 00:11:50 +02:00
parent 4d09279c65
commit 78d3350bf3
159 changed files with 516 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/blackmisc/avallclasses.h
View File

@@ -1,34 +0,0 @@
/* Copyright (C) 2013 VATSIM Community / contributors
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef BLACKMISC_AVALLCLASSES_H
#define BLACKMISC_AVALLCLASSES_H
#include "blackmisc/avaltitude.h"
#include "blackmisc/avheading.h"
#include "blackmisc/avioadfsystem.h"
#include "blackmisc/aviocomsystem.h"
#include "blackmisc/avionavsystem.h"
#include "blackmisc/aviotransponder.h"
#include "blackmisc/avtrack.h"
#include "blackmisc/avcallsign.h"
#include "blackmisc/avcallsignlist.h"
#include "blackmisc/avatcstation.h"
#include "blackmisc/avatcstationlist.h"
#include "blackmisc/avaircraftlist.h"
#include "blackmisc/avaircraftsituation.h"
#include "blackmisc/avaircraftsituationlist.h"
#include "blackmisc/avairport.h"
#include "blackmisc/avairportlist.h"
#include "blackmisc/avinformationmessage.h"
#include "blackmisc/avselcal.h"
#include "blackmisc/avflightplan.h"
#include "blackmisc/aviation/aircraftengine.h"
#include "blackmisc/aviation/aircraftenginelist.h"
#include "blackmisc/aviation/aircraftlights.h"
#include "blackmisc/aviation/aircraftparts.h"
#include "blackmisc/aviation/aircraftpartslist.h"
#endif // guard

10
src/blackmisc/avioadfsystem.h → src/blackmisc/aviation/adfsystem.h
View File

@@ -9,10 +9,10 @@
//! \file
#ifndef BLACKMISC_AVIOADFSYSTEM_H
#define BLACKMISC_AVIOADFSYSTEM_H
#ifndef BLACKMISC_AVIATION_ADFSYSTEM_H
#define BLACKMISC_AVIATION_ADFSYSTEM_H
#include "blackmisc/aviomodulator.h"
#include "blackmisc/aviation/modulator.h"
#include <stdexcept>
namespace BlackMisc
@@ -34,9 +34,7 @@ namespace BlackMisc
namespace Aviation
{
/*!
* ADF system ("for NDBs")
*/
//! ADF system ("for NDBs")
class CAdfSystem : public CValueObject<CAdfSystem, CModulator<CAdfSystem>>
{
public:

3
src/blackmisc/avaircraft.cpp → src/blackmisc/aviation/aircraft.cpp
View File

@@ -7,7 +7,7 @@
* contained in the LICENSE file.
*/
#include "avaircraft.h"
#include "blackmisc/aviation/aircraft.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/pqconstants.h"
#include "blackmisc/icon.h"
@@ -19,6 +19,7 @@ namespace BlackMisc
{
namespace Aviation
{
CAircraft::CAircraft(const CCallsign &callsign, const Network::CUser &user, const CAircraftSituation &situation)
: m_callsign(callsign), m_pilot(user), m_situation(situation)
{

31
src/blackmisc/avaircraft.h → src/blackmisc/aviation/aircraft.h
View File

@@ -9,21 +9,21 @@
//! \file
#ifndef BLACKMISC_AIRCRAFT_H
#define BLACKMISC_AIRCRAFT_H
#ifndef BLACKMISC_AVIATION_AIRCRAFT_H
#define BLACKMISC_AVIATION_AIRCRAFT_H
#include "nwuser.h"
#include "avaircraftsituation.h"
#include "avaircrafticao.h"
#include "avcallsign.h"
#include "avselcal.h"
#include "aviotransponder.h"
#include "aviocomsystem.h"
#include "aviation/aircraftparts.h"
#include "valueobject.h"
#include "namevariantpairlist.h"
#include "propertyindex.h"
#include "blackmiscfreefunctions.h"
#include "blackmisc/nwuser.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/selcal.h"
#include "blackmisc/aviation/transponder.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/aviation/aircraftparts.h"
#include "blackmisc/valueobject.h"
#include "blackmisc/namevariantpairlist.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/blackmiscfreefunctions.h"
namespace BlackMisc
{
@@ -300,7 +300,8 @@ BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraft, (
o.m_parts,
o.m_icao,
o.m_distanceToOwnAircraft,
o.m_bearingToOwnAircraft))
o.m_bearingToOwnAircraft
))
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraft)

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

@@ -13,6 +13,7 @@ namespace BlackMisc
{
namespace Aviation
{
CAircraftEngine::CAircraftEngine(int number, bool on) : m_number(number), m_on(on)
{
Q_ASSERT_X(number > 0, "CAircraftEngine", "Engine number have to be > 1");
@@ -31,5 +32,6 @@ namespace BlackMisc
s += BlackMisc::boolToOnOff(m_on);
return s;
}
} // namespace
} // namespace

7
src/blackmisc/aviation/aircraftengine.h
View File

@@ -9,8 +9,8 @@
//! \file
#ifndef BLACKMISC_AIRCRAFTENGINES_H
#define BLACKMISC_AIRCRAFTENGINES_H
#ifndef BLACKMISC_AVIATION_AIRCRAFTENGINES_H
#define BLACKMISC_AVIATION_AIRCRAFTENGINES_H
#include "blackmisc/valueobject.h"
@@ -54,11 +54,10 @@ namespace BlackMisc
} // namespace
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftEngine)
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftEngine, (
attr(o.m_number, flags<DisabledForJson>()),
attr(o.m_on, "on")
))
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftEngine)
#endif // guard

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

@@ -13,6 +13,7 @@ namespace BlackMisc
{
namespace Aviation
{
CAircraftEngineList::CAircraftEngineList(std::initializer_list<bool> enginesOnOff)
{
int no = 1; // engines 1 based
@@ -74,5 +75,6 @@ namespace BlackMisc
qDBusRegisterMetaType<CAircraftEngineList>();
registerMetaValueType<CAircraftEngineList>();
}
} // namespace
} // namespace

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

@@ -9,8 +9,8 @@
//! \file
#ifndef BLACKMISC_AIRCRAFTENGINELIST_H
#define BLACKMISC_AIRCRAFTENGINELIST_H
#ifndef BLACKMISC_AVIATION_AIRCRAFTENGINELIST_H
#define BLACKMISC_AVIATION_AIRCRAFTENGINELIST_H
#include "aircraftengine.h"
#include "blackmisc/collection.h"

3
src/blackmisc/avaircrafticao.cpp → src/blackmisc/aviation/aircrafticao.cpp
View File

@@ -7,7 +7,7 @@
* contained in the LICENSE file.
*/
#include "avaircrafticao.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/variant.h"
@@ -19,6 +19,7 @@ namespace BlackMisc
{
namespace Aviation
{
QString CAircraftIcao::convertToQString(bool i18n) const
{
Q_UNUSED(i18n);

21
src/blackmisc/avaircrafticao.h → src/blackmisc/aviation/aircrafticao.h
View File

@@ -9,19 +9,17 @@
//! \file
#ifndef BLACKMISC_AIRCRAFTICAO_H
#define BLACKMISC_AIRCRAFTICAO_H
#ifndef BLACKMISC_AVIATION_AIRCRAFTICAO_H
#define BLACKMISC_AVIATION_AIRCRAFTICAO_H
#include "propertyindex.h"
#include "blackmiscfreefunctions.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/blackmiscfreefunctions.h"
namespace BlackMisc
{
namespace Aviation
{
/*!
* Value object for ICAO classification
*/
//! Value object for ICAO classification
class CAircraftIcao : public CValueObject<CAircraftIcao>
{
public:
@@ -169,7 +167,14 @@ namespace BlackMisc
} // namespace
} // namespace
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftIcao, (o.m_aircraftDesignator, o.m_aircraftCombinedType, o.m_airlineDesignator, o.m_livery, o.m_aircraftColor))
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftIcao)
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftIcao, (
o.m_aircraftDesignator,
o.m_aircraftCombinedType,
o.m_airlineDesignator,
o.m_livery,
o.m_aircraftColor
))
#endif // guard

1
src/blackmisc/aviation/aircraftlights.cpp
View File

@@ -16,6 +16,7 @@ namespace BlackMisc
{
namespace Aviation
{
CAircraftLights::CAircraftLights(bool strobeOn, bool landingOn, bool taxiOn, bool beaconOn, bool navOn, bool logoOn)
: m_strobeOn(strobeOn), m_landingOn(landingOn), m_taxiOn(taxiOn), m_beaconOn(beaconOn), m_navOn(navOn), m_logoOn(logoOn)
{ }

7
src/blackmisc/aviation/aircraftlights.h
View File

@@ -9,8 +9,8 @@
//! \file
#ifndef BLACKMISC_AIRCRAFTLIGHTS_H
#define BLACKMISC_AIRCRAFTLIGHTS_H
#ifndef BLACKMISC_AVIATION_AIRCRAFTLIGHTS_H
#define BLACKMISC_AVIATION_AIRCRAFTLIGHTS_H
#include "blackmisc/valueobject.h"
#include "blackmisc/propertyindex.h"
@@ -112,6 +112,7 @@ namespace BlackMisc
} // namespace
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftLights)
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftLights, (
attr(o.m_strobeOn, "strobe_on"),
attr(o.m_landingOn, "landing_on"),
@@ -121,6 +122,4 @@ BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftLights, (
attr(o.m_logoOn, "logo_on")
))
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftLights)
#endif // guard

25
src/blackmisc/avaircraftlist.cpp → src/blackmisc/aviation/aircraftlist.cpp
View File

@@ -7,10 +7,10 @@
* contained in the LICENSE file.
*/
#include "avaircraftlist.h"
#include "nwuser.h"
#include "predicates.h"
#include "propertyindexallclasses.h"
#include "blackmisc/aviation/aircraftlist.h"
#include "blackmisc/nwuser.h"
#include "blackmisc/predicates.h"
#include "blackmisc/propertyindexallclasses.h"
using namespace BlackMisc;
using namespace BlackMisc::PhysicalQuantities;
@@ -20,21 +20,13 @@ namespace BlackMisc
{
namespace Aviation
{
/*
* Default constructor
*/
CAircraftList::CAircraftList() { }
/*
* Construct from base class object
*/
CAircraftList::CAircraftList(const CSequence<CAircraft> &other) :
CSequence<CAircraft>(other)
{ }
/*
* Register metadata
*/
void CAircraftList::registerMetadata()
{
qRegisterMetaType<BlackMisc::CSequence<CAircraft>>();
@@ -46,17 +38,11 @@ namespace BlackMisc
registerMetaValueType<CAircraftList>();
}
/*
* All pilots
*/
CUserList CAircraftList::getPilots() const
{
return this->findBy(Predicates::MemberValid(&CAircraft::getPilot)).transform(Predicates::MemberTransform(&CAircraft::getPilot));
}
/*
* Merge with aircraft
*/
bool CAircraftList::updateWithVatsimDataFileData(CAircraft &aircraftToBeUpdated) const
{
if (this->isEmpty()) return false;
@@ -78,5 +64,6 @@ namespace BlackMisc
aircraftToBeUpdated.setIcaoInfo(icao);
return true;
}
} // namespace
} // namespace

18
src/blackmisc/avaircraftlist.h → src/blackmisc/aviation/aircraftlist.h
View File

@@ -9,16 +9,16 @@
//! \file
#ifndef BLACKMISC_AIRCRAFTLIST_H
#define BLACKMISC_AIRCRAFTLIST_H
#ifndef BLACKMISC_AVIATION_AIRCRAFTLIST_H
#define BLACKMISC_AVIATION_AIRCRAFTLIST_H
#include "avaircraft.h"
#include "avcallsignlist.h"
#include "avcallsignobjectlist.h"
#include "geoobjectlist.h"
#include "nwuserlist.h"
#include "collection.h"
#include "propertyindexvariantmap.h"
#include "blackmisc/aviation/aircraft.h"
#include "blackmisc/aviation/callsignlist.h"
#include "blackmisc/aviation/callsignobjectlist.h"
#include "blackmisc/geoobjectlist.h"
#include "blackmisc/nwuserlist.h"
#include "blackmisc/collection.h"
#include "blackmisc/propertyindexvariantmap.h"
#include <QObject>
#include <QString>
#include <QList>

1
src/blackmisc/aviation/aircraftparts.cpp
View File

@@ -13,6 +13,7 @@ namespace BlackMisc
{
namespace Aviation
{
QString CAircraftParts::convertToQString(bool i18n) const
{
QString s;

11
src/blackmisc/aviation/aircraftparts.h
View File

@@ -9,15 +9,15 @@
//! \file
#ifndef BLACKMISC_AIRCRAFTPARTS_H
#define BLACKMISC_AIRCRAFTPARTS_H
#ifndef BLACKMISC_AVIATION_AIRCRAFTPARTS_H
#define BLACKMISC_AVIATION_AIRCRAFTPARTS_H
#include "blackmisc/avcallsign.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/valueobject.h"
#include "blackmisc/timestampbased.h"
#include "blackmisc/propertyindex.h"
#include "aircraftlights.h"
#include "aircraftenginelist.h"
#include "blackmisc/aviation/aircraftlights.h"
#include "blackmisc/aviation/aircraftenginelist.h"
namespace BlackMisc
{
@@ -136,7 +136,6 @@ namespace BlackMisc
} // namespace
} // namespace
// FIXME: Use correct JSON names, when tuple bug is fixed
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftParts, (
attr(o.m_correspondingCallsign, flags < DisabledForJson > ()),
attr(o.m_lights, "lights"),

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

@@ -13,6 +13,7 @@ namespace BlackMisc
{
namespace Aviation
{
CAircraftPartsList::CAircraftPartsList() { }
CAircraftPartsList::CAircraftPartsList(const CSequence<CAircraftParts> &other) :
@@ -29,5 +30,6 @@ namespace BlackMisc
qDBusRegisterMetaType<CAircraftPartsList>();
registerMetaValueType<CAircraftPartsList>();
}
} // namespace
} // namespace

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

@@ -9,12 +9,12 @@
//! \file
#ifndef BLACKMISC_AIRCRAFTPARTSLIST_H
#define BLACKMISC_AIRCRAFTPARTSLIST_H
#ifndef BLACKMISC_AVIATION_AIRCRAFTPARTSLIST_H
#define BLACKMISC_AVIATION_AIRCRAFTPARTSLIST_H
#include "aircraftparts.h"
#include "blackmisc/timestampobjectlist.h"
#include "blackmisc/avcallsignobjectlist.h"
#include "blackmisc/aviation/callsignobjectlist.h"
#include <QDateTime>
namespace BlackMisc

3
src/blackmisc/avaircraftsituation.cpp → src/blackmisc/aviation/aircraftsituation.cpp
View File

@@ -7,7 +7,7 @@
* contained in the LICENSE file.
*/
#include "avaircraftsituation.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/variant.h"
@@ -20,6 +20,7 @@ namespace BlackMisc
{
namespace Aviation
{
QString CAircraftSituation::convertToQString(bool i18n) const
{
QString s(this->m_position.toQString(i18n));

34
src/blackmisc/avaircraftsituation.h → src/blackmisc/aviation/aircraftsituation.h
View File

@@ -9,25 +9,23 @@
//! \file
#ifndef BLACKMISC_AIRCRAFTSITUATION_H
#define BLACKMISC_AIRCRAFTSITUATION_H
#ifndef BLACKMISC_AVIATION_AIRCRAFTSITUATION_H
#define BLACKMISC_AVIATION_AIRCRAFTSITUATION_H
#include "coordinategeodetic.h"
#include "timestampbased.h"
#include "avaltitude.h"
#include "avheading.h"
#include "avcallsign.h"
#include "pqspeed.h"
#include "valueobject.h"
#include "blackmisc/coordinategeodetic.h"
#include "blackmisc/timestampbased.h"
#include "blackmisc/aviation/altitude.h"
#include "blackmisc/aviation/heading.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/pqspeed.h"
#include "blackmisc/valueobject.h"
#include <QDateTime>
namespace BlackMisc
{
namespace Aviation
{
/*!
* Value object encapsulating information of an aircraft's situation
*/
//! Value object encapsulating information of an aircraft's situation
class CAircraftSituation :
public CValueObject<CAircraftSituation>,
public Geo::ICoordinateGeodetic, public BlackMisc::ITimestampBased
@@ -161,7 +159,17 @@ namespace BlackMisc
} // namespace
} // namespace
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftSituation, (o.m_correspondingCallsign, o.m_position, o.m_altitude, o.m_heading, o.m_pitch, o.m_bank, o.m_groundspeed, o.m_timestampMSecsSinceEpoch))
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftSituation, (
o.m_correspondingCallsign,
o.m_position,
o.m_altitude,
o.m_heading,
o.m_pitch,
o.m_bank,
o.m_groundspeed,
o.m_timestampMSecsSinceEpoch
))
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftSituation)
#endif // guard

5
src/blackmisc/avaircraftsituationlist.cpp → src/blackmisc/aviation/aircraftsituationlist.cpp
View File

@@ -7,8 +7,8 @@
* contained in the LICENSE file.
*/
#include "avaircraftsituationlist.h"
#include "predicates.h"
#include "blackmisc/aviation/aircraftsituationlist.h"
#include "blackmisc/predicates.h"
using namespace BlackMisc::PhysicalQuantities;
@@ -16,6 +16,7 @@ namespace BlackMisc
{
namespace Aviation
{
CAircraftSituationList::CAircraftSituationList()
{ }

12
src/blackmisc/avaircraftsituationlist.h → src/blackmisc/aviation/aircraftsituationlist.h
View File

@@ -9,13 +9,13 @@
//! \file
#ifndef BLACKMISC_AVAIRCRAFTSITUATIONLIST_H
#define BLACKMISC_AVAIRCRAFTSITUATIONLIST_H
#ifndef BLACKMISC_AVIATION_AIRCRAFTSITUATIONLIST_H
#define BLACKMISC_AVIATION_AIRCRAFTSITUATIONLIST_H
#include "avaircraftsituation.h"
#include "timestampobjectlist.h"
#include "avcallsignobjectlist.h"
#include "sequence.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/timestampobjectlist.h"
#include "blackmisc/aviation/callsignobjectlist.h"
#include "blackmisc/sequence.h"
namespace BlackMisc
{

30
src/blackmisc/avairport.cpp → src/blackmisc/aviation/airport.cpp
View File

@@ -7,10 +7,10 @@
* contained in the LICENSE file.
*/
#include "avairport.h"
#include "blackmiscfreefunctions.h"
#include "propertyindex.h"
#include "variant.h"
#include "blackmisc/aviation/airport.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/variant.h"
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo;
@@ -19,36 +19,22 @@ namespace BlackMisc
{
namespace Aviation
{
/*
* Constructor
*/
CAirport::CAirport()
{ }
/*
* Constructor
*/
CAirport::CAirport(const QString &icao) :
m_icao(icao)
{ }
/*
* Constructor
*/
CAirport::CAirport(const CAirportIcao &icao, const BlackMisc::Geo::CCoordinateGeodetic &position) :
m_icao(icao), m_position(position)
{ }
/*
* Constructor
*/
CAirport::CAirport(const CAirportIcao &icao, const BlackMisc::Geo::CCoordinateGeodetic &position, const QString &descriptiveName) :
m_icao(icao), m_descriptiveName(descriptiveName), m_position(position)
{ }
/*
* Convert to string
*/
QString CAirport::convertToQString(bool i18n) const
{
QString s = i18n ?
@@ -65,9 +51,6 @@ namespace BlackMisc
(void)QT_TRANSLATE_NOOP("Aviation", "ATC station");
}
/*
* Property by index
*/
CVariant CAirport::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
{
if (index.isMyself()) { return this->toCVariant(); }
@@ -93,9 +76,6 @@ namespace BlackMisc
}
}
/*
* Set property as index
*/
void CAirport::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
{
if (index.isMyself())

23
src/blackmisc/avairport.h → src/blackmisc/aviation/airport.h
View File

@@ -9,20 +9,18 @@
//! \file
#ifndef BLACKMISC_AIRPORT_H
#define BLACKMISC_AIRPORT_H
#ifndef BLACKMISC_AVIATION_AIRPORT_H
#define BLACKMISC_AVIATION_AIRPORT_H
#include "avairporticao.h"
#include "coordinategeodetic.h"
#include "propertyindex.h"
#include "blackmisc/aviation/airporticao.h"
#include "blackmisc/coordinategeodetic.h"
#include "blackmisc/propertyindex.h"
namespace BlackMisc
{
namespace Aviation
{
/*!
* Value object encapsulating information about an airpot.
*/
//! Value object encapsulating information about an airpot.
class CAirport : public CValueObject<CAirport>, public Geo::ICoordinateWithRelativePosition
{
public:
@@ -116,7 +114,14 @@ namespace BlackMisc
} // namespace
} // namespace
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAirport, (o.m_icao, o.m_descriptiveName, o.m_position, o.m_distanceToOwnAircraft, o.m_bearingToOwnAircraft))
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAirport, (
o.m_icao,
o.m_descriptiveName,
o.m_position,
o.m_distanceToOwnAircraft,
o.m_bearingToOwnAircraft
))
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAirport)
#endif // guard

15
src/blackmisc/avairporticao.cpp → src/blackmisc/aviation/airporticao.cpp
View File

@@ -1,29 +1,21 @@
#include "avairporticao.h"
#include "blackmisc/aviation/airporticao.h"
namespace BlackMisc
{
namespace Aviation
{
/*
* Convert to string
*/
QString CAirportIcao::convertToQString(bool /** i18n **/) const
{
return this->m_icaoCode;
}
/*
* Equals callsign?
*/
bool CAirportIcao::equalsString(const QString &icaoCode) const
{
CAirportIcao other(icaoCode);
return other == (*this);
}
/*
* Unify ICAO code
*/
QString CAirportIcao::unifyAirportCode(const QString &icaoCode)
{
QString code = icaoCode.trimmed().toUpper();
@@ -32,9 +24,6 @@ namespace BlackMisc
return (reg.exactMatch(code)) ? code : "";
}
/*
* Valid ICAO designator?
*/
bool CAirportIcao::isValidIcaoDesignator(const QString &icaoCode)
{
QString icao = unifyAirportCode(icaoCode);

8
src/blackmisc/avairporticao.h → src/blackmisc/aviation/airporticao.h
View File

@@ -9,11 +9,11 @@
//! \file
#ifndef BLACKMISC_AIRPORTICAO_H
#define BLACKMISC_AIRPORTICAO_H
#ifndef BLACKMISC_AVIATION_AIRPORTICAO_H
#define BLACKMISC_AVIATION_AIRPORTICAO_H
#include "valueobject.h"
#include "blackmiscfreefunctions.h"
#include "blackmisc/valueobject.h"
#include "blackmisc/blackmiscfreefunctions.h"
namespace BlackMisc
{

20
src/blackmisc/avairportlist.cpp → src/blackmisc/aviation/airportlist.cpp
View File

@@ -3,8 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "avairportlist.h"
#include "predicates.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/predicates.h"
using namespace BlackMisc::PhysicalQuantities;
@@ -12,21 +12,13 @@ namespace BlackMisc
{
namespace Aviation
{
/*
* Empty constructor
*/
CAirportList::CAirportList() { }
/*
* Construct from base class object
*/
CAirportList::CAirportList(const CSequence<CAirport> &other) :
CSequence<CAirport>(other)
{ }
/*
* Register metadata
*/
void CAirportList::registerMetadata()
{
qRegisterMetaType<BlackMisc::CSequence<CAirport>>();
@@ -38,9 +30,6 @@ namespace BlackMisc
registerMetaValueType<CAirportList>();
}
/*
* Find by ICAO
*/
CAirportList CAirportList::findByIcao(const CAirportIcao &icao) const
{
return this->findBy(&CAirport::getIcao, icao);
@@ -52,9 +41,6 @@ namespace BlackMisc
this->replaceOrAdd(&CAirport::getIcao, addedOrReplacedAirport.getIcao(), addedOrReplacedAirport);
}
/*
* Find first by ICAO
*/
CAirport CAirportList::findFirstByIcao(const CAirportIcao &icao, const CAirport &ifNotFound) const
{
return this->findByIcao(icao).frontOrDefault(ifNotFound);

10
src/blackmisc/avairportlist.h → src/blackmisc/aviation/airportlist.h
View File

@@ -9,10 +9,10 @@
//! \file
#ifndef BLACKMISC_AIRPORTLIST_H
#define BLACKMISC_AIRPORTLIST_H
#ifndef BLACKMISC_AVIATION_AIRPORTLIST_H
#define BLACKMISC_AVIATION_AIRPORTLIST_H
#include "blackmisc/avairport.h"
#include "blackmisc/aviation/airport.h"
#include "blackmisc/geoobjectlist.h"
#include "blackmisc/collection.h"
#include "blackmisc/sequence.h"
@@ -25,9 +25,7 @@ namespace BlackMisc
{
namespace Aviation
{
/*!
* Value object for a list of airports.
*/
//! Value object for a list of airports.
class CAirportList :
public CSequence<CAirport>,
public BlackMisc::Geo::IGeoObjectWithRelativePositionList<CAirport, CAirportList>

27
src/blackmisc/avaltitude.cpp → src/blackmisc/aviation/altitude.cpp
View File

@@ -7,9 +7,9 @@
* contained in the LICENSE file.
*/
#include "avaltitude.h"
#include "pqstring.h"
#include "iconlist.h"
#include "blackmisc/aviation/altitude.h"
#include "blackmisc/pqstring.h"
#include "blackmisc/iconlist.h"
using BlackMisc::PhysicalQuantities::CLength;
using BlackMisc::PhysicalQuantities::CLengthUnit;
@@ -19,17 +19,11 @@ namespace BlackMisc
namespace Aviation
{
/*
* Constructor
*/
CAltitude::CAltitude(const QString &altitudeAsString, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode) : CValueObject(0, BlackMisc::PhysicalQuantities::CLengthUnit::m()), m_datum(MeanSeaLevel)
{
this->parseFromString(altitudeAsString, mode);
}
/*
* Own implementation for streaming
*/
QString CAltitude::convertToQString(bool i18n) const
{
if (this->m_datum == FlightLevel)
@@ -48,35 +42,23 @@ namespace BlackMisc
}
}
/*
* To FL
*/
void CAltitude::toFlightLevel()
{
Q_ASSERT(this->m_datum == MeanSeaLevel || this->m_datum == FlightLevel);
this->m_datum = FlightLevel;
}
/*
* To MSL
*/
void CAltitude::toMeanSeaLevel()
{
Q_ASSERT(this->m_datum == MeanSeaLevel || this->m_datum == FlightLevel);
this->m_datum = MeanSeaLevel;
}
/*
* Parse value
*/
void CAltitude::parseFromString(const QString &value)
{
this->parseFromString(value, BlackMisc::PhysicalQuantities::CPqString::SeparatorsCLocale);
}
/*
* Parse value
*/
void CAltitude::parseFromString(const QString &value, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode)
{
QString v = value.trimmed();
@@ -110,9 +92,6 @@ namespace BlackMisc
*this = CAltitude(l, rd);
}
/*
* Icon
*/
CIcon CAltitude::toIcon() const
{
return BlackMisc::CIconList::iconByIndex(CIcons::GeoPosition);

4
src/blackmisc/avaltitude.h → src/blackmisc/aviation/altitude.h
View File

@@ -9,8 +9,8 @@
//! \file
#ifndef BLACKMISC_AVALTITUDE_H
#define BLACKMISC_AVALTITUDE_H
#ifndef BLACKMISC_AVIATION_ALTITUDE_H
#define BLACKMISC_AVIATION_ALTITUDE_H
#include "blackmisc/pqlength.h"

70
src/blackmisc/avatcstation.cpp → src/blackmisc/aviation/atcstation.cpp
View File

@@ -7,13 +7,13 @@
* contained in the LICENSE file.
*/
#include "avatcstation.h"
#include "aviocomsystem.h"
#include "voiceroom.h"
#include "icon.h"
#include "propertyindex.h"
#include "blackmiscfreefunctions.h"
#include "variant.h"
#include "blackmisc/aviation/atcstation.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/voiceroom.h"
#include "blackmisc/icon.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/variant.h"
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo;
@@ -25,25 +25,12 @@ namespace BlackMisc
namespace Aviation
{
/*
* Constructor
*/
CAtcStation::CAtcStation()
{
// void
}
{ }
/*
* Constructor
*/
CAtcStation::CAtcStation(const QString &callsign) : m_callsign(callsign)
{
// void
}
{ }
/*
* Constructor
*/
CAtcStation::CAtcStation(const CCallsign &callsign, const CUser &controller, const CFrequency &frequency, const CCoordinateGeodetic &pos, const CLength &range, bool isOnline,
const QDateTime &bookedFromUtc, const QDateTime &bookedUntilUtc, const CInformationMessage &atis, const CInformationMessage &metar) :
m_callsign(callsign), m_controller(controller), m_frequency(frequency), m_position(pos),
@@ -54,34 +41,22 @@ namespace BlackMisc
this->m_controller.setCallsign(callsign);
}
/*
* METAR
*/
bool CAtcStation::hasMetar() const
{
return this->m_metar.hasMessage();
}
/*
* Suffix
*/
QString CAtcStation::getCallsignSuffix() const
{
return m_callsign.getSuffix();
}
/*
* Callsign
*/
void CAtcStation::setCallsign(const CCallsign &callsign)
{
this->m_callsign = callsign;
this->m_controller.setCallsign(callsign);
}
/*
* Convert to string
*/
QString CAtcStation::convertToQString(bool i18n) const
{
QString s = i18n ?
@@ -184,18 +159,12 @@ namespace BlackMisc
(void)QT_TRANSLATE_NOOP("Network", "voiceroom");
}
/*
* Frequency
*/
void CAtcStation::setFrequency(const CFrequency &frequency)
{
this->m_frequency = frequency;
this->m_frequency.setUnit(CFrequencyUnit::MHz());
}
/*
* SyncronizeControllerData
*/
void CAtcStation::syncronizeControllerData(CAtcStation &otherStation)
{
if (this->m_controller == otherStation.getController()) return;
@@ -204,9 +173,6 @@ namespace BlackMisc
otherStation.setController(otherController);
}
/*
* Booked now
*/
bool CAtcStation::isBookedNow() const
{
if (!this->hasValidBookingTimes()) return false;
@@ -216,9 +182,6 @@ namespace BlackMisc
return true;
}
/*
* When booked?
*/
CTime CAtcStation::bookedWhen() const
{
if (!this->hasValidBookingTimes()) return CTime(-365.0, CTimeUnit::d());
@@ -243,33 +206,21 @@ namespace BlackMisc
}
}
/*
* latitude
*/
const CLatitude &CAtcStation::latitude() const
{
return this->getPosition().latitude();
}
/*
* lomgitude
*/
const CLongitude &CAtcStation::longitude() const
{
return this->getPosition().longitude();
}
/*
* geodetic height
*/
const CLength &CAtcStation::geodeticHeight() const
{
return this->m_position.geodeticHeight();
}
/*
* Property by index
*/
CVariant CAtcStation::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
{
if (index.isMyself()) { return this->toCVariant(); }
@@ -310,9 +261,6 @@ namespace BlackMisc
}
}
/*
* Set property as index
*/
void CAtcStation::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
{
if (index.isMyself()) { this->convertFromCVariant(variant); return; }

42
src/blackmisc/avatcstation.h → src/blackmisc/aviation/atcstation.h
View File

@@ -9,18 +9,18 @@
//! \file
#ifndef BLACKMISC_ATCSTATION_H
#define BLACKMISC_ATCSTATION_H
#ifndef BLACKMISC_AVIATION_ATCSTATION_H
#define BLACKMISC_AVIATION_ATCSTATION_H
#include "voiceroom.h"
#include "aviocomsystem.h"
#include "avinformationmessage.h"
#include "avcallsign.h"
#include "nwuser.h"
#include "coordinategeodetic.h"
#include "pqfrequency.h"
#include "pqlength.h"
#include "pqtime.h"
#include "blackmisc/voiceroom.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/aviation/informationmessage.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/nwuser.h"
#include "blackmisc/coordinategeodetic.h"
#include "blackmisc/pqfrequency.h"
#include "blackmisc/pqlength.h"
#include "blackmisc/pqtime.h"
#include <QDateTime>
#include <QMap>
#include <functional>
@@ -29,9 +29,7 @@ namespace BlackMisc
{
namespace Aviation
{
/*!
* Value object encapsulating information about an ATC station.
*/
//! Value object encapsulating information about an ATC station.
class CAtcStation : public CValueObject<CAtcStation>, public Geo::ICoordinateWithRelativePosition
{
public:
@@ -270,7 +268,21 @@ namespace BlackMisc
} // namespace
} // namespace
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAtcStation, (o.m_callsign, o.m_controller, o.m_frequency, o.m_position, o.m_range, o.m_isOnline, o.m_atis, o.m_bookedFromUtc, o.m_bookedUntilUtc, o.m_metar, o.m_voiceRoom, o.m_distanceToOwnAircraft, o.m_bearingToOwnAircraft))
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAtcStation, (
o.m_callsign,
o.m_controller,
o.m_frequency,
o.m_position,
o.m_range,
o.m_isOnline,
o.m_atis,
o.m_bookedFromUtc,
o.m_bookedUntilUtc,
o.m_metar,
o.m_voiceRoom,
o.m_distanceToOwnAircraft,
o.m_bearingToOwnAircraft
))
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAtcStation)
#endif // guard

5
src/blackmisc/avatcstationlist.cpp → src/blackmisc/aviation/atcstationlist.cpp
View File

@@ -7,8 +7,8 @@
* contained in the LICENSE file.
*/
#include "avatcstationlist.h"
#include "predicates.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/predicates.h"
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Network;
@@ -17,6 +17,7 @@ namespace BlackMisc
{
namespace Aviation
{
CAtcStationList::CAtcStationList() { }
CAtcStationList::CAtcStationList(const CSequence<CAtcStation> &other) :

20
src/blackmisc/avatcstationlist.h → src/blackmisc/aviation/atcstationlist.h
View File

@@ -9,15 +9,15 @@
//! \file
#ifndef BLACKMISC_ATCSTATIONLIST_H
#define BLACKMISC_ATCSTATIONLIST_H
#ifndef BLACKMISC_AVIATION_ATCSTATIONLIST_H
#define BLACKMISC_AVIATION_ATCSTATIONLIST_H
#include "geoobjectlist.h"
#include "nwuserlist.h"
#include "avatcstation.h"
#include "avcallsignobjectlist.h"
#include "collection.h"
#include "sequence.h"
#include "blackmisc/geoobjectlist.h"
#include "blackmisc/nwuserlist.h"
#include "blackmisc/aviation/atcstation.h"
#include "blackmisc/aviation/callsignobjectlist.h"
#include "blackmisc/collection.h"
#include "blackmisc/sequence.h"
#include <QObject>
#include <QString>
#include <QList>
@@ -26,9 +26,7 @@ namespace BlackMisc
{
namespace Aviation
{
/*!
* Value object for a list of ATC stations.
*/
//! Value object for a list of ATC stations.
class CAtcStationList :
public CSequence<CAtcStation>,
public BlackMisc::Aviation::ICallsignObjectList<CAtcStation, CAtcStationList>,

39
src/blackmisc/aviation/aviation.h Normal file
View File

@@ -0,0 +1,39 @@
/* Copyright (C) 2013 VATSIM Community / contributors
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef BLACKMISC_AVIATION_AVIATION_H
#define BLACKMISC_AVIATION_AVIATION_H
/*!
* \namespace BlackMisc::Aviation
* \brief Aviation and Avionics classes such as CHeading or CTransponder .
*/
#include "blackmisc/aviation/altitude.h"
#include "blackmisc/aviation/heading.h"
#include "blackmisc/aviation/adfsystem.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/aviation/navsystem.h"
#include "blackmisc/aviation/transponder.h"
#include "blackmisc/aviation/track.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/callsignlist.h"
#include "blackmisc/aviation/atcstation.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/aircraftlist.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/aviation/aircraftsituationlist.h"
#include "blackmisc/aviation/airport.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/aviation/informationmessage.h"
#include "blackmisc/aviation/selcal.h"
#include "blackmisc/aviation/flightplan.h"
#include "blackmisc/aviation/aircraftengine.h"
#include "blackmisc/aviation/aircraftenginelist.h"
#include "blackmisc/aviation/aircraftlights.h"
#include "blackmisc/aviation/aircraftparts.h"
#include "blackmisc/aviation/aircraftpartslist.h"
#endif // guard

6
src/blackmisc/aviobase.h → src/blackmisc/aviation/avionicsbase.h
View File

@@ -3,8 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef BLACKMISC_AVIOBASE_H
#define BLACKMISC_AVIOBASE_H
#ifndef BLACKMISC_AVIATION_AVIONICSBASE_H
#define BLACKMISC_AVIATION_AVIONICSBASE_H
//! \file
@@ -17,7 +17,7 @@ namespace BlackMisc
namespace Aviation
{
//! \brief Base class for avionics
//! Base class for avionics
class CAvionicsBase : public CValueObject<CAvionicsBase>
{
protected:

4
src/blackmisc/blackmiscfreefunctions_avmeta.cpp → src/blackmisc/aviation/blackmiscfreefunctions_avmeta.cpp
View File

@@ -7,8 +7,8 @@
* contained in the LICENSE file.
*/
#include "blackmiscfreefunctions.h"
#include "avallclasses.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/aviation/aviation.h"
/*
* Metadata for aviation

51
src/blackmisc/avcallsign.cpp → src/blackmisc/aviation/callsign.cpp
View File

@@ -7,25 +7,19 @@
* contained in the LICENSE file.
*/
#include "avcallsign.h"
#include "iconlist.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/iconlist.h"
namespace BlackMisc
{
namespace Aviation
{
/*
* Convert to string
*/
QString CCallsign::convertToQString(bool i18n) const
{
Q_UNUSED(i18n);
return this->m_callsign;
}
/*
* Unify the callsign
*/
QString CCallsign::unifyCallsign(const QString &callsign)
{
QString unified = callsign.toUpper();
@@ -34,9 +28,6 @@ namespace BlackMisc
return unified;
}
/*
* Iconify
*/
const CIcon &CCallsign::convertToIcon(const CCallsign &callsign)
{
if (callsign.hasSuffix())
@@ -67,44 +58,28 @@ namespace BlackMisc
return CIconList::iconByIndex(CIcons::NetworkRoleUnknown);
}
/*
* ATC callsign?
*/
bool CCallsign::isAtcCallsign() const
{
if (!this->hasSuffix()) { return false; }
return atcCallsignSuffixes().contains(this->getSuffix(), Qt::CaseInsensitive);
}
/*
* Supervisor callsign?
*/
bool CCallsign::isSupervisorCallsign() const
{
return this->m_callsign.endsWith("SUP");
}
/*
* ATC callsign?
*/
bool CCallsign::isAtcAlikeCallsign() const
{
if (!this->hasSuffix()) { return false; }
return atcAlikeCallsignSuffixes().contains(this->getSuffix(), Qt::CaseInsensitive);
}
/*
* OBS callsign?
*/
bool CCallsign::isObserverCallsign() const
{
return m_callsignAsSet.endsWith("_OBS", Qt::CaseInsensitive);
}
/*
* Callsign as Observer
*/
QString CCallsign::getAsObserverCallsignString() const
{
if (this->isEmpty()) { return ""; }
@@ -114,9 +89,6 @@ namespace BlackMisc
return obs.append("_OBS").toUpper();
}
/*
* Suffix
*/
QString CCallsign::getSuffix() const
{
QString s;
@@ -127,26 +99,17 @@ namespace BlackMisc
return s;
}
/*
* Suffix?
*/
bool CCallsign::hasSuffix() const
{
return this->getStringAsSet().contains('_');
}
/*
* Equals callsign?
*/
bool CCallsign::equalsString(const QString &callsignString) const
{
CCallsign other(callsignString);
return other == (*this);
}
/*
* Index
*/
CVariant CCallsign::propertyByIndex(const CPropertyIndex &index) const
{
if (index.isMyself()) { return this->toCVariant(); }
@@ -166,9 +129,6 @@ namespace BlackMisc
}
}
/*
* Index
*/
void CCallsign::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index)
{
if (index.isMyself())
@@ -193,9 +153,6 @@ namespace BlackMisc
}
}
/*
* Valid callsign?
*/
bool CCallsign::isValidCallsign(const QString &callsign)
{
// We allow all number callsigns
@@ -204,9 +161,6 @@ namespace BlackMisc
return (regexp.match(callsign).hasMatch());
}
/*
* Suffixes
*/
const QStringList &CCallsign::atcCallsignSuffixes()
{
static const QStringList a( { "APP", "GND", "TWR", "DEL", "CTR" });
@@ -219,6 +173,5 @@ namespace BlackMisc
return a;
}
} // namespace
} // namespace

10
src/blackmisc/avcallsign.h → src/blackmisc/aviation/callsign.h
View File

@@ -9,12 +9,12 @@
//! \file
#ifndef BLACKMISC_CALLSIGN_H
#define BLACKMISC_CALLSIGN_H
#ifndef BLACKMISC_AVIATION_CALLSIGN_H
#define BLACKMISC_AVIATION_CALLSIGN_H
#include "propertyindex.h"
#include "icon.h"
#include "blackmiscfreefunctions.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/icon.h"
#include "blackmisc/blackmiscfreefunctions.h"
namespace BlackMisc
{

6
src/blackmisc/avcallsignlist.cpp → src/blackmisc/aviation/callsignlist.cpp
View File

@@ -7,13 +7,14 @@
* contained in the LICENSE file.
*/
#include "avcallsignlist.h"
#include "predicates.h"
#include "blackmisc/aviation/callsignlist.h"
#include "blackmisc/predicates.h"
namespace BlackMisc
{
namespace Aviation
{
CCallsignList::CCallsignList() { }
CCallsignList::CCallsignList(const CCollection<CCallsign> &other) :
@@ -30,5 +31,6 @@ namespace BlackMisc
qDBusRegisterMetaType<CCallsignList>();
registerMetaValueType<CCallsignList>();
}
} // namespace
} // namespace

10
src/blackmisc/avcallsignlist.h → src/blackmisc/aviation/callsignlist.h
View File

@@ -9,12 +9,12 @@
//! \file
#ifndef BLACKMISC_CALLSIGNLIST_H
#define BLACKMISC_CALLSIGNLIST_H
#ifndef BLACKMISC_AVIATION_CALLSIGNLIST_H
#define BLACKMISC_AVIATION_CALLSIGNLIST_H
#include "avcallsign.h"
#include "collection.h"
#include "sequence.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/collection.h"
#include "blackmisc/sequence.h"
#include <QObject>
namespace BlackMisc

8
src/blackmisc/avcallsignobjectlist.cpp → src/blackmisc/aviation/callsignobjectlist.cpp
View File

@@ -7,11 +7,11 @@
* contained in the LICENSE file.
*/
#include "blackmisc/avcallsignobjectlist.h"
#include "blackmisc/aviation/callsignobjectlist.h"
#include "blackmisc/predicates.h"
#include "blackmisc/avatcstationlist.h"
#include "blackmisc/avaircraftlist.h"
#include "blackmisc/avaircraftsituationlist.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/aircraftlist.h"
#include "blackmisc/aviation/aircraftsituationlist.h"
#include "blackmisc/aviation/aircraftpartslist.h"
#include "blackmisc/nwclientlist.h"
#include "blackmisc/simulation/simulatedaircraftlist.h"

6
src/blackmisc/avcallsignobjectlist.h → src/blackmisc/aviation/callsignobjectlist.h
View File

@@ -9,12 +9,12 @@
//! \file
#ifndef BLACKMISC_CALLSIGNOBJECTLIST_H
#define BLACKMISC_CALLSIGNOBJECTLIST_H
#ifndef BLACKMISC_AVIATION_CALLSIGNOBJECTLIST_H
#define BLACKMISC_AVIATION_CALLSIGNOBJECTLIST_H
#include "blackmisc/collection.h"
#include "blackmisc/sequence.h"
#include "blackmisc/avcallsignlist.h"
#include "blackmisc/aviation/callsignlist.h"
#include "blackmisc/propertyindexlist.h"
#include "blackmisc/propertyindexvariantmap.h"
#include <QList>

27
src/blackmisc/aviocomsystem.cpp → src/blackmisc/aviation/comsystem.cpp
View File

@@ -8,7 +8,7 @@
*/
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/aviocomsystem.h"
#include "blackmisc/aviation/comsystem.h"
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Math;
@@ -17,9 +17,7 @@ namespace BlackMisc
{
namespace Aviation
{
/*
* Valid values?
*/
bool CComSystem::validValues() const
{
if (this->isDefaultValue()) return true; // special case
@@ -30,27 +28,18 @@ namespace BlackMisc
CComSystem::isValidMilitaryFrequency(this->getFrequencyStandby()));
}
/*
* COM frequency
*/
void CComSystem::setFrequencyActiveMHz(double frequencyMHz)
{
CFrequency f(frequencyMHz, CFrequencyUnit::MHz());
this->setFrequencyActive(f);
}
/*
* COM frequency
*/
void CComSystem::setFrequencyStandbyMHz(double frequencyMHz)
{
CFrequency f(frequencyMHz, CFrequencyUnit::MHz());
this->setFrequencyStandby(f);
}
/*
* COM frequency
*/
void CComSystem::setFrequencyActive(const CFrequency &frequency)
{
if (frequency == this->getFrequencyActive()) { return; } // save all the comparisons / rounding
@@ -59,9 +48,6 @@ namespace BlackMisc
this->CModulator::setFrequencyActive(fRounded);
}
/*
* COM frequency
*/
void CComSystem::setFrequencyStandby(const CFrequency &frequency)
{
if (frequency == this->getFrequencyStandby()) { return; } // save all the comparisons / rounding
@@ -70,9 +56,6 @@ namespace BlackMisc
this->CModulator::setFrequencyStandby(fRounded);
}
/*
* Round to channel spacing
*/
void CComSystem::roundToChannelSpacing(PhysicalQuantities::CFrequency &frequency, ChannelSpacing channelSpacing)
{
double channelSpacingKHz = CComSystem::channelSpacingToFrequencyKHz(channelSpacing);
@@ -86,9 +69,6 @@ namespace BlackMisc
frequency.setCurrentUnitValue(down ? f1 : f2);
}
/*
* Within channel spacing
*/
bool CComSystem::isWithinChannelSpacing(const CFrequency &setFrequency, const CFrequency &compareFrequency, CComSystem::ChannelSpacing channelSpacing)
{
if (setFrequency == compareFrequency) return true; // shortcut for many of such comparisons
@@ -99,9 +79,6 @@ namespace BlackMisc
(setFrequencyKHz + channelSpacingKHz > compareFrequencyKHz);
}
/*
* Helper, give me number for channels spacing
*/
double CComSystem::channelSpacingToFrequencyKHz(ChannelSpacing channelSpacing)
{
switch (channelSpacing)

8
src/blackmisc/aviocomsystem.h → src/blackmisc/aviation/comsystem.h
View File

@@ -9,10 +9,10 @@
//! \file
#ifndef BLACKMISC_AVIOCOMSYSTEM_H
#define BLACKMISC_AVIOCOMSYSTEM_H
#ifndef BLACKMISC_AVIATION_COMSYSTEM_H
#define BLACKMISC_AVIATION_COMSYSTEM_H
#include "blackmisc/aviomodulator.h"
#include "blackmisc/aviation/modulator.h"
namespace BlackMisc
{
@@ -176,4 +176,4 @@ namespace BlackMisc
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CComSystem, (o.m_channelSpacing))
Q_DECLARE_METATYPE(BlackMisc::Aviation::CComSystem)
#endif // include guard
#endif // guard

4
src/blackmisc/avflightplan.cpp → src/blackmisc/aviation/flightplan.cpp
View File

@@ -7,8 +7,8 @@
* contained in the LICENSE file.
*/
#include "avflightplan.h"
#include "iconlist.h"
#include "blackmisc/aviation/flightplan.h"
#include "blackmisc/iconlist.h"
namespace BlackMisc
{

40
src/blackmisc/avflightplan.h → src/blackmisc/aviation/flightplan.h
View File

@@ -9,29 +9,25 @@
//! \file
#ifndef BLACKMISC_AVFLIGHTPLAN_H
#define BLACKMISC_AVFLIGHTPLAN_H
#ifndef BLACKMISC_AVIATION_FLIGHTPLAN_H
#define BLACKMISC_AVIATION_FLIGHTPLAN_H
#include "valueobject.h"
#include "avaltitude.h"
#include "avairporticao.h"
#include "pqtime.h"
#include "pqspeed.h"
#include "blackmisc/valueobject.h"
#include "blackmisc/aviation/altitude.h"
#include "blackmisc/aviation/airporticao.h"
#include "blackmisc/pqtime.h"
#include "blackmisc/pqspeed.h"
#include <QDateTime>
namespace BlackMisc
{
namespace Aviation
{
/*!
* Value object for a flight plan
*/
//! Value object for a flight plan
class CFlightPlan : public CValueObject<CFlightPlan>
{
public:
/*!
* Flight rules (VFR or IFR)
*/
//! Flight rules (VFR or IFR)
enum FlightRules
{
VFR = 0, //!< Visual flight rules
@@ -210,7 +206,21 @@ namespace BlackMisc
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Aviation::CFlightPlan)
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CFlightPlan, (o.m_equipmentIcao, o.m_originAirportIcao, o.m_destinationAirportIcao, o.m_alternateAirportIcao,
o.m_takeoffTimePlanned, o.m_takeoffTimeActual, o.m_enrouteTime, o.m_fuelTime, o.m_cruiseAltitude, o.m_cruiseTrueAirspeed, o.m_flightRules, o.m_route, o.m_remarks, o.m_lastSentOrLoaded))
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CFlightPlan, (
o.m_equipmentIcao,
o.m_originAirportIcao,
o.m_destinationAirportIcao,
o.m_alternateAirportIcao,
o.m_takeoffTimePlanned,
o.m_takeoffTimeActual,
o.m_enrouteTime,
o.m_fuelTime,
o.m_cruiseAltitude,
o.m_cruiseTrueAirspeed,
o.m_flightRules,
o.m_route,
o.m_remarks,
o.m_lastSentOrLoaded
))
#endif // guard

7
src/blackmisc/avheading.cpp → src/blackmisc/aviation/heading.cpp
View File

@@ -7,8 +7,8 @@
* contained in the LICENSE file.
*/
#include "blackmiscfreefunctions.h"
#include "avheading.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/aviation/heading.h"
using BlackMisc::PhysicalQuantities::CAngle;
using BlackMisc::PhysicalQuantities::CAngleUnit;
@@ -18,9 +18,6 @@ namespace BlackMisc
namespace Aviation
{
/*
* Own implementation for streaming
*/
QString CHeading::convertToQString(bool i18n) const
{
QString s = CAngle::convertToQString(i18n).append(" ");

8
src/blackmisc/avheading.h → src/blackmisc/aviation/heading.h
View File

@@ -9,8 +9,8 @@
//! \file
#ifndef BLACKMISC_AVHEADING_H
#define BLACKMISC_AVHEADING_H
#ifndef BLACKMISC_AVIATION_HEADING_H
#define BLACKMISC_AVIATION_HEADING_H
#include "blackmisc/pqangle.h"
@@ -37,9 +37,7 @@ namespace BlackMisc
class CHeading : public CValueObject<CHeading, PhysicalQuantities::CAngle>
{
public:
/*!
* Enum type to distinguish between true north and magnetic north
*/
//! Enum type to distinguish between true north and magnetic north
enum ReferenceNorth
{
Magnetic = 0, //!< magnetic north

12
src/blackmisc/avinformationmessage.cpp → src/blackmisc/aviation/informationmessage.cpp
View File

@@ -7,24 +7,19 @@
* contained in the LICENSE file.
*/
#include "avinformationmessage.h"
#include "blackmiscfreefunctions.h"
#include "blackmisc/aviation/informationmessage.h"
#include "blackmisc/blackmiscfreefunctions.h"
namespace BlackMisc
{
namespace Aviation
{
/*
* Convert to string
*/
QString CInformationMessage::convertToQString(bool /** i18n **/) const
{
return this->m_message;
}
/*
* Type as string
*/
const QString &CInformationMessage::getTypeAsString() const
{
switch (this->m_type)
@@ -51,5 +46,6 @@ namespace BlackMisc
}
}
}
} // namespace
} // namespace

24
src/blackmisc/avinformationmessage.h → src/blackmisc/aviation/informationmessage.h
View File

@@ -9,11 +9,11 @@
//! \file
#ifndef BLACKMISC_INFORMATIONMESSAGE_H
#define BLACKMISC_INFORMATIONMESSAGE_H
#ifndef BLACKMISC_AVIATION_INFORMATIONMESSAGE_H
#define BLACKMISC_AVIATION_INFORMATIONMESSAGE_H
#include "valueobject.h"
#include "blackmiscfreefunctions.h"
#include "blackmisc/valueobject.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include <QString>
#include <QDateTime>
@@ -21,10 +21,7 @@ namespace BlackMisc
{
namespace Aviation
{
/*!
* Value object encapsulating information message.
* ATIS, METAR, TAF
*/
//! Value object encapsulating information message (ATIS, METAR, TAF)
class CInformationMessage : public CValueObject<CInformationMessage>
{
public:
@@ -46,9 +43,7 @@ namespace BlackMisc
//! Information message of type
explicit CInformationMessage(InformationType type) : m_type(type) {}
/*!
* Information message of type
*/
//! Information message of type
CInformationMessage(InformationType type, const QString &message)
: m_type(type), m_message(message)
{}
@@ -107,7 +102,12 @@ namespace BlackMisc
} // namespace
} // namespace
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CInformationMessage, (o.m_type, o.m_message, o.m_receivedTimestamp))
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CInformationMessage, (
o.m_type,
o.m_message,
o.m_receivedTimestamp
))
Q_DECLARE_METATYPE(BlackMisc::Aviation::CInformationMessage)
#endif // guard

27
src/blackmisc/aviomodulator.cpp → src/blackmisc/aviation/modulator.cpp
View File

@@ -7,10 +7,10 @@
* contained in the LICENSE file.
*/
#include "blackmisc/aviomodulator.h"
#include "blackmisc/aviocomsystem.h"
#include "blackmisc/avionavsystem.h"
#include "blackmisc/avioadfsystem.h"
#include "blackmisc/aviation/modulator.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/aviation/navsystem.h"
#include "blackmisc/aviation/adfsystem.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/variant.h"
@@ -22,20 +22,17 @@ namespace BlackMisc
{
namespace Aviation
{
/*
* Toggle standby <-> active
*/
template <class AVIO> void CModulator<AVIO>::toggleActiveStandby()
template <class AVIO>
void CModulator<AVIO>::toggleActiveStandby()
{
CFrequency a = this->m_frequencyActive;
this->m_frequencyActive = this->m_frequencyStandby;
this->m_frequencyStandby = a;
}
/*
* Property by index
*/
template <class AVIO> CVariant CModulator<AVIO>::propertyByIndex(const CPropertyIndex &index) const
template <class AVIO>
CVariant CModulator<AVIO>::propertyByIndex(const CPropertyIndex &index) const
{
if (index.isMyself()) { return this->toCVariant(); }
ColumnIndex i = index.frontCasted<ColumnIndex>();
@@ -56,10 +53,8 @@ namespace BlackMisc
}
}
/*
* Property by index
*/
template <class AVIO> void CModulator<AVIO>::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index)
template <class AVIO>
void CModulator<AVIO>::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index)
{
if (index.isMyself())
{

18
src/blackmisc/aviomodulator.h → src/blackmisc/aviation/modulator.h
View File

@@ -9,11 +9,11 @@
//! \file
#ifndef BLACKMISC_AVIOMODULATORUNIT_H
#define BLACKMISC_AVIOMODULATORUNIT_H
#ifndef BLACKMISC_AVIATION_MODULATORUNIT_H
#define BLACKMISC_AVIATION_MODULATORUNIT_H
#include "blackmisc/propertyindex.h"
#include "blackmisc/aviobase.h"
#include "blackmisc/aviation/avionicsbase.h"
#include "blackmisc/mathematics.h"
#include "blackmisc/blackmiscfreefunctions.h"
@@ -22,9 +22,7 @@ namespace BlackMisc
namespace Aviation
{
/*!
* Base class for COM, NAV, Squawk units.
*/
//! Base class for COM, NAV, Squawk units.
template <class AVIO> class CModulator : public CValueObject<CModulator<AVIO>, CAvionicsBase>
{
public:
@@ -220,6 +218,12 @@ namespace BlackMisc
}
}
BLACK_DECLARE_TUPLE_CONVERSION_TEMPLATE(BlackMisc::Aviation::CModulator, (o.m_frequencyActive, o.m_frequencyStandby, o.m_volumeInput , o.m_volumeOutput, o.m_enabled))
BLACK_DECLARE_TUPLE_CONVERSION_TEMPLATE(BlackMisc::Aviation::CModulator, (
o.m_frequencyActive,
o.m_frequencyStandby,
o.m_volumeInput ,
o.m_volumeOutput,
o.m_enabled
))
#endif // guard

6
src/blackmisc/avionavsystem.h → src/blackmisc/aviation/navsystem.h
View File

@@ -9,10 +9,10 @@
//! \file
#ifndef BLACKMISC_AVIONAVSYSTEM_H
#define BLACKMISC_AVIONAVSYSTEM_H
#ifndef BLACKMISC_AVIATION_NAVSYSTEM_H
#define BLACKMISC_AVIATION_NAVSYSTEM_H
#include "blackmisc/aviomodulator.h"
#include "blackmisc/aviation/modulator.h"
namespace BlackMisc
{

27
src/blackmisc/avselcal.cpp → src/blackmisc/aviation/selcal.cpp
View File

@@ -7,7 +7,7 @@
* contained in the LICENSE file.
*/
#include "avselcal.h"
#include "blackmisc/aviation/selcal.h"
using namespace BlackMisc::PhysicalQuantities;
@@ -15,29 +15,21 @@ namespace BlackMisc
{
namespace Aviation
{
QList<CFrequency> CSelcal::frequencyEquivalents = QList<CFrequency>();
QStringList CSelcal::allCodePairs = QStringList();
/*
* Convert to string
*/
QString CSelcal::convertToQString(bool /** i18n **/) const
{
return this->m_code;
}
/*
* Equals code?
*/
bool CSelcal::equalsString(const QString &code) const
{
if (code.isEmpty()) return false;
return (this->m_code.compare(code, Qt::CaseInsensitive) == 0);
}
/*
* SELCAL code frequencies
*/
QList<CFrequency> CSelcal::getFrequencies() const
{
QList<CFrequency> f;
@@ -49,26 +41,17 @@ namespace BlackMisc
return f;
}
/*
* Valid characters
*/
const QString &CSelcal::validCharacters()
{
static const QString valid = "ABCDEFGHJKLMPQRS";
return valid;
}
/*
* Valid character?
*/
bool CSelcal::isValidCharacter(QChar c)
{
return CSelcal::validCharacters().contains(c.toUpper());
}
/*
* Valid code
*/
bool CSelcal::isValidCode(const QString &code)
{
if (code.length() != 4) return false;
@@ -83,9 +66,6 @@ namespace BlackMisc
return true;
}
/*
* Character to frequency equivalent
*/
const PhysicalQuantities::CFrequency &CSelcal::audioFrequencyEquivalent(QChar c)
{
if (CSelcal::frequencyEquivalents.isEmpty())
@@ -116,9 +96,6 @@ namespace BlackMisc
return CSelcal::frequencyEquivalents.at(pos);
}
/*
* Code pairs
*/
const QStringList &CSelcal::codePairs()
{
if (CSelcal::allCodePairs.isEmpty())

6
src/blackmisc/avselcal.h → src/blackmisc/aviation/selcal.h
View File

@@ -9,11 +9,11 @@
//! \file
#ifndef BLACKMISC_SELCAL_H
#define BLACKMISC_SELCAL_H
#ifndef BLACKMISC_AVIATION_SELCAL_H
#define BLACKMISC_AVIATION_SELCAL_H
#include "blackmisc/pqfrequency.h"
#include "valueobject.h"
#include "blackmisc/valueobject.h"
namespace BlackMisc
{

8
src/blackmisc/avtrack.cpp → src/blackmisc/aviation/track.cpp
View File

@@ -3,8 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "blackmiscfreefunctions.h"
#include "avtrack.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/aviation/track.h"
using BlackMisc::PhysicalQuantities::CAngle;
using BlackMisc::PhysicalQuantities::CAngleUnit;
@@ -13,9 +13,7 @@ namespace BlackMisc
{
namespace Aviation
{
/*
* Own implementation for streaming
*/
QString CTrack::convertToQString(bool i18n) const
{
QString s = CAngle::convertToQString(i18n).append(" ");

4
src/blackmisc/avtrack.h → src/blackmisc/aviation/track.h
View File

@@ -9,8 +9,8 @@
//! \file
#ifndef BLACKMISC_AVTRACK_H
#define BLACKMISC_AVTRACK_H
#ifndef BLACKMISC_AVIATION_TRACK_H
#define BLACKMISC_AVIATION_TRACK_H
#include "blackmisc/pqangle.h"

33
src/blackmisc/aviotransponder.cpp → src/blackmisc/aviation/transponder.cpp
View File

@@ -7,7 +7,7 @@
* contained in the LICENSE file.
*/
#include "blackmisc/aviotransponder.h"
#include "blackmisc/aviation/transponder.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/variant.h"
@@ -17,9 +17,6 @@ namespace BlackMisc
namespace Aviation
{
/*
* Valid values?
*/
bool CTransponder::validValues() const
{
if (this->isDefaultValue()) return true; // special case
@@ -45,9 +42,6 @@ namespace BlackMisc
}
}
/*
* String representation
*/
QString CTransponder::convertToQString(bool /* i18n */) const
{
QString s = this->getName();
@@ -55,9 +49,6 @@ namespace BlackMisc
return s;
}
/*
* Mode as readable string
*/
CTransponder::TransponderMode CTransponder::modeFromString(const QString &modeString)
{
if (modeString.startsWith("I", Qt::CaseInsensitive)) return StateIdent;
@@ -73,9 +64,6 @@ namespace BlackMisc
return StateStandby;
}
/*
* Formatted transponder code
*/
QString CTransponder::getTransponderCodeFormatted() const
{
QString f("0000");
@@ -83,9 +71,6 @@ namespace BlackMisc
return f.right(4);
}
/*
* Formatted transponder code + mode
*/
QString CTransponder::getTransponderCodeAndModeFormatted() const
{
QString s = this->getTransponderCodeFormatted();
@@ -93,9 +78,6 @@ namespace BlackMisc
return s;
}
/*
* Transponder by string
*/
void CTransponder::setTransponderCode(const QString &transponderCode)
{
if (CTransponder::isValidTransponderCode(transponderCode))
@@ -109,9 +91,6 @@ namespace BlackMisc
}
}
/*
* Valid code?
*/
bool CTransponder::isValidTransponderCode(const QString &transponderCode)
{
if (transponderCode.isEmpty() || transponderCode.length() > 4) return false;
@@ -123,18 +102,12 @@ namespace BlackMisc
return rx.exactMatch(transponderCode);
}
/*
* Valid code?
*/
bool CTransponder::isValidTransponderCode(qint32 transponderCode)
{
if (transponderCode < 0 || transponderCode > 7777) return false;
return CTransponder::isValidTransponderCode(QString::number(transponderCode));
}
/*
* Mode as readable string
*/
const QString &CTransponder::modeAsString(CTransponder::TransponderMode mode)
{
static QString m;
@@ -173,9 +146,6 @@ namespace BlackMisc
return m;
}
/*
* Property
*/
CVariant CTransponder::propertyByIndex(const CPropertyIndex &index) const
{
if (index.isMyself()) { return this->toCVariant(); }
@@ -234,5 +204,6 @@ namespace BlackMisc
break;
}
}
} // namespace
} // namespace

16
src/blackmisc/aviotransponder.h → src/blackmisc/aviation/transponder.h
View File

@@ -9,18 +9,16 @@
//! \file
#ifndef BLACKMISC_AVIOTRANSPONDER_H
#define BLACKMISC_AVIOTRANSPONDER_H
#ifndef BLACKMISC_AVIATION_TRANSPONDER_H
#define BLACKMISC_AVIATION_TRANSPONDER_H
#include "blackmisc/aviobase.h"
#include "blackmisc/aviation/avionicsbase.h"
namespace BlackMisc
{
namespace Aviation
{
/*!
* Transponder
*/
//! Transponder
class CTransponder : public CValueObject<CTransponder, CAvionicsBase>
{
public:
@@ -179,7 +177,11 @@ namespace BlackMisc
}
}
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CTransponder, (o.m_transponderCode, o.m_transponderMode))
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CTransponder, (
o.m_transponderCode,
o.m_transponderMode
))
Q_DECLARE_METATYPE(BlackMisc::Aviation::CTransponder)
#endif // guard

5
src/blackmisc/blackmisc.h
View File

@@ -18,11 +18,6 @@
* \brief Base and utility classes available in all other projects.
*/
/*!
* \namespace BlackMisc::Aviation
* \brief Aviation and Avionics classes such as CHeading or CTransponder .
*/
/*!
* \namespace BlackMisc::Math
* \brief Math classes such as vectors, matrices, and utility methods.

6
src/blackmisc/blackmisc.pro
View File

@@ -24,12 +24,14 @@ TRANSLATIONS += translations/blackmisc_i18n_de.ts \
translations/blackmisc_i18n_en.ts
HEADERS += *.h \
$$PWD/aviation/*.h \
$$PWD/simulation/*.h \
$$PWD/aviation/*.h
SOURCES += *.cpp \
$$PWD/aviation/*.cpp \
$$PWD/simulation/*.cpp \
$$PWD/aviation/*.cpp
DESTDIR = ../../lib
OTHER_FILES += $$TRANSLATIONS readme.txt

2
src/blackmisc/blackmiscallvalueclasses.h
View File

@@ -13,7 +13,7 @@
#define BLACKMISC_ALLVALUECLASSES_H
#include "blackmisc/pqallquantities.h"
#include "blackmisc/avallclasses.h"
#include "blackmisc/aviation/aviationall.h"
#include "blackmisc/geoallclasses.h"
#include "blackmisc/settingsblackmiscclasses.h"
#include "blackmisc/propertyindexallclasses.h"

2
src/blackmisc/blackmiscfreefunctions.cpp
View File

@@ -8,7 +8,7 @@
*/
#include "blackmiscfreefunctions.h"
#include "avallclasses.h"
#include "blackmisc/aviation/aviation.h"
#include "pqallquantities.h"
#include "mathallclasses.h"
#include "geoallclasses.h"

6
src/blackmisc/geoobjectlist.cpp
View File

@@ -9,9 +9,9 @@
#include "blackmisc/geoobjectlist.h"
#include "blackmisc/predicates.h"
#include "blackmisc/avatcstationlist.h"
#include "blackmisc/avaircraftlist.h"
#include "blackmisc/avairportlist.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/aircraftlist.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/simulation/simulatedaircraftlist.h"
using namespace BlackMisc::PhysicalQuantities;

2
src/blackmisc/nwaircraftmapping.h
View File

@@ -12,7 +12,7 @@
#ifndef BLACKMISC_NETWORK_AIRCRAFTMAPPING_H
#define BLACKMISC_NETWORK_AIRCRAFTMAPPING_H
#include "blackmisc/avaircrafticao.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/valueobject.h"

6
src/blackmisc/nwclient.cpp
View File

@@ -7,9 +7,9 @@
* contained in the LICENSE file.
*/
#include "nwclient.h"
#include "icon.h"
#include "avcallsign.h"
#include "blackmisc/nwclient.h"
#include "blackmisc/icon.h"
#include "blackmisc/aviation/callsign.h"
#include <QString>

10
src/blackmisc/nwclientlist.h
View File

@@ -12,11 +12,11 @@
#ifndef BLACKMISC_CLIENTLIST_H
#define BLACKMISC_CLIENTLIST_H
#include "nwclient.h"
#include "sequence.h"
#include "collection.h"
#include "blackmisc/avcallsignobjectlist.h"
#include "blackmisc/avcallsign.h"
#include "blackmisc/nwclient.h"
#include "blackmisc/sequence.h"
#include "blackmisc/collection.h"
#include "blackmisc/aviation/callsignobjectlist.h"
#include "blackmisc/aviation/callsign.h"
#include <QObject>
#include <QString>

6
src/blackmisc/nwtextmessage.cpp
View File

@@ -10,9 +10,9 @@
#include "nwtextmessage.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/pqconstants.h"
#include "blackmisc/aviocomsystem.h"
#include "blackmisc/avcallsign.h"
#include "blackmisc/avselcal.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/selcal.h"
using namespace BlackMisc::Aviation;
using namespace BlackMisc::PhysicalQuantities;

2
src/blackmisc/nwtextmessage.h
View File

@@ -14,7 +14,7 @@
#include "blackmisc/timestampbased.h"
#include "pqfrequency.h"
#include "avcallsign.h"
#include "blackmisc/aviation/callsign.h"
#include "statusmessage.h"
#include "valueobject.h"
#include <QDateTime>

2
src/blackmisc/nwuser.cpp
View File

@@ -8,7 +8,7 @@
*/
#include "nwuser.h"
#include "blackmisc/avairporticao.h"
#include "blackmisc/aviation/airporticao.h"
#include "blackmisc/icon.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/propertyindex.h"

4
src/blackmisc/nwuser.h
View File

@@ -12,8 +12,8 @@
#ifndef BLACKMISC_USER_H
#define BLACKMISC_USER_H
#include "avcallsign.h"
#include "avairporticao.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/airporticao.h"
#include "propertyindex.h"
#include "statusmessagelist.h"

2
src/blackmisc/pqangle.cpp
View File

@@ -9,7 +9,7 @@
#include "iconlist.h"
#include "pqangle.h"
#include "avheading.h"
#include "blackmisc/aviation/heading.h"
namespace BlackMisc
{

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

@@ -12,8 +12,8 @@
#ifndef BLACKMISC_AIRCRAFTMODEL_H
#define BLACKMISC_AIRCRAFTMODEL_H
#include "blackmisc/avaircraft.h"
#include "blackmisc/avaircrafticao.h"
#include "blackmisc/aviation/aircraft.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/nwuser.h"
#include "blackmisc/propertyindex.h"

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

@@ -8,7 +8,7 @@
*/
#include "simdirectaccessownaircraft.h"
#include "blackmisc/avaircraft.h"
#include "blackmisc/aviation/aircraft.h"
using namespace BlackMisc::Aviation;
using namespace BlackMisc::PhysicalQuantities;

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

@@ -13,7 +13,7 @@
#define BLACKMISC_SIMDIRECTACCESSREMOTEAIRCRAFT_H
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/avaircraftsituationlist.h"
#include "blackmisc/aviation/aircraftsituationlist.h"
#include "blackmisc/aviation/aircraftpartslist.h"
#include <functional>

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

@@ -12,7 +12,7 @@
#ifndef BLACKMISC_SIMULATEDAIRCRAFT_H
#define BLACKMISC_SIMULATEDAIRCRAFT_H
#include "blackmisc/avaircraft.h"
#include "blackmisc/aviation/aircraft.h"
#include "aircraftmodel.h"
#include "blackmisc/nwclient.h"

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

@@ -13,8 +13,8 @@
#define BLACKMISC_SIMULATEDNAIRCRAFTLIST_H
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/avcallsignobjectlist.h"
#include "blackmisc/avaircraftlist.h"
#include "blackmisc/aviation/callsignobjectlist.h"
#include "blackmisc/aviation/aircraftlist.h"
#include "blackmisc/geoobjectlist.h"
#include "blackmisc/nwuserlist.h"
#include "blackmisc/collection.h"

2
src/blackmisc/testing.h
View File

@@ -12,7 +12,7 @@
#ifndef BLACKMISC_TESTING_H
#define BLACKMISC_TESTING_H
#include "avatcstationlist.h"
#include "blackmisc/aviation/atcstationlist.h"
/*!
* Generate data for testing purposes.

2
src/blackmisc/timestampobjectlist.cpp
View File

@@ -9,7 +9,7 @@
#include "blackmisc/timestampobjectlist.h"
#include "blackmisc/predicates.h"
#include "blackmisc/avaircraftsituationlist.h"
#include "blackmisc/aviation/aircraftsituationlist.h"
#include "blackmisc/aviation/aircraftpartslist.h"
#include "blackmisc/nwtextmessagelist.h"
#include "blackmisc/statusmessagelist.h"