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

refs #395, moved thread safe aircraft parts / situations (from interpolator) to airspace

Browse Source 
* access via provider, access now possible also beyond the scope of interpolator
* will be used in (to be written airpace analyzer)
* renamed some member functions as required
* fixed some asserts / Doxygen comments
* adjusted unit tests
* added vtolAircraft flag for interpolator, not fully used everywhere

remarks: update signals for parts / situation still only needed in XP driver
This commit is contained in:
Klaus Basan
2015-04-21 04:01:09 +02:00
committed by Mathew Sutcliffe
parent 32e65669a3
commit 48188dd28d
17 changed files with 356 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/blackmisc/simulation/remoteaircraftproviderdummy.cpp
View File

@@ -29,24 +29,30 @@ namespace BlackMisc
return m_aircraft;
}
const CAircraftPartsList &CRemoteAircraftProviderDummy::remoteAircraftParts() const
CAircraftPartsList CRemoteAircraftProviderDummy::remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeBefore) const
{
return m_parts;
if (cutoffTimeBefore < 0) { return m_parts.findByCallsign(callsign); }
return m_parts.findByCallsign(callsign).findBefore(cutoffTimeBefore);
}
CAircraftPartsList &CRemoteAircraftProviderDummy::remoteAircraftParts()
CAircraftSituationList CRemoteAircraftProviderDummy::remoteAircraftSituations(const BlackMisc::Aviation::CCallsign &callsign) const
{
return m_parts;
return m_situations.findByCallsign(callsign);
}
const CAircraftSituationList &CRemoteAircraftProviderDummy::remoteAircraftSituations() const
int CRemoteAircraftProviderDummy::remoteAircraftSituationsCount(const CCallsign &callsign) const
{
return m_situations;
return remoteAircraftSituations(callsign).size();
}
CAircraftSituationList &CRemoteAircraftProviderDummy::remoteAircraftSituations()
CCallsignSet CRemoteAircraftProviderDummy::remoteAircraftSupportingParts() const
{
return m_situations;
return m_parts.getCallsigns();
}
bool CRemoteAircraftProviderDummy::isRemoteAircraftSupportingParts(const CCallsign &callsign) const
{
return remoteAircraftParts(callsign).size() > 0;
}
bool CRemoteAircraftProviderDummy::connectRemoteAircraftProviderSignals(std::function<void (const CAircraftSituation &)> situationSlot, std::function<void (const CAircraftParts &)> partsSlot, std::function<void (const CCallsign &)> removedAircraftSlot)
@@ -83,14 +89,14 @@ namespace BlackMisc
void CRemoteAircraftProviderDummy::insertNewSituation(const CAircraftSituation &situation)
{
this->m_situations.push_frontMaxElements(situation, 20);
this->m_situations.push_front(situation);
this->m_situations.sortLatestFirst(); // like in real world, latest should be first
emit addedRemoteAircraftSituation(situation);
}
void CRemoteAircraftProviderDummy::insertNewAircraftParts(const CAircraftParts &parts)
{
this->m_parts.push_frontMaxElements(parts, 20);
this->m_parts.push_front(parts);
this->m_parts.sortLatestFirst(); // like in real world, latest should be first
emit addedRemoteAircraftParts(parts);
}