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

refs #246 added comments to highlight issues of dependencies and large number of scenarios

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-06-11 21:05:25 +01:00
parent 81c6805822
commit ac80bce171
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackcore/context_network_atc.cpp
View File

@@ -56,6 +56,7 @@ namespace BlackCore
this->m_atcStationsBooked.push_back(bookedStation); this->m_atcStationsBooked.push_back(bookedStation);
} }
// TODO (MS) no test for if (this->getIContextApplication()) here?
this->getIContextApplication()->sendStatusMessage(CStatusMessage::getInfoMessage("Read bookings from network", CStatusMessage::TypeTrafficNetwork)); this->getIContextApplication()->sendStatusMessage(CStatusMessage::getInfoMessage("Read bookings from network", CStatusMessage::TypeTrafficNetwork));
} }

15
src/blackcore/context_network_impl.cpp
View File

@@ -76,7 +76,12 @@ namespace BlackCore
this->connect(this->m_network, &INetwork::capabilitiesReplyReceived, this, &CContextNetwork::psFsdCapabilitiesReplyReceived); this->connect(this->m_network, &INetwork::capabilitiesReplyReceived, this, &CContextNetwork::psFsdCapabilitiesReplyReceived);
this->connect(this->m_network, &INetwork::customPacketReceived, this, &CContextNetwork::psFsdCustomPacketReceived); this->connect(this->m_network, &INetwork::customPacketReceived, this, &CContextNetwork::psFsdCustomPacketReceived);
this->connect(this->m_network, &INetwork::serverReplyReceived, this, &CContextNetwork::psFsdServerReplyReceived); this->connect(this->m_network, &INetwork::serverReplyReceived, this, &CContextNetwork::psFsdServerReplyReceived);
if (this->getIContextApplication()) this->connect(this->m_network, &INetwork::statusMessage, this->getIContextApplication(), &IContextApplication::sendStatusMessage);
// FIXME (MS) conditional increases the number of scenarios which must be considered and continuously tested
if (this->getIContextApplication())
{
this->connect(this->m_network, &INetwork::statusMessage, this->getIContextApplication(), &IContextApplication::sendStatusMessage);
}
} }
/* /*
@@ -347,7 +352,11 @@ namespace BlackCore
if (!message.isEmpty()) m.append(" ").append(message); if (!message.isEmpty()) m.append(" ").append(message);
msgs.push_back(CStatusMessage(CStatusMessage::TypeTrafficNetwork, msgs.push_back(CStatusMessage(CStatusMessage::TypeTrafficNetwork,
to == INetwork::DisconnectedError ? CStatusMessage::SeverityError : CStatusMessage::SeverityInfo, m)); to == INetwork::DisconnectedError ? CStatusMessage::SeverityError : CStatusMessage::SeverityInfo, m));
if (this->getIContextApplication()) this->getIContextApplication()->sendStatusMessages(msgs); // FIXME (MS) conditional increases the number of scenarios which must be considered and continuously tested
if (this->getIContextApplication())
{
this->getIContextApplication()->sendStatusMessages(msgs);
}
// send as own signal // send as own signal
emit this->connectionStatusChanged(from, to, message); emit this->connectionStatusChanged(from, to, message);
@@ -377,6 +386,7 @@ namespace BlackCore
void CContextNetwork::psDataFileRead() void CContextNetwork::psDataFileRead()
{ {
this->getRuntime()->logSlot(c_logContext, Q_FUNC_INFO); this->getRuntime()->logSlot(c_logContext, Q_FUNC_INFO);
// TODO (MS) no test for if (this->getIContextApplication()) here?
this->getIContextApplication()->sendStatusMessage(CStatusMessage::getInfoMessage("Read VATSIM data file", CStatusMessage::TypeTrafficNetwork)); this->getIContextApplication()->sendStatusMessage(CStatusMessage::getInfoMessage("Read VATSIM data file", CStatusMessage::TypeTrafficNetwork));
} }
@@ -485,6 +495,7 @@ namespace BlackCore
CAircraft me = this->ownAircraft(); CAircraft me = this->ownAircraft();
CAircraftIcao icao = me.getIcaoInfo(); CAircraftIcao icao = me.getIcaoInfo();
QString modelString; QString modelString;
// FIXME (MS) simulator context should send model string to own aircraft context, so we wouldn't need to interrogate the simulator context here.
if (this->getIContextSimulator()) if (this->getIContextSimulator())
{ {
if (this->getIContextSimulator()->isConnected()) modelString = this->getIContextSimulator()->getOwnAircraftModel().getQueriedModelString(); if (this->getIContextSimulator()->isConnected()) modelString = this->getIContextSimulator()->getOwnAircraftModel().getQueriedModelString();