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

refs #720, moved data consolidation with DB data into own class in BlackCore

Browse Source 
(in blackcore I can access the readers)
This commit is contained in:
Klaus Basan
2016-08-09 01:30:38 +02:00
committed by Mathew Sutcliffe
parent f9922353c4
commit d75b105ee3
4 changed files with 184 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/blackmisc/simulation/aircraftmodelutils.cpp
View File

@@ -14,25 +14,6 @@ namespace BlackMisc
{
namespace Simulation
{
int CAircraftModelUtilities::mergeWithDbData(CAircraftModelList &modelToBeModified, const CAircraftModelList &dbModels, bool force)
{
if (dbModels.isEmpty() || modelToBeModified.isEmpty()) { return 0; }
int c = 0;
for (CAircraftModel &simModel : modelToBeModified)
{
if (!force && simModel.hasValidDbKey()) { continue; } // already done
CAircraftModel dbModel(dbModels.findFirstByModelStringOrDefault(simModel.getModelString()));
if (!dbModel.hasValidDbKey())
{
continue; // not found
}
dbModel.updateMissingParts(simModel, false);
simModel = dbModel;
c++;
}
return c;
}
bool CAircraftModelUtilities::mergeWithVPilotData(CAircraftModelList &modelToBeModified, const CAircraftModelList &vPilotModels, bool force)
{
if (vPilotModels.isEmpty() || modelToBeModified.isEmpty()) { return false; }

3
src/blackmisc/simulation/aircraftmodelutils.h
View File

@@ -26,9 +26,6 @@ namespace BlackMisc
//! No constructor
CAircraftModelUtilities() = delete;
//! Merge with DB data if possible
static int mergeWithDbData(BlackMisc::Simulation::CAircraftModelList &modelToBeModified, const BlackMisc::Simulation::CAircraftModelList &dbModels, bool force = false);
//! Merge with vPilot data if possible
static bool mergeWithVPilotData(BlackMisc::Simulation::CAircraftModelList &modelToBeModified, const BlackMisc::Simulation::CAircraftModelList &vPilotModels, bool force = false);
};