Ref T129, flight plan list

This commit is contained in:
Klaus Basan
2017-10-01 00:35:31 +02:00
committed by Mathew Sutcliffe
parent b1795c77d8
commit 3b842679e7
6 changed files with 86 additions and 1 deletions

View File

@@ -38,6 +38,7 @@
#include "blackmisc/aviation/informationmessage.h"
#include "blackmisc/aviation/selcal.h"
#include "blackmisc/aviation/flightplan.h"
#include "blackmisc/aviation/flightplanlist.h"
#include "blackmisc/aviation/aircraftengine.h"
#include "blackmisc/aviation/aircraftenginelist.h"
#include "blackmisc/aviation/aircraftlights.h"

View File

@@ -12,7 +12,7 @@
#include "blackmisc/predicates.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/aircraftsituationlist.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/aviation/flightplanlist.h"
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/network/clientlist.h"
@@ -235,6 +235,7 @@ namespace BlackMisc
//! \cond PRIVATE
template class BLACKMISC_EXPORT_DEFINE_TEMPLATE ICallsignObjectList<BlackMisc::Aviation::CAtcStation, BlackMisc::Aviation::CAtcStationList>;
template class BLACKMISC_EXPORT_DEFINE_TEMPLATE ICallsignObjectList<BlackMisc::Aviation::CAircraftSituation, BlackMisc::Aviation::CAircraftSituationList>;
template class BLACKMISC_EXPORT_DEFINE_TEMPLATE ICallsignObjectList<BlackMisc::Aviation::CFlightPlan, BlackMisc::Aviation::CFlightPlanList>;
template class BLACKMISC_EXPORT_DEFINE_TEMPLATE ICallsignObjectList<BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::Simulation::CSimulatedAircraftList>;
template class BLACKMISC_EXPORT_DEFINE_TEMPLATE ICallsignObjectList<BlackMisc::Network::CClient, BlackMisc::Network::CClientList>;
//! \endcond

View File

@@ -25,6 +25,8 @@ namespace BlackMisc
class CAircraftSituationList;
class CAtcStation;
class CAtcStationList;
class CFlightPlan;
class CFlightPlanList;
}
namespace Simulation
@@ -111,6 +113,7 @@ namespace BlackMisc
//! \cond PRIVATE
extern template class BLACKMISC_EXPORT_DECLARE_TEMPLATE ICallsignObjectList<BlackMisc::Aviation::CAtcStation, BlackMisc::Aviation::CAtcStationList>;
extern template class BLACKMISC_EXPORT_DECLARE_TEMPLATE ICallsignObjectList<BlackMisc::Aviation::CAircraftSituation, BlackMisc::Aviation::CAircraftSituationList>;
extern template class BLACKMISC_EXPORT_DECLARE_TEMPLATE ICallsignObjectList<BlackMisc::Aviation::CFlightPlan, BlackMisc::Aviation::CFlightPlanList>;
extern template class BLACKMISC_EXPORT_DECLARE_TEMPLATE ICallsignObjectList<BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::Simulation::CSimulatedAircraftList>;
extern template class BLACKMISC_EXPORT_DECLARE_TEMPLATE ICallsignObjectList<BlackMisc::Network::CClient, BlackMisc::Network::CClientList>;
//! \endcond

View File

@@ -0,0 +1,30 @@
/* Copyright (C) 2017
* swift Project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
#include "flightplanlist.h"
#include "blackmisc/compare.h"
#include "blackmisc/iterator.h"
#include "blackmisc/metaclassprivate.h"
#include "blackmisc/predicates.h"
#include "blackmisc/range.h"
#include <QString>
#include <QtGlobal>
namespace BlackMisc
{
namespace Aviation
{
CFlightPlanList::CFlightPlanList() { }
CFlightPlanList::CFlightPlanList(const CSequence<CFlightPlan> &other) :
CSequence<CFlightPlan>(other)
{ }
} // namespace
} // namespace

View File

@@ -0,0 +1,49 @@
/* Copyright (C) 2017
* swift Project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
//! \file
#ifndef BLACKMISC_AVIATION_FLIGHTPLANLIST_H
#define BLACKMISC_AVIATION_FLIGHTPLANLIST_H
#include "blackmisc/aviation/flightplan.h"
#include "blackmisc/aviation/callsignobjectlist.h"
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/collection.h"
#include "blackmisc/sequence.h"
#include "blackmisc/variant.h"
#include <QMetaType>
namespace BlackMisc
{
namespace Aviation
{
//! Value object for a list of flight plans.
class BLACKMISC_EXPORT CFlightPlanList :
public CSequence<CFlightPlan>,
public ICallsignObjectList<CFlightPlan, CFlightPlanList>,
public Mixin::MetaType<CFlightPlanList>
{
public:
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CFlightPlanList)
//! Default constructor.
CFlightPlanList();
//! Construct from a base class object.
CFlightPlanList(const CSequence<CFlightPlan> &other);
};
} //namespace
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Aviation::CFlightPlanList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Aviation::CFlightPlan>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Aviation::CFlightPlan>)
#endif //guard

View File

@@ -40,6 +40,7 @@ namespace BlackMisc
CCallsignSet::registerMetadata();
CComSystem::registerMetadata();
CFlightPlan::registerMetadata();
CFlightPlanList::registerMetadata();
CHeading::registerMetadata();
CInformationMessage::registerMetadata();
CLivery::registerMetadata();