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

refs #743, utility functions and formatting / typos

Browse Source 
* simulator info for FS family / as set
* fixed synchronized typo
* info string for caches
* getter for cached models from the loaders
* get all FS family models (FSX/P3D/FS9) from list
This commit is contained in:
Klaus Basan
2016-10-02 23:10:59 +02:00
committed by Mathew Sutcliffe
parent 7446ffcb80
commit 11e32a065e
13 changed files with 171 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/blackmisc/simulation/aircraftmodelsetloader.cpp
View File

@@ -42,8 +42,8 @@ namespace BlackMisc
if (models.isEmpty()) { return CStatusMessage(this, CStatusMessage::SeverityInfo, "No data"); }
const CSimulatorInfo sim = simulator.isSingleSimulator() ? simulator : this->m_caches.getCurrentSimulator();
if (!sim.isSingleSimulator()) { return CStatusMessage(this, CStatusMessage::SeverityError, "Invalid simuataor"); }
this->m_caches.syncronizeCache(sim);
CAircraftModelList allModels(this->m_caches.getSyncronizedCachedModels(sim));
this->m_caches.synchronizeCache(sim);
CAircraftModelList allModels(this->m_caches.getSynchronizedCachedModels(sim));
const int c = allModels.replaceOrAddModelsWithString(models, Qt::CaseInsensitive);
if (c > 0)
{
@@ -60,7 +60,7 @@ namespace BlackMisc
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Only one simulator per loader");
if (this->getSimulator() == simulator) { return; }
this->m_caches.setCurrentSimulator(simulator);
this->m_caches.syncronizeCurrentCache();
this->m_caches.synchronizeCurrentCache();
emit simulatorChanged(simulator);
}
@@ -72,7 +72,7 @@ namespace BlackMisc
CAircraftModelList CAircraftModelSetLoader::getAircraftModels(const CSimulatorInfo &simulator)
{
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Need single simulator");
return this->m_caches.getSyncronizedCachedModels(simulator);
return this->m_caches.getSynchronizedCachedModels(simulator);
}
int CAircraftModelSetLoader::getAircraftModelsCount() const
@@ -86,14 +86,19 @@ namespace BlackMisc
return this->getAircraftModels().findFirstByModelStringOrDefault(modelString);
}
CAircraftModelList CAircraftModelSetLoader::getCachedModels(const CSimulatorInfo &simulator) const
{
return this->m_caches.getCachedModels(simulator);
}
QDateTime CAircraftModelSetLoader::getCacheTimestamp() const
{
return this->m_caches.getCurrentCacheTimestamp();
}
bool CAircraftModelSetLoader::syncronizeCache()
bool CAircraftModelSetLoader::synchronizeCache()
{
return this->m_caches.syncronizeCurrentCache();
return this->m_caches.synchronizeCurrentCache();
}
bool CAircraftModelSetLoader::hasCachedData() const
@@ -118,12 +123,22 @@ namespace BlackMisc
bool CAircraftModelSetLoader::supportsSimulator(const CSimulatorInfo &info)
{
return getSimulator().matchesAny(info);
return this->getSimulator().matchesAny(info);
}
void CAircraftModelSetLoader::gracefulShutdown()
{
// void
}
QString CAircraftModelSetLoader::getInfoString() const
{
return this->m_caches.getInfoString();
}
QString CAircraftModelSetLoader::getInfoStringFsFamily() const
{
return this->m_caches.getInfoStringFsFamily();
}
} // ns
} // ns