Ref T451, fixed temp. disabled model

* display info message
* aircraft model list implementing ICallsignObjectList (for message)
* fixed wrong flag in requestTempDisable
This commit is contained in:
Klaus Basan
2019-01-17 00:06:03 +01:00
committed by Mat Sutcliffe
parent 25df1921eb
commit a90d4465a2
8 changed files with 114 additions and 7 deletions

View File

@@ -8,9 +8,9 @@
*/
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/interpolationsetuplist.h"
#include "blackmisc/aviation/callsignobjectlist.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/aircraftsituationlist.h"
#include "blackmisc/aviation/flightplanlist.h"
@@ -68,6 +68,14 @@ namespace BlackMisc
return this->getCallsigns().getCallsignStrings(sorted);
}
template<class OBJ, class CONTAINER>
QString ICallsignObjectList<OBJ, CONTAINER>::getCallsignsAsString(const QString &separator, bool sorted) const
{
if (this->container().isEmpty()) { return QString(); }
const QStringList callsigns = this->getCallsignStrings(sorted);
return callsigns.join(separator);
}
template <class OBJ, class CONTAINER>
CONTAINER ICallsignObjectList<OBJ, CONTAINER>::findByCallsign(const CCallsign &callsign) const
{
@@ -292,6 +300,7 @@ namespace BlackMisc
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::CAircraftModel, BlackMisc::Simulation::CAircraftModelList>;
template class BLACKMISC_EXPORT_DEFINE_TEMPLATE ICallsignObjectList<BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::Simulation::CSimulatedAircraftList>;
template class BLACKMISC_EXPORT_DEFINE_TEMPLATE ICallsignObjectList<BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign, BlackMisc::Simulation::CInterpolationSetupList>;
template class BLACKMISC_EXPORT_DEFINE_TEMPLATE ICallsignObjectList<BlackMisc::Network::CClient, BlackMisc::Network::CClientList>;