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

Removed unused code.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2017-11-09 21:48:52 +00:00
parent e0d9fb9df1
commit a7124ec589
6 changed files with 0 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -222,25 +222,6 @@ namespace BlackSimPlugin
} }
} }
void CSimulatorXPlane::ps_installedModelsUpdated(const QStringList &modelStrings, const QStringList &icaos, const QStringList &airlines, const QStringList &liveries)
{
m_installedModels.clear();
auto modelStringsIt = modelStrings.begin();
auto icaosIt = icaos.begin();
auto airlinesIt = airlines.begin();
auto liveriesIt = liveries.begin();
for (; modelStringsIt != modelStrings.end() && icaosIt != icaos.end() && airlinesIt != airlines.end() && liveriesIt != liveries.end(); ++modelStringsIt, ++icaosIt, ++airlinesIt, ++liveriesIt)
{
Q_UNUSED(liveriesIt);
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);
}
}
bool CSimulatorXPlane::isConnected() const bool CSimulatorXPlane::isConnected() const
{ {
return m_service && m_traffic && m_weather; return m_service && m_traffic && m_weather;
@@ -256,12 +237,9 @@ namespace BlackSimPlugin
if (m_service->isValid() && m_traffic->isValid() && m_weather->isValid() && m_traffic->initialize()) if (m_service->isValid() && m_traffic->isValid() && m_weather->isValid() && m_traffic->initialize())
{ {
// FIXME duplication
connect(m_service, &CXSwiftBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::ps_emitOwnAircraftModelChanged); connect(m_service, &CXSwiftBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::ps_emitOwnAircraftModelChanged);
connect(m_service, &CXSwiftBusServiceProxy::airportsInRangeUpdated, this, &CSimulatorXPlane::ps_setAirportsInRange); connect(m_service, &CXSwiftBusServiceProxy::airportsInRangeUpdated, this, &CSimulatorXPlane::ps_setAirportsInRange);
connect(m_traffic, &CXSwiftBusTrafficProxy::installedModelsUpdated, this, &CSimulatorXPlane::ps_installedModelsUpdated);
m_service->updateAirportsInRange(); m_service->updateAirportsInRange();
m_traffic->updateInstalledModels();
if (m_watcher) { m_watcher->setConnection(m_conn); } if (m_watcher) { m_watcher->setConnection(m_conn); }
loadCslPackages(); loadCslPackages();
emitSimulatorCombinedStatus(); emitSimulatorCombinedStatus();

2
src/plugins/simulator/xplane/simulatorxplane.h
View File

@@ -138,7 +138,6 @@ namespace BlackSimPlugin
const QString &modelString, const QString &name, const QString &distributor, const QString &description); const QString &modelString, const QString &name, const QString &distributor, const QString &description);
void ps_fastTimerTimeout(); void ps_fastTimerTimeout();
void ps_slowTimerTimeout(); void ps_slowTimerTimeout();
void ps_installedModelsUpdated(const QStringList &modelStrings, const QStringList &icaos, const QStringList &airlines, const QStringList &liveries);
private: private:
void loadCslPackages(); void loadCslPackages();
@@ -152,7 +151,6 @@ namespace BlackSimPlugin
QTimer *m_fastTimer { nullptr }; QTimer *m_fastTimer { nullptr };
QTimer *m_slowTimer { nullptr }; QTimer *m_slowTimer { nullptr };
BlackMisc::Aviation::CAirportList m_airportsInRange; //!< aiports in range of own aircraft BlackMisc::Aviation::CAirportList m_airportsInRange; //!< aiports in range of own aircraft
BlackMisc::Simulation::CAircraftModelList m_installedModels; //!< \todo Do we still need this, as we now focus on model set
BlackMisc::CData<BlackMisc::Simulation::Data::TModelSetCacheXP> m_modelSet { this }; BlackMisc::CData<BlackMisc::Simulation::Data::TModelSetCacheXP> m_modelSet { this };
//! \todo Add units to members? pitchDeg?, altitudeFt? //! \todo Add units to members? pitchDeg?, altitudeFt?

5
src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp
View File

@@ -56,11 +56,6 @@ namespace BlackSimPlugin
return m_dbusInterface->callDBusRet<bool>(QLatin1String("isDrawingLabels")); return m_dbusInterface->callDBusRet<bool>(QLatin1String("isDrawingLabels"));
} }
void CXSwiftBusTrafficProxy::updateInstalledModels() const
{
m_dbusInterface->callDBus(QLatin1String("updateInstalledModels"));
}
void CXSwiftBusTrafficProxy::setMaxPlanes(int planes) void CXSwiftBusTrafficProxy::setMaxPlanes(int planes)
{ {
m_dbusInterface->callDBus(QLatin1String("setMaxPlanes"), planes); m_dbusInterface->callDBus(QLatin1String("setMaxPlanes"), planes);

7
src/plugins/simulator/xplane/xswiftbustrafficproxy.h
View File

@@ -61,10 +61,6 @@ namespace BlackSimPlugin
private: private:
BlackMisc::CGenericDBusInterface *m_dbusInterface = nullptr; BlackMisc::CGenericDBusInterface *m_dbusInterface = nullptr;
signals:
//! \copydoc XSwiftBus::CTraffic::installedModelsUpdated
void installedModelsUpdated(const QStringList &modelStrings, const QStringList &icaos, const QStringList &airlines, const QStringList &liveries);
public slots: public slots:
//! \copydoc XSwiftBus::CTraffic::initialize //! \copydoc XSwiftBus::CTraffic::initialize
bool initialize(); bool initialize();
@@ -84,9 +80,6 @@ namespace BlackSimPlugin
//! \copydoc XSwiftBus::CTraffic::isDrawingLabels //! \copydoc XSwiftBus::CTraffic::isDrawingLabels
bool isDrawingLabels() const; bool isDrawingLabels() const;
//! \copydoc XSwiftBus::CTraffic::updateInstalledModels
void updateInstalledModels() const;
//! \copydoc XSwiftBus::CTraffic::setMaxPlanes //! \copydoc XSwiftBus::CTraffic::setMaxPlanes
void setMaxPlanes(int planes); void setMaxPlanes(int planes);

24
src/xswiftbus/traffic.cpp
View File

@@ -180,30 +180,6 @@ namespace XSwiftBus
return XPMPDrawingAircraftLabels(); return XPMPDrawingAircraftLabels();
} }
void CTraffic::updateInstalledModels()
{
int numberOfModels = XPMPGetNumberOfInstalledModels();
QStringList modelNames;
QStringList icaos;
QStringList airlines;
QStringList liveries;
for (int i = 0; i < numberOfModels; ++i)
{
const char *modelName = nullptr;
const char *icao = nullptr;
const char *airline = nullptr;
const char *livery = nullptr;
XPMPGetModelInfo(i, &modelName, &icao, &airline, &livery);
modelNames.append(QString::fromLocal8Bit(modelName));
icaos.append(QString::fromLocal8Bit(icao));
airlines.append(QString::fromLocal8Bit(airline));
liveries.append(QString::fromLocal8Bit(livery));
}
emit installedModelsUpdated(modelNames, icaos, airlines, liveries);
}
void CTraffic::setMaxPlanes(int planes) void CTraffic::setMaxPlanes(int planes)
{ {
g_maxPlanes = planes; g_maxPlanes = planes;

7
src/xswiftbus/traffic.h
View File

@@ -65,10 +65,6 @@ namespace XSwiftBus
//! Called by XPluginStart //! Called by XPluginStart
static void initLegacyData(); static void initLegacyData();
signals:
//! Installed models updated.
void installedModelsUpdated(const QStringList &modelStrings, const QStringList &icaos, const QStringList &airlines, const QStringList &liveries);
public slots: public slots:
//! Initialize the multiplayer planes rendering and return true if successful //! Initialize the multiplayer planes rendering and return true if successful
bool initialize(); bool initialize();
@@ -88,9 +84,6 @@ namespace XSwiftBus
//! Get whether the plugin draws type and callsign labels above aircraft //! Get whether the plugin draws type and callsign labels above aircraft
bool isDrawingLabels() const; bool isDrawingLabels() const;
//! Called by newly connected client to cause installedModelsUpdated to be emitted.
void updateInstalledModels();
//! Set the maximum number of aircraft. //! Set the maximum number of aircraft.
void setMaxPlanes(int planes); void setMaxPlanes(int planes);