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

refs #452 updated drivers

Browse Source 
* FSX/FS9 directories directly resolved in parser
* all: using BlackMisc::Simulation::CSimulatedAircraft instead of CAircraft
This commit is contained in:
Klaus Basan
2015-09-23 18:26:44 +02:00
committed by Mathew Sutcliffe
parent dbcc540313
commit a8e8e5527a
8 changed files with 49 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/plugins/simulator/fscommon/simulator_fscommon.cpp
View File

@@ -30,12 +30,10 @@ namespace BlackSimPlugin
IOwnAircraftProvider *ownAircraftProvider,
IRemoteAircraftProvider *renderedAircraftProvider,
IPluginStorageProvider *pluginStorageProvider,
QString simRootDirectory,
QStringList excludedDirectories,
QObject *parent) :
CSimulatorCommon(info, ownAircraftProvider, renderedAircraftProvider, pluginStorageProvider, parent),
m_fsuipc(new CFsuipc()),
m_aircraftCfgParser(simRootDirectory, excludedDirectories),
m_aircraftCfgParser(CAircraftCfgParser::createModelLoader(CSimulatorInfo(info.getIdentifier()))),
m_modelMatcher(CAircraftMatcher::AllModes, this)
{
// hack to init mapper
@@ -43,16 +41,19 @@ namespace BlackSimPlugin
auto modelMappingsProvider = std::unique_ptr<IModelMappingsProvider> { BlackMisc::make_unique<CModelMappingsProviderVPilot>(true) };
m_modelMatcher.setModelMappingProvider(std::move(modelMappingsProvider));
connect(&m_aircraftCfgParser, &CAircraftCfgParser::parsingFinished, this, &CSimulatorFsCommon::ps_aircraftCfgParsingFinished);
bool c = connect(m_aircraftCfgParser.data(), &CAircraftCfgParser::loadingFinished, this, &CSimulatorFsCommon::ps_aircraftCfgParsingFinished);
Q_ASSERT_X(c, Q_FUNC_INFO, "Cannot connect signal");
Q_UNUSED(c);
CVariant aircraftCfg = getPluginData(this, "aircraft_cfg");
if (aircraftCfg.isValid())
{
// will behave like parsing was finished
m_aircraftCfgParser.updateCfgEntriesList(aircraftCfg.value<CAircraftCfgEntriesList>());
m_aircraftCfgParser->updateCfgEntriesList(aircraftCfg.value<CAircraftCfgEntriesList>());
}
else
{
m_aircraftCfgParser.parse(CAircraftCfgParser::ModeAsync);
m_aircraftCfgParser->startLoading(CAircraftCfgParser::ModeBackground);
}
//
// reading from cache / settings would go here
@@ -111,23 +112,11 @@ namespace BlackSimPlugin
{
CAircraftModel newModel(model);
newModel.setModelType(CAircraftModel::TypeOwnSimulatorModel);
CSimulatorFsCommon::reverseLookupIcaoData(newModel);
updateOwnModel(newModel);
emit ownAircraftModelChanged(getOwnAircraft());
}
}
void CSimulatorFsCommon::reverseLookupIcaoData(CAircraftModel &model)
{
if (m_modelMatcher.isInitialized())
{
// reverse lookup of ICAO
CAircraftIcaoData icao = m_modelMatcher.getIcaoForModelString(model.getModelString());
icao.updateMissingParts(model.getIcao());
model.setIcao(icao); // now best ICAO info in model
}
}
CAircraftModel CSimulatorFsCommon::getClosestMatch(const CSimulatedAircraft &remoteAircraft)
{
return m_modelMatcher.getClosestMatch(remoteAircraft);
@@ -138,46 +127,17 @@ namespace BlackSimPlugin
return m_modelMatcher.getInstalledModelsList();
}
CAircraftIcaoData CSimulatorFsCommon::getIcaoForModelString(const QString &modelString) const
{
if (!m_modelMatcher.isInitialized()) { return CAircraftIcaoData(); }
return m_modelMatcher.getIcaoForModelString(modelString);
}
void CSimulatorFsCommon::reloadInstalledModels()
{
m_aircraftCfgParser.parse();
m_aircraftCfgParser->startLoading();
}
CPixmap CSimulatorFsCommon::iconForModel(const QString &modelString) const
{
static const CPixmap empty;
if (modelString.isEmpty()) { return empty; }
CAircraftCfgEntriesList cfgEntries = m_aircraftCfgParser.getAircraftCfgEntriesList().findByTitle(modelString);
if (cfgEntries.isEmpty())
{
CLogMessage(this).warning("No .cfg entry for '%1'") << modelString;
return empty;
}
// normally we should have only one entry
if (cfgEntries.size() > 1)
{
CLogMessage(this).warning("Multiple FSX .cfg entries for '%1'") << modelString;
}
// use first with icon
for (const CAircraftCfgEntries &entry : cfgEntries)
{
const QString thumbnail = entry.getThumbnailFileName();
if (thumbnail.isEmpty()) { continue; }
QPixmap pm;
if (pm.load(thumbnail))
{
return CPixmap(pm);
}
}
return empty;
CStatusMessage msg;
CPixmap pm(m_aircraftCfgParser->iconForModel(modelString, msg));
if (!msg.isEmpty()) { CLogMessage(this).preformatted(msg);}
return pm;
}
bool CSimulatorFsCommon::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft, const CIdentifier &originator)
@@ -214,7 +174,7 @@ namespace BlackSimPlugin
void CSimulatorFsCommon::unload()
{
this->m_aircraftCfgParser.cancelParsing();
this->m_aircraftCfgParser->cancelLoading();
this->m_modelMatcher.cancelInit();
CSimulatorCommon::unload();
}
@@ -222,8 +182,8 @@ namespace BlackSimPlugin
void CSimulatorFsCommon::ps_aircraftCfgParsingFinished(bool success)
{
if (!success) { return; }
setPluginData(this, "aircraft_cfg", CVariant::from(m_aircraftCfgParser.getAircraftCfgEntriesList()));
m_modelMatcher.setInstalledModels(m_aircraftCfgParser.getAircraftCfgEntriesList().toAircraftModelList());
setPluginData(this, "aircraft_cfg", CVariant::from(m_aircraftCfgParser->getAircraftCfgEntriesList()));
m_modelMatcher.setInstalledModels(m_aircraftCfgParser->getAircraftCfgEntriesList().toAircraftModelList());
// Now the matcher has all required information to be initialized
m_modelMatcher.init();

18
src/plugins/simulator/fscommon/simulator_fscommon.h
View File

@@ -58,9 +58,6 @@ namespace BlackSimPlugin
//! \copydoc ISimulator::getInstalledModels
virtual BlackMisc::Simulation::CAircraftModelList getInstalledModels() const override;
//! \copydoc ISimulator::getIcaoForModelString
virtual BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const override;
//! \copydoc ISimulator::reloadInstalledModels
virtual void reloadInstalledModels() override;
@@ -82,12 +79,10 @@ namespace BlackSimPlugin
protected:
//! Constructor
CSimulatorFsCommon(const BlackMisc::Simulation::CSimulatorPluginInfo &info,
BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider,
BlackMisc::Simulation::IRemoteAircraftProvider *renderedAircraftProvider,
BlackMisc::IPluginStorageProvider *pluginStorageProvider,
QString simRootDirectory,
QStringList excludedDirectories,
QObject *parent = nullptr);
BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider,
BlackMisc::Simulation::IRemoteAircraftProvider *renderedAircraftProvider,
BlackMisc::IPluginStorageProvider *pluginStorageProvider,
QObject *parent = nullptr);
QString simulatorDetails; //!< describes version etc.
QScopedPointer<FsCommon::CFsuipc> m_fsuipc; //!< FSUIPC
@@ -103,7 +98,7 @@ namespace BlackSimPlugin
BlackMisc::Aviation::CTransponder m_simTransponder; //!< cockpit xpdr state in simulator
// parser / matcher
BlackMisc::Simulation::FsCommon::CAircraftCfgParser m_aircraftCfgParser; //!< aircraft.cfg parser
QScopedPointer<BlackMisc::Simulation::FsCommon::CAircraftCfgParser> m_aircraftCfgParser; //!< aircraft.cfg parser
BlackMisc::Simulation::CAircraftMatcher m_modelMatcher; //!< Model matcher
//! Set own model
@@ -112,9 +107,6 @@ namespace BlackSimPlugin
//! Set own model
void setOwnAircraftModel(const QString &modelName);
//! Reverse lookup
void reverseLookupIcaoData(BlackMisc::Simulation::CAircraftModel &model);
protected slots:
//! Mapper has been initialized
void ps_mapperInitialized();