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

Style

Browse Source
This commit is contained in:
Klaus Basan
2019-09-15 14:51:43 +02:00
committed by Mat Sutcliffe
parent f80e093a0a
commit b408c8ffed
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/components/interpolationlogdisplay.h
View File

@@ -166,7 +166,7 @@ namespace BlackGui
BlackMisc::Aviation::CAircraftSituationList m_lastInterpolations; //!< list of last interpolations BlackMisc::Aviation::CAircraftSituationList m_lastInterpolations; //!< list of last interpolations
BlackMisc::Aviation::CCallsign m_callsign; //!< current callsign BlackMisc::Aviation::CCallsign m_callsign; //!< current callsign
int m_elvRequested = 0; //!< counted via signal int m_elvRequested = 0; //!< counted via signal
int m_elvReceived = 0; //!< counted via signal int m_elvReceived = 0; //!< counted via signal
static const QString &startText(); static const QString &startText();
static const QString &stopText(); static const QString &stopText();

2
src/blackmisc/simulation/simulatedaircraftlist.h
View File

@@ -96,7 +96,7 @@ namespace BlackMisc
//! Set aircraft parts and mark as synchronized //! Set aircraft parts and mark as synchronized
int setAircraftPartsSynchronized(const Aviation::CCallsign &callsign, const Aviation::CAircraftParts &parts, bool onlyFirst = true); int setAircraftPartsSynchronized(const Aviation::CCallsign &callsign, const Aviation::CAircraftParts &parts, bool onlyFirst = true);
//! Set aircraft parts //! Set aircraft situation
int setAircraftSituation(const Aviation::CCallsign &callsign, const Aviation::CAircraftSituation &situation, bool onlyFirst = true); int setAircraftSituation(const Aviation::CCallsign &callsign, const Aviation::CAircraftSituation &situation, bool onlyFirst = true);
//! Set ground elevation //! Set ground elevation

8
src/plugins/simulator/fs9/lobbyclient.h
View File

@@ -22,7 +22,7 @@ namespace BlackSimPlugin
CLobbyClient(QObject *parent = nullptr); CLobbyClient(QObject *parent = nullptr);
//! Destructor //! Destructor
virtual ~CLobbyClient(); virtual ~CLobbyClient() override;
//! Initialize DirectPlay //! Initialize DirectPlay
HRESULT initDirectPlay(); HRESULT initDirectPlay();
@@ -45,9 +45,9 @@ namespace BlackSimPlugin
//! DirectPlay message handler //! DirectPlay message handler
HRESULT directPlayLobbyMessageHandler(DWORD messageId, void *msgBuffer); HRESULT directPlayLobbyMessageHandler(DWORD messageId, void *msgBuffer);
IDirectPlay8Peer *m_directPlayPeer = nullptr; //!< DirectPlay peer address IDirectPlay8Peer *m_directPlayPeer = nullptr; //!< DirectPlay peer address
IDirectPlay8Address *m_deviceAddress = nullptr; //!< DirectPlay device address IDirectPlay8Address *m_deviceAddress = nullptr; //!< DirectPlay device address
IDirectPlay8Address *m_hostAddress = nullptr; //!< DirectPlay device address IDirectPlay8Address *m_hostAddress = nullptr; //!< DirectPlay device address
IDirectPlay8LobbyClient *m_dpLobbyClient = nullptr; IDirectPlay8LobbyClient *m_dpLobbyClient = nullptr;
QString m_hostname = "localhost"; QString m_hostname = "localhost";

3
src/plugins/simulator/fs9/simulatorfs9.cpp
View File

@@ -40,8 +40,6 @@ namespace BlackSimPlugin
{ {
CAircraftSituation aircraftSituationFromFS9(const MPPositionVelocity &positionVelocity) CAircraftSituation aircraftSituationFromFS9(const MPPositionVelocity &positionVelocity)
{ {
CAircraftSituation situation;
double dHigh = positionVelocity.lat_i; double dHigh = positionVelocity.lat_i;
double dLow = positionVelocity.lat_f; double dLow = positionVelocity.lat_f;
@@ -78,6 +76,7 @@ namespace BlackSimPlugin
dLow = dLow / 65536.0; dLow = dLow / 65536.0;
CAircraftSituation situation;
situation.setPosition(position); situation.setPosition(position);
situation.setAltitude(CAltitude(dHigh + dLow, CAltitude::MeanSeaLevel, CLengthUnit::m())); situation.setAltitude(CAltitude(dHigh + dLow, CAltitude::MeanSeaLevel, CLengthUnit::m()));
const double groundSpeed = positionVelocity.ground_velocity / 65536.0; const double groundSpeed = positionVelocity.ground_velocity / 65536.0;

10
src/plugins/simulator/fs9/simulatorfs9.h
View File

@@ -141,9 +141,9 @@ namespace BlackSimPlugin
//! Check connection to FS9 //! Check connection to FS9
bool checkConnection(bool canLobbyConnect); bool checkConnection(bool canLobbyConnect);
QTimer *m_timer = nullptr; QTimer *m_timer = nullptr;
bool m_isConnecting = false; bool m_isConnecting = false;
bool m_isStarted = false; bool m_isStarted = false;
QSharedPointer<CFs9Host> m_fs9Host; QSharedPointer<CFs9Host> m_fs9Host;
QSharedPointer<CLobbyClient> m_lobbyClient; QSharedPointer<CLobbyClient> m_lobbyClient;
}; };
@@ -165,10 +165,10 @@ namespace BlackSimPlugin
//! \copydoc BlackCore::ISimulatorFactory::create //! \copydoc BlackCore::ISimulatorFactory::create
virtual BlackCore::ISimulator *create( virtual BlackCore::ISimulator *create(
const BlackMisc::Simulation::CSimulatorPluginInfo &info, const BlackMisc::Simulation::CSimulatorPluginInfo &info,
BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider,
BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider,
BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider,
BlackMisc::Network::IClientProvider *clientProvider BlackMisc::Network::IClientProvider *clientProvider
) override; ) override;
//! \copydoc BlackCore::ISimulatorFactory::createListener //! \copydoc BlackCore::ISimulatorFactory::createListener