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

Style

Browse Source
This commit is contained in:
Klaus Basan
2019-09-10 22:35:57 +02:00
committed by Mat Sutcliffe
parent c7b90ae439
commit 19c9a51c38
11 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/simulator/emulated/simulatoremulated.cpp
View File

@@ -205,9 +205,9 @@ namespace BlackSimPlugin
void CSimulatorEmulated::setCombinedStatus(bool connected, bool simulating, bool paused)
{
m_connected = connected;
m_connected = connected;
m_simulating = simulating;
m_paused = paused;
m_paused = paused;
this->emitSimulatorCombinedStatus();
}

18
src/plugins/simulator/emulated/simulatoremulated.h
View File

@@ -161,19 +161,19 @@ namespace BlackSimPlugin
//! \remarks basically does the same as a real driver, obtains data from the interpolator
void updateRemoteAircraft();
bool m_log = false; //!< from settings
bool m_paused = false;
bool m_connected = true;
bool m_log = false; //!< from settings
bool m_paused = false;
bool m_connected = true;
bool m_simulating = true;
bool m_timeSyncronized = false;
int m_countInterpolatedSituations = 0;
int m_countInterpolatedParts = 0;
int m_countInterpolatedParts = 0;
QTimer m_interpolatorFetchTimer; //!< fetch data from interpolator
BlackMisc::PhysicalQuantities::CTime m_offsetTime;
BlackMisc::Simulation::CSimulatedAircraft m_myAircraft; //!< represents own aircraft of simulator
BlackMisc::Simulation::CSimulatedAircraftList m_renderedAircraft; //!< represents remote aircraft in simulator
QScopedPointer<CSimulatorEmulatedMonitorDialog> m_monitorWidget; //!< parent will be main window, so we need to destroy widget when destroyed
BlackMisc::CConnectionGuard m_connectionGuard; //!< connected with provider
BlackMisc::PhysicalQuantities::CTime m_offsetTime;
BlackMisc::Simulation::CSimulatedAircraft m_myAircraft; //!< represents own aircraft of simulator
BlackMisc::Simulation::CSimulatedAircraftList m_renderedAircraft; //!< represents remote aircraft in simulator
QScopedPointer<CSimulatorEmulatedMonitorDialog> m_monitorWidget; //!< parent will be main window, so we need to destroy widget when destroyed
BlackMisc::CConnectionGuard m_connectionGuard; //!< connected with provider
BlackMisc::CSettingReadOnly<BlackMisc::Simulation::Settings::TSwiftPlugin> m_pluginSettings { this, &CSimulatorEmulated::onSettingsChanged };
QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Simulation::CInterpolatorMultiWrapper> m_interpolators; //!< interpolators per callsign
};

2
src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h
View File

@@ -42,7 +42,7 @@ namespace BlackSimPlugin
explicit CSimulatorEmulatedMonitorDialog(CSimulatorEmulated *simulator, QWidget *parent = nullptr);
//! Dtor
virtual ~CSimulatorEmulatedMonitorDialog();
virtual ~CSimulatorEmulatedMonitorDialog() override;
//! \copydoc BlackGui::Components::CLogComponent::appendStatusMessageToList
void appendStatusMessageToList(const BlackMisc::CStatusMessage &statusMessage);

2
src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui
View File

@@ -68,7 +68,7 @@
<item>
<widget class="QTabWidget" name="tw_SwiftMonitorDialog">
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="tb_AircraftSituation">
<attribute name="title">

2
src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp
View File

@@ -80,7 +80,7 @@ namespace BlackSimPlugin
{
if (trace.isValid())
{
// it can happen the object is not yet
// it can happen the object is not yet existing
CSimConnectObject simObject = simulatorFsxP3D->getSimObjectForTrace(trace);
if (simObject.isInvalid()) { simObject = trace.simObject; } // take the one in the trace
if (simObject.isValid())