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

Use models from centralized model cache

Browse Source 
* no copy needed
* cache is synchronized when loading models
This commit is contained in:
Klaus Basan
2019-04-21 22:54:10 +02:00
parent 5caea5ad9b
commit 599064fe6c
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blackcore/simulator.cpp
View File

@@ -10,6 +10,7 @@
#include "blackcore/simulator.h"
#include "blackcore/webdataservices.h"
#include "blackcore/application.h"
#include "blackmisc/simulation/data/modelcaches.h"
#include "blackmisc/directoryutils.h"
#include "blackmisc/threadutils.h"
#include "blackmisc/logmessage.h"
@@ -34,6 +35,7 @@ using namespace BlackMisc::Aviation;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Math;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Simulation::Data;
using namespace BlackMisc::Simulation::Settings;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Network;
@@ -1052,6 +1054,15 @@ namespace BlackCore
// can be overridden
}
CAircraftModelList ISimulator::getModelSet() const
{
const CSimulatorInfo simulator = this->getSimulatorInfo();
if (!simulator.isSingleSimulator()) { return CAircraftModelList(); }
CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().synchronizeCache(simulator);
return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getCachedModels(simulator);
}
QString ISimulator::latestLoggedDataFormatted(const CCallsign &cs) const
{
const SituationLog s = m_interpolationLogger.getLastSituationLog(cs);
@@ -1062,8 +1073,8 @@ namespace BlackCore
if (s.tsCurrent > 0)
{
dm = u"Setup: " % s.usedSetup.toQString(true) %
u"\n\n" %
u"Situation: " % s.toQString(false, true, true, true, true, sep);
u"\n\n" %
u"Situation: " % s.toQString(false, true, true, true, true, sep);
}
if (p.tsCurrent > 0) { dm += (dm.isEmpty() ? u"Parts: " : u"\n\nParts: ") % p.toQString(sep); }
return dm;

3
src/blackcore/simulator.h
View File

@@ -535,6 +535,9 @@ namespace BlackCore
//! Own model has been changed
virtual void onOwnModelChanged(const BlackMisc::Simulation::CAircraftModel &newModel);
//! Get the model set
BlackMisc::Simulation::CAircraftModelList getModelSet() const;
//! Lookup against DB data
static BlackMisc::Simulation::CAircraftModel reverseLookupModel(const BlackMisc::Simulation::CAircraftModel &model);