refs #641, using order in model caches

This commit is contained in:
Klaus Basan
2016-04-23 02:18:04 +02:00
parent 1bb6f98e56
commit bb6eea6c72
2 changed files with 17 additions and 5 deletions

View File

@@ -98,12 +98,24 @@ namespace BlackMisc
CStatusMessage CModelSetCaches::setCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator)
{
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
CAircraftModelList m(models);
// make sure we have a proper order
if (m.needsOrder())
{
m.resetOrder();
}
else
{
m.sortAscendingByOrder();
}
switch (simulator.getSimulator())
{
case CSimulatorInfo::FS9: return this->m_modelCacheFs9.set(models);
case CSimulatorInfo::FSX: return this->m_modelCacheFsx.set(models);
case CSimulatorInfo::P3D: return this->m_modelCacheP3D.set(models);
case CSimulatorInfo::XPLANE: return this->m_modelCacheXP.set(models);
case CSimulatorInfo::FS9: return this->m_modelCacheFs9.set(m);
case CSimulatorInfo::FSX: return this->m_modelCacheFsx.set(m);
case CSimulatorInfo::P3D: return this->m_modelCacheP3D.set(m);
case CSimulatorInfo::XPLANE: return this->m_modelCacheXP.set(m);
default:
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
return CStatusMessage();

View File

@@ -492,7 +492,7 @@ namespace BlackMisc
emit valuesWantToCache({ { { element.m_key, value } }, timestamp, save });
}
// All good info
status = CStatusMessage(this, CStatusMessage::SeverityInfo, "set values in cache");
status = CStatusMessage(this, CStatusMessage::SeverityInfo, "Set values in " + this->getKey(element));
}
return status;
}