From a8e8e5527ac40f1518b1ec3428180b4f5f12c97f Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 23 Sep 2015 18:26:44 +0200 Subject: [PATCH] refs #452 updated drivers * FSX/FS9 directories directly resolved in parser * all: using BlackMisc::Simulation::CSimulatedAircraft instead of CAircraft --- src/plugins/simulator/fs9/simulator_fs9.cpp | 25 ++----- src/plugins/simulator/fs9/simulator_fs9.h | 14 +--- .../simulator/fscommon/simulator_fscommon.cpp | 70 ++++--------------- .../simulator/fscommon/simulator_fscommon.h | 18 ++--- src/plugins/simulator/fsx/simulator_fsx.cpp | 28 +------- src/plugins/simulator/fsx/simulator_fsx.h | 9 +-- .../simulator/xplane/simulator_xplane.cpp | 37 +++++----- .../simulator/xplane/simulator_xplane.h | 5 +- 8 files changed, 49 insertions(+), 157 deletions(-) diff --git a/src/plugins/simulator/fs9/simulator_fs9.cpp b/src/plugins/simulator/fs9/simulator_fs9.cpp index 78f9197d3..3478e2103 100644 --- a/src/plugins/simulator/fs9/simulator_fs9.cpp +++ b/src/plugins/simulator/fs9/simulator_fs9.cpp @@ -35,7 +35,6 @@ using namespace BlackMisc::Simulation::FsCommon; using namespace BlackSimPlugin::Fs9; using namespace BlackSimPlugin::FsCommon; - namespace { /* These instances should be global, as they are shared between all classes @@ -54,8 +53,7 @@ namespace BlackSimPlugin IRemoteAircraftProvider *remoteAircraftProvider, IPluginStorageProvider *pluginStorageProvider, QObject *parent) : - CSimulatorFsCommon(info, ownAircraftProvider, remoteAircraftProvider, pluginStorageProvider, - aircraftObjectsDir(), excludeDirectories(), parent) + CSimulatorFsCommon(info, ownAircraftProvider, remoteAircraftProvider, pluginStorageProvider, parent) { connect(lobbyClient.data(), &CLobbyClient::disconnected, this, std::bind(&CSimulatorFs9::simulatorStatusChanged, this, 0)); this->m_interpolator = new BlackCore::CInterpolatorLinear(remoteAircraftProvider, this); @@ -63,7 +61,7 @@ namespace BlackSimPlugin "Boeing 737-400", CAircraftModel::TypeModelMatchingDefaultModel, "B737-400 default model", - CAircraftIcaoData(CAircraftIcaoCode("B734", "L2J"), CAirlineIcaoCode()) + CAircraftIcaoCode("B734", "L2J") )); } @@ -165,7 +163,7 @@ namespace BlackSimPlugin return CCollection(this->m_hashFs9Clients.keys()); } - bool CSimulatorFs9::updateOwnSimulatorCockpit(const CAircraft &ownAircraft, const CIdentifier &originator) + bool CSimulatorFs9::updateOwnSimulatorCockpit(const CSimulatedAircraft &ownAircraft, const CIdentifier &originator) { if (originator == this->identifier()) { return false; } if (!this->isSimulating()) { return false; } @@ -295,7 +293,7 @@ namespace BlackSimPlugin } } - void CSimulatorFs9::updateOwnAircraftFromSimulator(const CAircraft &simDataOwnAircraft) + void CSimulatorFs9::updateOwnAircraftFromSimulator(const CSimulatedAircraft &simDataOwnAircraft) { this->updateCockpit( simDataOwnAircraft.getCom1System(), @@ -313,21 +311,6 @@ namespace BlackSimPlugin } } - QString CSimulatorFs9::aircraftObjectsDir() - { - QString dir = CFsCommonUtil::fs9AircraftDirFromRegistry(); - if (!dir.isEmpty()) { return dir; } - return "C:/Flight Simulator 9/Aircraft"; - } - - const QStringList &CSimulatorFs9::excludeDirectories() - { - static const QStringList exclude - { - }; - return exclude; - } - CSimulatorFs9Listener::CSimulatorFs9Listener(const CSimulatorPluginInfo &info) : BlackCore::ISimulatorListener(info), m_timer(new QTimer(this)) diff --git a/src/plugins/simulator/fs9/simulator_fs9.h b/src/plugins/simulator/fs9/simulator_fs9.h index 341fd5b81..cc1eede44 100644 --- a/src/plugins/simulator/fs9/simulator_fs9.h +++ b/src/plugins/simulator/fs9/simulator_fs9.h @@ -18,8 +18,7 @@ #include "../fscommon/simulator_fscommon.h" #include "blackcore/simulator.h" #include "blackcore/interpolator.h" -#include "blackmisc/simulation/aircraftmodel.h" -#include "blackmisc/aviation/aircraft.h" +#include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/pixmap.h" #include @@ -71,7 +70,7 @@ namespace BlackSimPlugin virtual bool isPhysicallyRenderedAircraft(const BlackMisc::Aviation::CCallsign &callsign) const override; //! \copydoc ISimulator::updateOwnSimulatorCockpit() - virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &ownAircraft, const BlackMisc::CIdentifier &originator) override; + virtual bool updateOwnSimulatorCockpit(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft, const BlackMisc::CIdentifier &originator) override; //! \copydoc ISimulator::displayStatusMessage() virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override; @@ -100,17 +99,10 @@ namespace BlackSimPlugin private: //! Called when data about our own aircraft are received - void updateOwnAircraftFromSimulator(const BlackMisc::Aviation::CAircraft &ownAircraft); + void updateOwnAircraftFromSimulator(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft); void disconnectAllClients(); - //! Aircraft object directory - //! \todo Read from settings if registry fails - static QString aircraftObjectsDir(); - - //! Do not include the following directories for FS - static const QStringList &excludeDirectories(); - QHash> m_hashFs9Clients; QMetaObject::Connection m_connectionHostMessages; int m_dispatchTimerId = -1; diff --git a/src/plugins/simulator/fscommon/simulator_fscommon.cpp b/src/plugins/simulator/fscommon/simulator_fscommon.cpp index 1d1a5077f..e4884ce92 100644 --- a/src/plugins/simulator/fscommon/simulator_fscommon.cpp +++ b/src/plugins/simulator/fscommon/simulator_fscommon.cpp @@ -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 { BlackMisc::make_unique(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()); + m_aircraftCfgParser->updateCfgEntriesList(aircraftCfg.value()); } 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(); diff --git a/src/plugins/simulator/fscommon/simulator_fscommon.h b/src/plugins/simulator/fscommon/simulator_fscommon.h index 9bf2b9b73..a71f74f98 100644 --- a/src/plugins/simulator/fscommon/simulator_fscommon.h +++ b/src/plugins/simulator/fscommon/simulator_fscommon.h @@ -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 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 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(); diff --git a/src/plugins/simulator/fsx/simulator_fsx.cpp b/src/plugins/simulator/fsx/simulator_fsx.cpp index b6a117fe6..53ca18aeb 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.cpp +++ b/src/plugins/simulator/fsx/simulator_fsx.cpp @@ -18,7 +18,6 @@ #include "blackmisc/project.h" #include "blackmisc/aviation/airportlist.h" #include "blackmisc/logmessage.h" -#include "blackmisc/network/aircraftmappinglist.h" #include "blackmisc/simulation/fscommon/fscommonutil.h" #include @@ -44,8 +43,7 @@ namespace BlackSimPlugin IRemoteAircraftProvider *remoteAircraftProvider, IPluginStorageProvider *pluginStorageProvider, QObject *parent) : - CSimulatorFsCommon(info, ownAircraftProvider, remoteAircraftProvider, pluginStorageProvider, - simObjectsDir(), excludeDirectories(), parent) + CSimulatorFsCommon(info, ownAircraftProvider, remoteAircraftProvider, pluginStorageProvider, parent) { Q_ASSERT(ownAircraftProvider); Q_ASSERT(remoteAircraftProvider); @@ -57,7 +55,7 @@ namespace BlackSimPlugin "Boeing 737-800 Paint1", CAircraftModel::TypeModelMatchingDefaultModel, "B737-800 default model", - CAircraftIcaoData(CAircraftIcaoCode("B738", "L2J"), CAirlineIcaoCode()) + CAircraftIcaoCode("B738", "L2J") )); } @@ -179,7 +177,7 @@ namespace BlackSimPlugin return rendered; } - bool CSimulatorFsx::updateOwnSimulatorCockpit(const CAircraft &ownAircraft, const CIdentifier &originator) + bool CSimulatorFsx::updateOwnSimulatorCockpit(const CSimulatedAircraft &ownAircraft, const CIdentifier &originator) { if (originator == this->identifier()) { return false; } if (!this->isSimulating()) { return false; } @@ -825,26 +823,6 @@ namespace BlackSimPlugin } } - QString CSimulatorFsx::simObjectsDir() - { - QString dir = CFsCommonUtil::fsxSimObjectsDirFromRegistry(); - if (!dir.isEmpty()) { return dir; } - return "P:/FlightSimulatorX (MSI)/SimObjects"; - // "p:/temp/SimObjects" - } - - const QStringList &CSimulatorFsx::excludeDirectories() - { - static const QStringList exclude - { - "SimObjects/Animals", - "SimObjects/Misc", - "SimObjects/GroundVehicles", - "SimObjects/Boats" - }; - return exclude; - } - CSimulatorFsxListener::CSimulatorFsxListener(const CSimulatorPluginInfo &info) : ISimulatorListener(info), m_timer(new QTimer(this)) diff --git a/src/plugins/simulator/fsx/simulator_fsx.h b/src/plugins/simulator/fsx/simulator_fsx.h index 0c82f16e2..f5fe204ed 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.h +++ b/src/plugins/simulator/fsx/simulator_fsx.h @@ -103,7 +103,7 @@ namespace BlackSimPlugin virtual int physicallyRemoveAllRemoteAircraft() override; //! \copydoc ISimulator::updateOwnCockpit - virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &ownAircraft, const BlackMisc::CIdentifier &originator) override; + virtual bool updateOwnSimulatorCockpit(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft, const BlackMisc::CIdentifier &originator) override; //! \copydoc ISimulator::displayStatusMessage virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override; @@ -179,13 +179,6 @@ namespace BlackSimPlugin //! Sync time with user's computer void synchronizeTime(const BlackMisc::PhysicalQuantities::CTime &zuluTimeSim, const BlackMisc::PhysicalQuantities::CTime &localTimeSim); - //! SimObjects directory - //! \todo Read from settings if registry fails - static QString simObjectsDir(); - - //! Do not include the following directories for FS - static const QStringList &excludeDirectories(); - static const int SkipUpdateCyclesForCockpit = 10; //!< skip x cycles before updating cockpit again bool m_simConnected = false; //!< Is simulator connected? bool m_simSimulating = false; //!< Simulator running? diff --git a/src/plugins/simulator/xplane/simulator_xplane.cpp b/src/plugins/simulator/xplane/simulator_xplane.cpp index 3dbcf21b4..af1033858 100644 --- a/src/plugins/simulator/xplane/simulator_xplane.cpp +++ b/src/plugins/simulator/xplane/simulator_xplane.cpp @@ -66,7 +66,7 @@ namespace BlackSimPlugin "__A319/A319_CFM.obj __A319/DAL.png", CAircraftModel::TypeModelMatchingDefaultModel, "A319 CFM DAL", - CAircraftIcaoData(CAircraftIcaoCode("A319", "L2J"), CAirlineIcaoCode()) + CAircraftIcaoCode("A319", "L2J") )); resetData(); @@ -115,7 +115,7 @@ namespace BlackSimPlugin situation.setGroundspeed({ m_xplaneData.groundspeed, CSpeedUnit::m_s() }); // updates - updateOwnIcaoData(Aviation::CAircraftIcaoData { m_xplaneData.aircraftIcaoCode }); + updateOwnIcaoCodes(m_xplaneData.aircraftIcaoCode, CAirlineIcaoCode()); updateOwnSituation(situation); updateCockpit( Aviation::CComSystem::getCom1System({ m_xplaneData.com1Active, CFrequencyUnit::kHz() }, { m_xplaneData.com1Standby, CFrequencyUnit::kHz() }), @@ -171,12 +171,12 @@ namespace BlackSimPlugin auto liveriesIt = liveries.begin(); for (; modelStringsIt != modelStrings.end() && icaosIt != icaos.end() && airlinesIt != airlines.end() && liveriesIt != liveries.end(); ++modelStringsIt, ++icaosIt, ++airlinesIt, ++liveriesIt) { - using namespace BlackMisc::Simulation; - CAircraftIcaoData icaoData {*icaosIt, *airlinesIt}; - CLivery livery; //! \todo resolve livery Q_UNUSED(liveriesIt); - CAircraftModel aircraftModel { *modelStringsIt, CAircraftModel::TypeModelMapping, QString(), icaoData }; - aircraftModel.setLivery(livery); + using namespace BlackMisc::Simulation; + CAircraftIcaoCode aircraftIcao(*icaosIt); + CLivery livery; //! \todo resolve livery + livery.setAirlineIcaoCode(CAirlineIcaoCode(*airlinesIt)); + CAircraftModel aircraftModel(*modelStringsIt, CAircraftModel::TypeDatabaseEntry, QString(), aircraftIcao, livery); m_installedModels.push_back(aircraftModel); } @@ -246,18 +246,19 @@ namespace BlackSimPlugin void CSimulatorXPlane::ps_emitOwnAircraftModelChanged(const QString &path, const QString &filename, const QString &livery, const QString &icao) { + Q_UNUSED(icao); + //! \todo XP, change as appropriate, add resolution of own livery // try to set correct model and ICAO values here // thy show up in GUI CAircraftModel model(getOwnAircraftModel()); - CAirlineIcaoCode airlineIcao(model.getAirlineIcaoCode()); + CAirlineIcaoCode airlineIcaoCode(model.getAirlineIcaoCode()); model.setModelType(CAircraftModel::TypeOwnSimulatorModel); model.setFileName(path + "/" + filename); - model.setLivery(CLivery("XPLANE." + livery, airlineIcao, "XP livery", "", "", false)); - CAircraftIcaoData aircraftIcao(icao); + model.setLivery(CLivery("XPLANE." + livery, airlineIcaoCode, "XP livery", "", "", false)); // updates - updateOwnIcaoData(aircraftIcao); + updateOwnIcaoCodes(model.getAircraftIcaoCode(), airlineIcaoCode); updateOwnModel(model); emit ownAircraftModelChanged(getOwnAircraft()); } @@ -341,7 +342,7 @@ namespace BlackSimPlugin return getAircraftInRangeForCallsign(callsign).isRendered(); } - bool CSimulatorXPlane::updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const CIdentifier &originator) + bool CSimulatorXPlane::updateOwnSimulatorCockpit(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const CIdentifier &originator) { Q_ASSERT(isConnected()); if (originator == this->identifier()) { return false; } @@ -383,9 +384,11 @@ namespace BlackSimPlugin this->updateAircraftModel(callsign, aircraftModel, identifier()); CSimulatedAircraft aircraftAfterModelApplied(getAircraftInRangeForCallsign(newRemoteAircraft.getCallsign())); - CAircraftIcaoData icao = newRemoteAircraft.getIcaoInfo(); QString livery = aircraftModel.getLivery().getCombinedCode(); //! \todo livery resolution for XP - m_traffic->addPlane(newRemoteAircraft.getCallsign().asString(), aircraftModel.getModelString(), icao.getAircraftDesignator(), icao.getAirlineDesignator(), livery); + m_traffic->addPlane(newRemoteAircraft.getCallsign().asString(), aircraftModel.getModelString(), + newRemoteAircraft.getAircraftIcaoCode().getDesignator(), + newRemoteAircraft.getAirlineIcaoCode().getDesignator(), + livery); updateAircraftRendered(newRemoteAircraft.getCallsign(), true, identifier()); CLogMessage(this).info("XP: Added aircraft %1") << newRemoteAircraft.getCallsign().toQString(); @@ -458,12 +461,6 @@ namespace BlackSimPlugin return this->changeRemoteAircraftEnabled(aircraft, originator); } - CAircraftIcaoData CSimulatorXPlane::getIcaoForModelString(const QString &modelString) const - { - Q_UNUSED(modelString); - return CAircraftIcaoData(); - } - bool CSimulatorXPlane::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const CIdentifier &originator) { if (originator == this->identifier()) { return false; } diff --git a/src/plugins/simulator/xplane/simulator_xplane.h b/src/plugins/simulator/xplane/simulator_xplane.h index e79a413d8..93cef9103 100644 --- a/src/plugins/simulator/xplane/simulator_xplane.h +++ b/src/plugins/simulator/xplane/simulator_xplane.h @@ -44,9 +44,6 @@ namespace BlackSimPlugin //! \copydoc ISimulator::isTimeSynchronized virtual bool isTimeSynchronized() const override { return false; } // TODO: Can we query the XP intrinisc feature? - //! \copydoc BlackCore::ISimulator::getIcaoForModelString - virtual BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const override; - //! \copydoc BlackCore::ISimulator::connectTo virtual bool connectTo() override; @@ -75,7 +72,7 @@ namespace BlackSimPlugin virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) override; //! \copydoc BlackCore::ISimulator::updateOwnSimulatorCockpit - virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const BlackMisc::CIdentifier &originator) override; + virtual bool updateOwnSimulatorCockpit(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) override; //! \copydoc BlackCore::ISimulator::displayStatusMessage virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override;