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

Refactor Simulator connection status

Browse Source 
* Removed obsolete and unused signals (ISimulator, CSimulatorContext)
* Removed ISimulator::ConnectionStatus enum
This commit is contained in:
Michał Garapich
2015-03-31 20:39:31 +02:00
committed by Roland Winklmeier
parent 9d37a0876d
commit c5a1a6048b
11 changed files with 48 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackgui/components/infobarstatuscomponent.cpp
View File

@@ -13,6 +13,7 @@
#include "blackcore/context_network.h"
#include "blackcore/context_application.h"
#include "blackcore/context_audio.h"
#include "blackcore/simulator.h"
#include "blackmisc/project.h"
#include "blackmisc/icons.h"
@@ -97,21 +98,16 @@ namespace BlackGui
}
}
void CInfoBarStatusComponent::ps_onSimulatorStatusChanged(bool connected, bool running, bool paused)
void CInfoBarStatusComponent::ps_onSimulatorStatusChanged(quint8 status)
{
if (connected && running)
{
// if (connected && running)
if (status & (ISimulator::Connected | ISimulator::Running)) {
this->ui->led_Simulator->setOn(true);
}
else if (connected)
{
} else if (status & ISimulator::Connected) {
this->ui->led_Simulator->setTriState();
}
else
{
} else {
this->ui->led_Simulator->setOn(false);
}
Q_UNUSED(paused);
}
void CInfoBarStatusComponent::ps_onNetworkConnectionChanged(uint from, uint to)

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

@@ -54,7 +54,7 @@ namespace BlackGui
private slots:
//! Simulator connection has been changed
void ps_onSimulatorStatusChanged(bool connected, bool running, bool paused);
void ps_onSimulatorStatusChanged(quint8 status);
//! Network connection has been changed
void ps_onNetworkConnectionChanged(uint from, uint to);

8
src/blackgui/components/simulatorcomponent.cpp
View File

@@ -12,6 +12,7 @@
#include "blackcore/context_settings.h"
#include "blackcore/context_simulator.h"
#include "blackcore/context_ownaircraft.h"
#include "blackcore/simulator.h"
#include "blackmisc/iconlist.h"
#include "blackmisc/avaircraft.h"
@@ -101,7 +102,7 @@ namespace BlackGui
{
Q_ASSERT(this->getIContextSimulator());
if (!this->getIContextSimulator()) return;
QObject::connect(this->getIContextSimulator(), &IContextSimulator::connectionChanged, this, &CSimulatorComponent::ps_onSimulatorConnectionChanged);
QObject::connect(this->getIContextSimulator(), &IContextSimulator::simulatorStatusChanged, this, &CSimulatorComponent::ps_onSimulatorStatusChanged);
this->setUpdateInterval(getUpdateIntervalMs());
if (!getIContextSimulator()->isConnected())
@@ -110,10 +111,9 @@ namespace BlackGui
}
}
void CSimulatorComponent::ps_onSimulatorConnectionChanged(bool isAvailable)
void CSimulatorComponent::ps_onSimulatorStatusChanged(int status)
{
if (isAvailable)
{
if (status & ISimulator::Connected) {
int intervalMs = getUpdateIntervalMs();
this->m_updateTimer->startTimer(intervalMs);
} else {

4
src/blackgui/components/simulatorcomponent.h
View File

@@ -72,8 +72,8 @@ namespace BlackGui
void runtimeHasBeenSet() override;
private slots:
//! \copydoc ISimulator::
void ps_onSimulatorConnectionChanged(bool isAvailable);
//! \copydoc ISimulator::simulatorStatusChanged
void ps_onSimulatorStatusChanged(int status);
private:
//! Update interval