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

Ref T28, fixed issues mentioned in inline review

Browse Source 
https://dev.swift-project.org/rSWIFTPILOTCLIENT2f289a4c7e196095e64de78f222e56fd21d80476
This commit is contained in:
Klaus Basan
2017-07-08 18:29:22 +02:00
committed by Mathew Sutcliffe
parent 07b096b398
commit 7168f97b45
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,10 +120,10 @@ namespace BlackCore
CAircraftModelList CDatabaseUtils::consolidateModelsWithSimulatorModelsAllowsGuiRefresh(const CAircraftModelList &models, const CAircraftModelList &simulatorModels, bool processEvents) CAircraftModelList CDatabaseUtils::consolidateModelsWithSimulatorModelsAllowsGuiRefresh(const CAircraftModelList &models, const CAircraftModelList &simulatorModels, bool processEvents)
{ {
QTime timer;
timer.start();
if (models.isEmpty() || simulatorModels.isEmpty()) { return models; } if (models.isEmpty() || simulatorModels.isEmpty()) { return models; }
QTime timer;
timer.start();
const QSet<QString> allOwnModelsModelStrings = simulatorModels.getModelStringSet(); const QSet<QString> allOwnModelsModelStrings = simulatorModels.getModelStringSet();
CAircraftModelList consolidatedModels; CAircraftModelList consolidatedModels;
@@ -138,7 +138,7 @@ namespace BlackCore
if (!allOwnModelsModelStrings.contains(ms)) { continue; } if (!allOwnModelsModelStrings.contains(ms)) { continue; }
consolidatedModels.push_back(model); consolidatedModels.push_back(model);
} }
CLogMessage(getLogCategories()).info("Consolidated %1 vs. %2 in %3 ms") << models.size() << simulatorModels.size() << timer.elapsed() << "ms"; CLogMessage(static_cast<CDatabaseUtils *>(nullptr)).info("Consolidated %1 vs. %2 in %3 ms") << models.size() << simulatorModels.size() << timer.elapsed() << "ms";
return consolidatedModels; return consolidatedModels;
} }
@@ -159,15 +159,16 @@ namespace BlackCore
if (processEvents && c % 125 == 0) { sApp->processEventsFor(25); } if (processEvents && c % 125 == 0) { sApp->processEventsFor(25); }
} }
} }
CLogMessage(getLogCategories()).info("Consolidated %1 models in %2 ms") << models.size() << timer.elapsed(); CLogMessage(static_cast<CDatabaseUtils *>(nullptr)).info("Consolidated %1 models in %2 ms") << models.size() << timer.elapsed();
return c; return c;
} }
int CDatabaseUtils::consolidateModelsWithDbData(const CAircraftModelList &dbModels, CAircraftModelList &simulatorModels, bool force) int CDatabaseUtils::consolidateModelsWithDbData(const CAircraftModelList &dbModels, CAircraftModelList &simulatorModels, bool force)
{ {
if (dbModels.isEmpty() || simulatorModels.isEmpty()) { return 0; }
QTime timer; QTime timer;
timer.start(); timer.start();
if (dbModels.isEmpty() || simulatorModels.isEmpty()) { return 0; }
const QSet<QString> dbModelsModelStrings = dbModels.getModelStringSet(); const QSet<QString> dbModelsModelStrings = dbModels.getModelStringSet();
int c = 0; int c = 0;
@@ -182,7 +183,7 @@ namespace BlackCore
model = consolidated; model = consolidated;
c++; c++;
} }
CLogMessage(getLogCategories()).info("Consolidated %1 models in %2 ms") << simulatorModels.size() << timer.elapsed(); CLogMessage(static_cast<CDatabaseUtils *>(nullptr)).info("Consolidated %1 models in %2 ms") << simulatorModels.size() << timer.elapsed();
return c; return c;
} }