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

refs #743, utility function for cross imulator updating

Browse Source
This commit is contained in:
Klaus Basan
2016-10-02 23:44:41 +02:00
committed by Mathew Sutcliffe
parent f68c57869c
commit 35f010e516
2 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/blackcore/db/databaseutils.cpp
View File

@@ -41,8 +41,8 @@ namespace BlackCore
return dbModel;
}
// we try to best update by DB data here
// we have no(!) DB model, so we update each of it subobjects
// we try our best to update by DB data here
// since we have no(!) DB model, we update each of it subobjects
CAircraftModel consolidatedModel(model); // copy over
if (!consolidatedModel.getLivery().hasValidDbKey())
{
@@ -94,10 +94,7 @@ namespace BlackCore
if (modified || model.hasValidDbKey())
{
c++;
if (processEvents && c % 125 == 0)
{
sApp->processEventsFor(25);
}
if (processEvents && c % 125 == 0) { sApp->processEventsFor(25); }
}
}
CLogMessage().debug() << "Consolidated " << models.size() << " in " << timer.elapsed() << "ms";
@@ -149,5 +146,52 @@ namespace BlackCore
}
return c;
}
CAircraftModelList CDatabaseUtils::updateSimulatorForFsFamily(const CAircraftModelList &ownModels, int maxToStash, IProgressIndicator *progressIndicator, bool processEvents)
{
CAircraftModelList dbFsFamilyModels(sApp->getWebDataServices()->getModels().getAllFsFamilyModels());
CAircraftModelList stashModels;
if (dbFsFamilyModels.isEmpty() || ownModels.isEmpty()) { return stashModels; }
const QSet<QString> dbKeys = dbFsFamilyModels.getModelStringSet();
const int mexModelsCount = maxToStash >= 0 ? maxToStash : ownModels.size();
if (mexModelsCount < 1) { return stashModels; }
int c = 0; // counter
for (const CAircraftModel &ownModel : ownModels)
{
c++;
// process events
if (processEvents && c % 500 == 0)
{
if (progressIndicator)
{
const int percentage = c * 100 / mexModelsCount;
progressIndicator->updateProgressIndicatorAndProcessEvents(percentage);
}
else
{
sApp->processEventsFor(10);
}
}
// values to be skipped
if (maxToStash >= 0 && maxToStash == stashModels.size()) { break; }
if (!dbKeys.contains(ownModel.getModelString())) { continue; }
if (ownModel.matchesSimulatorFlag(CSimulatorInfo::XPLANE)) { continue; }
// in DB
CAircraftModel dbModel = dbFsFamilyModels.findFirstByModelStringOrDefault(ownModel.getModelString());
if (!dbModel.isLoadedFromDb()) {continue; }
if (dbModel.getSimulator() == ownModel.getSimulator()) {continue; }
// update simulator and add
CSimulatorInfo simulator(dbModel.getSimulator());
simulator.add(ownModel.getSimulator());
dbModel.setSimulator(simulator);
stashModels.push_back(dbModel);
}
return stashModels;
}
} // ns
} // ns

4
src/blackcore/db/databaseutils.h
View File

@@ -13,6 +13,7 @@
#define BLACKCORE_DB_DATABASEUTILS_H
#include "blackcore/blackcoreexport.h"
#include "blackcore/progress.h"
#include "blackmisc/simulation/aircraftmodel.h"
namespace BlackCore
@@ -46,6 +47,9 @@ namespace BlackCore
//! Consolidate model data with DB distributors
static int consolidateModelsWithDbDistributor(BlackMisc::Simulation::CAircraftModelList &models, bool force);
//! Create stash models if the DB models miss that simulator
static BlackMisc::Simulation::CAircraftModelList updateSimulatorForFsFamily(const BlackMisc::Simulation::CAircraftModelList &ownModels, int maxToStash = -1, BlackCore::IProgressIndicator *progressIndicator = nullptr, bool processEvents = true);
};
} // ns
} // ns