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

Ref T472, allow to pass already existing values for model parsing

Browse Source 
* list to map: toDbKeyValueMap
* categories can also be passed, hence the categories can be seen in model views
This commit is contained in:
Klaus Basan
2019-02-19 23:54:14 +01:00
committed by Mat Sutcliffe
parent 7a2ed1433d
commit 9cee34f4cc
7 changed files with 53 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,9 +21,9 @@
#include "blackmisc/blackmiscexport.h"
#include <QJsonObject>
#include <QMetaType>
#include <QString>
#include <QMap>
#include <QStringList>
#include <QMetaType>
namespace BlackMisc
{
@@ -150,6 +150,10 @@ namespace BlackMisc
BLACK_METAMEMBER(assignable)
);
};
//! Category/id map
using AircraftCategoryIdMap = QMap<int, CAircraftCategory>;
} // namespace
} // namespace

12
src/blackmisc/db/datastoreobjectlist.cpp
View File

@@ -119,6 +119,18 @@ namespace BlackMisc
return keys;
}
template <class OBJ, class CONTAINER, typename KEYTYPE>
QMap<KEYTYPE, OBJ> IDatastoreObjectList<OBJ, CONTAINER, KEYTYPE>::toDbKeyValueMap() const
{
QMap<KEYTYPE, OBJ> map;
for (const OBJ &obj : ITimestampObjectList<OBJ, CONTAINER>::container())
{
if (!obj.hasValidDbKey()) { continue; }
map.insert(obj.getDbKey(), obj);
}
return map;
}
template<class OBJ, class CONTAINER, typename KEYTYPE>
QSet<QString> IDatastoreObjectList<OBJ, CONTAINER, KEYTYPE>::toDbKeyStringSet() const
{

4
src/blackmisc/db/datastoreobjectlist.h
View File

@@ -16,6 +16,7 @@
#include "blackmisc/jsonexception.h"
#include <QJsonArray>
#include <QSet>
#include <QMap>
#include <QString>
namespace BlackMisc
@@ -48,6 +49,9 @@ namespace BlackMisc
//! All keys as set
QSet<KEYTYPE> toDbKeySet() const;
//! As map with DB key/object
QMap<KEYTYPE, OBJ> toDbKeyValueMap() const;
//! All keys as string set (also integer keys will be converted to string)
QSet<QString> toDbKeyStringSet() const;

13
src/blackmisc/simulation/aircraftmodel.cpp
View File

@@ -961,7 +961,7 @@ namespace BlackMisc
CAircraftModel CAircraftModel::fromDatabaseJsonCaching(
const QJsonObject &json,
AircraftIcaoIdMap &aircraftIcaos, LiveryIdMap &liveries, DistributorIdMap &distributors,
AircraftIcaoIdMap &aircraftIcaos, const AircraftCategoryIdMap &categories, LiveryIdMap &liveries, DistributorIdMap &distributors,
const QString &prefix)
{
static const QString prefixAircraftIcao("ac_");
@@ -987,11 +987,20 @@ namespace BlackMisc
distributors[idDistributor] :
CDistributor::fromDatabaseJson(json, prefixDistributor));
if (!aircraftIcao.isLoadedFromDb() && idAircraftIcao >= 0) { aircraftIcao.setDbKey(idAircraftIcao); }
if (!aircraftIcao.isLoadedFromDb() && idAircraftIcao >= 0) { aircraftIcao.setDbKey(idAircraftIcao); }
if (!livery.isLoadedFromDb() && idLivery >= 0) { livery.setDbKey(idLivery); }
if (!distributor.isLoadedFromDb() && !idDistributor.isEmpty()) { distributor.setDbKey(idDistributor); }
// update category
if (!cachedAircraftIcao)
{
const int catId = aircraftIcao.getCategory().getDbKey();
if (catId >= 0 && categories.contains(catId))
{
aircraftIcao.setCategory(categories[catId]);
}
}
// store in temp.cache
if (!cachedAircraftIcao && aircraftIcao.isLoadedFromDb()) { aircraftIcaos[aircraftIcao.getDbKey()] = aircraftIcao; }
if (!cachedLivery && livery.isLoadedFromDb()) { liveries[livery.getDbKey()] = livery; }

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

@@ -503,7 +503,7 @@ namespace BlackMisc
static CAircraftModel fromDatabaseJson(const QJsonObject &json, const QString &prefix = QString("mod_"));
//! From swift DB JSON, caching during this process (faster)
static CAircraftModel fromDatabaseJsonCaching(const QJsonObject &json, Aviation::AircraftIcaoIdMap &aircraftIcaos, Aviation::LiveryIdMap &liveries, DistributorIdMap &distributors, const QString &prefix = QString("mod_"));
static CAircraftModel fromDatabaseJsonCaching(const QJsonObject &json, Aviation::AircraftIcaoIdMap &aircraftIcaos, const Aviation::AircraftCategoryIdMap &categories, Aviation::LiveryIdMap &liveries, DistributorIdMap &distributors, const QString &prefix = QString("mod_"));
//! Livery string prefix
static const QString &liveryStringPrefix();

18
src/blackmisc/simulation/aircraftmodellist.cpp
View File

@@ -10,7 +10,6 @@
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/matchingutils.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/liverylist.h"
#include "blackmisc/math/mathutils.h"
#include "blackmisc/compare.h"
#include "blackmisc/iterator.h"
@@ -1507,16 +1506,23 @@ namespace BlackMisc
return stats;
}
CAircraftModelList CAircraftModelList::fromDatabaseJsonCaching(const QJsonArray &array)
CAircraftModelList CAircraftModelList::fromDatabaseJsonCaching(
const QJsonArray &array,
const CAircraftIcaoCodeList &icaos,
const CAircraftCategoryList &categories,
const CLiveryList &liveries,
const CDistributorList &distributors
)
{
AircraftIcaoIdMap aircraftIcaos;
LiveryIdMap liveries;
DistributorIdMap distributors;
AircraftIcaoIdMap aircraftIcaosMap = icaos.toDbKeyValueMap();
LiveryIdMap liveriesMap = liveries.toDbKeyValueMap();
DistributorIdMap distributorsMap = distributors.toDbKeyValueMap();
const AircraftCategoryIdMap categoriesMap = categories.toDbKeyValueMap();
CAircraftModelList models;
for (const QJsonValue &value : array)
{
models.push_back(CAircraftModel::fromDatabaseJsonCaching(value.toObject(), aircraftIcaos, liveries, distributors));
models.push_back(CAircraftModel::fromDatabaseJsonCaching(value.toObject(), aircraftIcaosMap, categoriesMap, liveriesMap, distributorsMap));
}
return models;
}

8
src/blackmisc/simulation/aircraftmodellist.h
View File

@@ -17,6 +17,8 @@
#include "blackmisc/simulation/simulatorinfo.h"
#include "blackmisc/aviation/aircrafticaocodelist.h"
#include "blackmisc/aviation/airlineicaocodelist.h"
#include "blackmisc/aviation/aircraftcategorylist.h"
#include "blackmisc/aviation/liverylist.h"
#include "blackmisc/aviation/callsignobjectlist.h"
#include "blackmisc/db/datastoreobjectlist.h"
#include "blackmisc/blackmiscexport.h"
@@ -462,7 +464,11 @@ namespace BlackMisc
QString htmlStatistics(bool aircraftStats, bool airlineStats) const;
//! Newer version
static CAircraftModelList fromDatabaseJsonCaching(const QJsonArray &array);
static CAircraftModelList fromDatabaseJsonCaching(const QJsonArray &array,
const Aviation::CAircraftIcaoCodeList &aircraftIcaos = {},
const Aviation::CAircraftCategoryList &aircraftCategories = {},
const Aviation::CLiveryList &liveries = {},
const CDistributorList &distributors = {});
};
//! Model per callsign