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

Ref T259, Ref T243 formatting

Browse Source
This commit is contained in:
Klaus Basan
2018-03-07 02:01:37 +01:00
parent 83b6578e69
commit 8021cf76fd
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackcore/airspacemonitor.h
View File

@@ -76,12 +76,12 @@ namespace BlackCore
Q_INTERFACES(BlackMisc::Simulation::IRemoteAircraftProvider) Q_INTERFACES(BlackMisc::Simulation::IRemoteAircraftProvider)
public: public:
//! Constructor
CAirspaceMonitor(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraft, INetwork *network, QObject *parent);
//! Log categories //! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories(); static const BlackMisc::CLogCategoryList &getLogCategories();
//! Constructor
CAirspaceMonitor(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraft, INetwork *network, QObject *parent);
//! \ingroup remoteaircraftprovider //! \ingroup remoteaircraftprovider
//! @{ //! @{
virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override; virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override;

2
src/blackcore/context/contextnetworkimpl.h
View File

@@ -236,7 +236,7 @@ namespace BlackCore
//! Render restrictions have been changed, used with analyzer //! Render restrictions have been changed, used with analyzer
//! \sa CAirspaceAnalyzer //! \sa CAirspaceAnalyzer
//! \ingroup crosscontextslot //! \ingroup crosscontextfunction
void xCtxSimulatorRenderRestrictionsChanged(bool restricted, bool enabled, int maxAircraft, const BlackMisc::PhysicalQuantities::CLength &maxRenderedDistance); void xCtxSimulatorRenderRestrictionsChanged(bool restricted, bool enabled, int maxAircraft, const BlackMisc::PhysicalQuantities::CLength &maxRenderedDistance);
}; };
} // ns } // ns

4
src/blackcore/context/contextownaircraftimpl.h
View File

@@ -184,11 +184,11 @@ namespace BlackCore
BlackMisc::CSetting<Vatsim::TCurrentTrafficServer> m_currentNetworkServer { this }; BlackMisc::CSetting<Vatsim::TCurrentTrafficServer> m_currentNetworkServer { this };
//! Station has been changed, needed to tune in/out voice room //! Station has been changed, needed to tune in/out voice room
//! \ingroup crosscontextslot //! \ingroup crosscontextfunction
void xCtxChangedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &atcStation, bool connected); void xCtxChangedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &atcStation, bool connected);
//! Simulator model has been changed //! Simulator model has been changed
//! \ingroup crosscontextslot //! \ingroup crosscontextfunction
void xCtxChangedSimulatorModel(const BlackMisc::Simulation::CAircraftModel &model); void xCtxChangedSimulatorModel(const BlackMisc::Simulation::CAircraftModel &model);
//! Web data loaded //! Web data loaded

2
src/blackcore/context/contextsimulatorimpl.h
View File

@@ -143,7 +143,7 @@ namespace BlackCore
private: private:
// ------------ slots connected with network or other contexts --------- // ------------ slots connected with network or other contexts ---------
//! \ingroup crosscontextslot //! \ingroup crosscontextfunction
//! @{ //! @{
//! Remote aircraft added //! Remote aircraft added

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

@@ -221,9 +221,9 @@ namespace BlackSimPlugin
m_xplaneData.gearReployRatio > 0, static_cast<int>(m_xplaneData.flapsReployRatio * 100), m_xplaneData.gearReployRatio > 0, static_cast<int>(m_xplaneData.flapsReployRatio * 100),
m_xplaneData.speedBrakeRatio > 0.5, engines, m_xplaneData.onGroundAll m_xplaneData.speedBrakeRatio > 0.5, engines, m_xplaneData.onGroundAll
}; };
updateOwnParts(parts);
requestRemoteAircraftDataFromXPlane(); this->updateOwnParts(parts);
this->requestRemoteAircraftDataFromXPlane();
} }
} }
@@ -250,8 +250,8 @@ namespace BlackSimPlugin
connect(m_trafficProxy, &CXSwiftBusTrafficProxy::simFrame, this, &CSimulatorXPlane::updateRemoteAircraft); connect(m_trafficProxy, &CXSwiftBusTrafficProxy::simFrame, this, &CSimulatorXPlane::updateRemoteAircraft);
connect(m_trafficProxy, &CXSwiftBusTrafficProxy::remoteAircraftData, this, &CSimulatorXPlane::updateRemoteAircraftFromSimulator); connect(m_trafficProxy, &CXSwiftBusTrafficProxy::remoteAircraftData, this, &CSimulatorXPlane::updateRemoteAircraftFromSimulator);
if (m_watcher) { m_watcher->setConnection(m_conn); } if (m_watcher) { m_watcher->setConnection(m_conn); }
loadCslPackages(); this->loadCslPackages();
emitSimulatorCombinedStatus(); this->emitSimulatorCombinedStatus();
return true; return true;
} }
else else