Add "ConnectionFailed" to Simulator status enum

Rename connectionChanged to statusChanged

refs #231
This commit is contained in:
Roland Winklmeier
2014-05-06 13:19:11 +02:00
committed by Roland Winklmeier
parent 7a69ad6ad9
commit 5498b449ac
5 changed files with 21 additions and 11 deletions

View File

@@ -113,7 +113,7 @@ namespace BlackCore
m_simulator = factory->create(this);
Q_ASSERT(m_simulator);
connect(m_simulator, SIGNAL(connectionChanged(bool)), this, SLOT(setConnectionStatus(bool)));
connect(m_simulator, SIGNAL(statusChanged(ISimulator::Status)), this, SLOT(setConnectionStatus(ISimulator::Status)));
return true;
}
@@ -132,13 +132,19 @@ namespace BlackCore
getIContextNetwork()->updateOwnCockpit(m_ownAircraft.getCom1System(), m_ownAircraft.getCom2System(), m_ownAircraft.getTransponder());
}
void CContextSimulator::setConnectionStatus(bool value)
void CContextSimulator::setConnectionStatus(ISimulator::Status status)
{
if (value)
if (status == ISimulator::Connected)
{
m_updateTimer->start(100);
emit connectionChanged(true);
}
else
{
m_updateTimer->stop();
emit connectionChanged(value);
emit connectionChanged(false);
}
}
void CContextSimulator::findSimulatorPlugins()

View File

@@ -87,7 +87,7 @@ namespace BlackCore
virtual void updateOwnAircraft();
//! Set new connection status
void setConnectionStatus(bool value);
void setConnectionStatus(ISimulator::Status status);
private:
//! \brief find and catalog all simulator plugins

View File

@@ -28,8 +28,9 @@ namespace BlackCore
//! \brief Simulator connection
enum Status
{
Not_Connected,
Connected
Disconnected,
Connected,
ConnectionFailed
};
//! \brief Constructor
@@ -69,7 +70,7 @@ namespace BlackCore
signals:
//! Emitted when the connection status has changed
void connectionChanged(bool value);
void statusChanged(ISimulator::Status status);
//! Emitted when new a new data object of the user aircraft is received
void ownAircraftReceived(BlackMisc::Aviation::CAircraft aircraft);