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

* 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

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