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

refs #395, turned remote aircraft provider interface into thread safe interfaces

Browse Source 
* references gone, situations, parts, aircraft now as threadsafe copy
* read only interface gone (no longer references, so no longer needed)
This commit is contained in:
Klaus Basan
2015-04-24 04:41:44 +02:00
committed by Mathew Sutcliffe
parent 24094eaf61
commit 6debd33b4f
24 changed files with 422 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/airspace_analyzer.cpp
View File

@@ -18,10 +18,10 @@ using namespace BlackMisc::PhysicalQuantities;
namespace BlackCore
{
CAirspaceAnalyzer::CAirspaceAnalyzer(const IOwnAircraftProviderReadOnly *ownAircraftProvider, const IRemoteAircraftProviderReadOnly *remoteAircraftProvider, INetwork *network, QObject *parent) :
CAirspaceAnalyzer::CAirspaceAnalyzer(const IOwnAircraftProviderReadOnly *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, INetwork *network, QObject *parent) :
CContinuousWorker(parent, "CAirspaceAnalyzer"),
COwnAircraftAwareReadOnly(ownAircraftProvider),
CRemoteAircraftAwareReadOnly(remoteAircraftProvider)
CRemoteAircraftAware(remoteAircraftProvider)
{
Q_ASSERT_X(network, Q_FUNC_INFO, "Network object required to connect");

4
src/blackcore/airspace_analyzer.h
View File

@@ -34,7 +34,7 @@ namespace BlackCore
class CAirspaceAnalyzer :
public BlackMisc::CContinuousWorker,
public BlackMisc::Simulation::COwnAircraftAwareReadOnly,
public BlackMisc::Simulation::CRemoteAircraftAwareReadOnly
public BlackMisc::Simulation::CRemoteAircraftAware
{
Q_OBJECT
@@ -44,7 +44,7 @@ namespace BlackCore
//! Constructor
CAirspaceAnalyzer(const BlackMisc::Simulation::IOwnAircraftProviderReadOnly *ownAircraftProvider,
const BlackMisc::Simulation::IRemoteAircraftProviderReadOnly *remoteAircraftProvider,
BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider,
INetwork *network, QObject *parent);
public slots:

157
src/blackcore/airspace_monitor.cpp
View File

@@ -60,18 +60,22 @@ namespace BlackCore
this->connect(this->m_analyzer, &CAirspaceAnalyzer::timeoutAtc, this, &CAirspaceMonitor::ps_atcControllerDisconnected);
}
const CSimulatedAircraftList &CAirspaceMonitor::remoteAircraft() const
CSimulatedAircraftList CAirspaceMonitor::getAircraftInRange() const
{
// not thread safe, check
Q_ASSERT(this->thread() == QThread::currentThread());
QReadLocker l(&m_lockAircraft);
return m_aircraftInRange;
}
CSimulatedAircraftList &CAirspaceMonitor::remoteAircraft()
CSimulatedAircraft CAirspaceMonitor::getAircraftForCallsign(const CCallsign &callsign) const
{
// not thread safe, check
Q_ASSERT(this->thread() == QThread::currentThread());
return m_aircraftInRange;
QReadLocker l(&m_lockAircraft);
return m_aircraftInRange.findFirstByCallsign(callsign);
}
int CAirspaceMonitor::getAircraftInRangeCount() const
{
QReadLocker l(&m_lockAircraft);
return m_aircraftInRange.size();
}
CAircraftSituationList CAirspaceMonitor::remoteAircraftSituations(const CCallsign &callsign) const
@@ -121,19 +125,20 @@ namespace BlackCore
std::function<void(const CAircraftParts &)> partsSlot,
std::function<void(const CCallsign &)> removedAircraftSlot)
{
bool s1 = connect(this->m_network, &INetwork::aircraftPositionUpdate, situationSlot);
bool s1 = connect(this, &CAirspaceMonitor::addedAircraftSituation, situationSlot);
Q_ASSERT(s1);
bool s2 = connect(this, &CAirspaceMonitor::addedRemoteAircraftParts, partsSlot);
bool s2 = connect(this, &CAirspaceMonitor::addedAircraftParts, partsSlot);
Q_ASSERT(s2);
bool s3 = connect(this, &CAirspaceMonitor::removedRemoteAircraft, removedAircraftSlot);
bool s3 = connect(this, &CAirspaceMonitor::removedAircraft, removedAircraftSlot);
Q_ASSERT(s3);
return s1 && s2 && s3;
}
bool CAirspaceMonitor::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering, const QString &originator)
{
CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexEnabled, CVariant::fromValue(enabledForRedering));
Q_UNUSED(originator);
CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexEnabled, CVariant::fromValue(enabledForRedering));
QWriteLocker l(&m_lockAircraft);
int c = m_aircraftInRange.applyIfCallsign(callsign, vm);
return c > 0;
}
@@ -141,24 +146,37 @@ namespace BlackCore
bool CAirspaceMonitor::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const QString &originator)
{
Q_UNUSED(originator);
CSimulatedAircraft aircraft = m_aircraftInRange.findFirstByCallsign(callsign);
if (!aircraft.hasValidCallsign()) { return false; }
aircraft.setModel(model); // this consolidates all common data such as callsign, ICAO ...
CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexModel, aircraft.getModel().toCVariant());
QWriteLocker l(&m_lockAircraft);
CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexModel, model.toCVariant());
int c = m_aircraftInRange.applyIfCallsign(callsign, vm);
return c > 0;
}
bool CAirspaceMonitor::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator)
{
CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexFastPositionUpdates, CVariant::fromValue(enableFastPositonUpdates));
Q_UNUSED(originator);
CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexFastPositionUpdates, CVariant::fromValue(enableFastPositonUpdates));
QWriteLocker l(&m_lockAircraft);
int c = m_aircraftInRange.applyIfCallsign(callsign, vm);
return c > 0;
}
bool CAirspaceMonitor::updateAircraftRendered(const CCallsign &callsign, bool rendered, const QString &originator)
{
Q_UNUSED(originator);
CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexRendered, CVariant::fromValue(rendered));
QWriteLocker l(&m_lockAircraft);
int c = m_aircraftInRange.applyIfCallsign(callsign, vm);
return c > 0;
}
void CAirspaceMonitor::updateMarkAllAsNotRendered(const QString &originator)
{
Q_UNUSED(originator);
QWriteLocker l(&m_lockAircraft);
m_aircraftInRange.markAllAsNotRendered();
}
CFlightPlan CAirspaceMonitor::loadFlightPlanFromNetwork(const CCallsign &callsign)
{
CFlightPlan plan;
@@ -195,7 +213,7 @@ namespace BlackCore
CUser user = station.getController();
users.push_back(user);
}
foreach(CAircraft aircraft, this->m_aircraftInRange)
for (const CAircraft &aircraft : this->getAircraftInRange())
{
CUser user = aircraft.getPilot();
users.push_back(user);
@@ -217,7 +235,7 @@ namespace BlackCore
}
// do aircraft first, this will handle most callsigns
foreach(CAircraft aircraft, this->m_aircraftInRange)
for (const CAircraft &aircraft : this->getAircraftInRange())
{
if (searchList.isEmpty()) break;
CCallsign callsign = aircraft.getCallsign();
@@ -319,7 +337,7 @@ namespace BlackCore
{
if (!this->m_network->isConnected()) return;
foreach(CAircraft aircraft, this->m_aircraftInRange)
for (const CAircraft &aircraft : this->getAircraftInRange())
{
const CCallsign cs(aircraft.getCallsign());
this->m_network->sendFrequencyQuery(cs);
@@ -335,9 +353,8 @@ namespace BlackCore
void CAirspaceMonitor::requestAtisUpdates()
{
if (!this->m_network->isConnected()) return;
foreach(CAtcStation station, this->m_atcStationsOnline)
if (!this->m_network->isConnected()) { return; }
for (const CAtcStation &station : this->m_atcStationsOnline)
{
this->m_network->sendAtisQuery(station.getCallsign());
}
@@ -402,7 +419,11 @@ namespace BlackCore
vm.addValue({ CSimulatedAircraft::IndexClient, CClient::IndexUser, CUser::IndexRealName }, realname);
vm.addValue({ CSimulatedAircraft::IndexClient, CClient::IndexVoiceCapabilities }, caps);
this->m_aircraftInRange.applyIf(&CAircraft::getCallsign, callsign, vm);
// lock block
{
QWriteLocker l(&m_lockAircraft);
this->m_aircraftInRange.applyIf(&CAircraft::getCallsign, callsign, vm);
}
// Client
vm = CPropertyIndexVariantMap({CClient::IndexUser, CUser::IndexRealName}, realname);
@@ -428,8 +449,11 @@ namespace BlackCore
// apply same to client in aircraft
vm.prependIndex(static_cast<int>(CSimulatedAircraft::IndexClient));
this->m_aircraftInRange.applyIf(&CSimulatedAircraft::getCallsign, callsign, vm);
// lock block
{
QWriteLocker l(&m_lockAircraft);
this->m_aircraftInRange.applyIf(&CSimulatedAircraft::getCallsign, callsign, vm);
}
if (flags & INetwork::SupportsAircraftConfigs) m_network->sendAircraftConfigQuery(callsign);
}
@@ -447,21 +471,31 @@ namespace BlackCore
this->m_otherClients.push_back(CClient(callsign));
}
this->m_otherClients.applyIf(&CClient::getCallsign, callsign, vm);
// make index from plain -> to client
vm.prependIndex(static_cast<int>(CSimulatedAircraft::IndexClient));
this->m_aircraftInRange.applyIf(&CSimulatedAircraft::getCallsign, callsign, vm);
bool aircraftContainsCallsign;
// lock block
{
QWriteLocker l(&m_lockAircraft);
int u = this->m_aircraftInRange.applyIf(&CSimulatedAircraft::getCallsign, callsign, vm);
// if update was successful we know we have that callsign, otherwise explicit check
aircraftContainsCallsign = (u > 0) || this->m_aircraftInRange.containsCallsign(callsign);
}
this->sendFsipiCustomPacket(callsign); // response
// ICAO response from custom data
if (!aircraftDesignator.isEmpty())
{
CAircraftIcao icao(aircraftDesignator, combinedAircraftType, airlineIcao, "", ""); // from custom packet
if (this->m_aircraftInRange.containsCallsign(callsign))
if (aircraftContainsCallsign)
{
// we have that aircraft, set straight away
this->ps_icaoCodesReceived(callsign, icao);
}
else
{
// store in cache
// store in cache, we can retrieve laterxs
this->m_icaoCodeCache.insert(callsign, icao);
}
}
@@ -506,21 +540,19 @@ namespace BlackCore
void CAirspaceMonitor::removeAllAircraft()
{
for (CAircraft aircraft : m_aircraftInRange)
QWriteLocker l1(&m_lockParts);
QWriteLocker l2(&m_lockSituations);
QWriteLocker l3(&m_lockAircraft);
for (const CAircraft &aircraft : m_aircraftInRange)
{
const CCallsign cs(aircraft.getCallsign());
emit removedRemoteAircraft(cs);
}
// block for lock scope
{
QWriteLocker l1(&m_lockParts);
QWriteLocker l2(&m_lockSituations);
m_situationsByCallsign.clear();
m_partsByCallsign.clear();
m_aircraftSupportingParts.clear();
emit removedAircraft(cs);
}
m_situationsByCallsign.clear();
m_partsByCallsign.clear();
m_aircraftSupportingParts.clear();
m_aircraftInRange.clear();
m_flightPlanCache.clear();
m_icaoCodeCache.clear();
@@ -583,12 +615,18 @@ namespace BlackCore
void CAirspaceMonitor::ps_sendReadyForModelMatching(const CCallsign &callsign, int trial)
{
// some checks for special conditions, e.g. logout -> empty list, but still signals pending
if (!this->m_connected || this->m_aircraftInRange.isEmpty()) { return; }
if (!this->m_aircraftInRange.containsCallsign(callsign)) { return; }
// lock block
CSimulatedAircraft remoteAircraft;
{
QReadLocker l(&m_lockAircraft);
if (!this->m_connected || this->m_aircraftInRange.isEmpty()) { return; }
if (!this->m_aircraftInRange.containsCallsign(callsign)) { return; }
// build simulated aircraft and crosscheck if all data are available
remoteAircraft = CSimulatedAircraft(this->m_aircraftInRange.findFirstByCallsign(callsign));
Q_ASSERT_X(remoteAircraft.hasValidCallsign(), Q_FUNC_INFO, "Invalid callsign");
}
// build simulated aircraft and crosscheck if all data are available
CSimulatedAircraft remoteAircraft(this->m_aircraftInRange.findFirstByCallsign(callsign));
Q_ASSERT_X(remoteAircraft.hasValidCallsign(), "ps_sendReadyForModelMatching", "Inavlid callsign");
CClient remoteClient = this->m_otherClients.findFirstByCallsign(callsign);
remoteAircraft.setClient(remoteClient);
remoteAircraft.setModel(remoteClient.getAircraftModel());
@@ -761,15 +799,18 @@ namespace BlackCore
}
// ICAO code received when aircraft is already removed or not yet ready
// We add it to cache and use it when aircraft is created
if (!this->m_aircraftInRange.containsCallsign(callsign))
{
this->m_icaoCodeCache.insert(callsign, icaoData);
return;
}
QWriteLocker l(&m_lockAircraft);
if (!this->m_aircraftInRange.containsCallsign(callsign))
{
this->m_icaoCodeCache.insert(callsign, icaoData);
return;
}
// update
int c = this->m_aircraftInRange.applyIfCallsign(callsign, vm);
if (c > 0) { ps_sendReadyForModelMatching(callsign, 1); }
// update
int c = this->m_aircraftInRange.applyIfCallsign(callsign, vm);
if (c > 0) { ps_sendReadyForModelMatching(callsign, 1); }
}
}
void CAirspaceMonitor::ps_aircraftUpdateReceived(const CAircraftSituation &situation, const CTransponder &transponder)
@@ -782,8 +823,9 @@ namespace BlackCore
// store situation history
this->storeAircraftSituation(situation);
emit this->addedRemoteAircraftSituation(situation);
emit this->addedAircraftSituation(situation);
QWriteLocker l(&m_lockAircraft);
bool exists = this->m_aircraftInRange.containsCallsign(callsign);
if (!exists)
{
@@ -914,11 +956,12 @@ namespace BlackCore
m_aircraftSupportingParts.remove(callsign);
}
QWriteLocker l(&m_lockAircraft);
bool contains = this->m_aircraftInRange.containsCallsign(callsign);
if (contains)
{
this->m_aircraftInRange.removeByCallsign(callsign);
emit this->removedRemoteAircraft(callsign);
emit this->removedAircraft(callsign);
}
}
@@ -928,6 +971,7 @@ namespace BlackCore
// update
CPropertyIndexVariantMap vm({CAircraft::IndexCom1System, CComSystem::IndexActiveFrequency}, frequency.toCVariant());
QWriteLocker l(&m_lockAircraft);
int changed = this->m_aircraftInRange.applyIf(&CAircraft::getCallsign, callsign, vm, true);
if (changed > 0) { emit this->changedAircraftInRange(); }
}
@@ -936,6 +980,7 @@ namespace BlackCore
{
Q_ASSERT(BlackCore::isCurrentThreadCreatingThread(this));
QWriteLocker l(&m_lockAircraft);
CSimulatedAircraftList list = this->m_aircraftInRange.findByCallsign(callsign);
// Skip unknown callsigns
if (list.isEmpty()) { return; }
@@ -963,7 +1008,7 @@ namespace BlackCore
// store part history (parts always absolute)
this->storeAircraftParts(parts);
emit this->addedRemoteAircraftParts(parts);
emit this->addedAircraftParts(parts);
// here I expect always a changed value
this->m_aircraftInRange.setAircraftParts(callsign, parts);

60
src/blackcore/airspace_monitor.h
View File

@@ -43,36 +43,58 @@ namespace BlackCore
//! Constructor
CAirspaceMonitor(QObject *parent, const BlackMisc::Simulation::IOwnAircraftProviderReadOnly *ownAircraft, INetwork *network, CVatsimBookingReader *bookings, CVatsimDataFileReader *dataFile);
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraft
virtual const BlackMisc::Simulation::CSimulatedAircraftList &remoteAircraft() const override;
//! \copydoc IRemoteAircraftProvider::getAircraftInRange
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override;
//! \copydoc IRemoteAircraftProvider::remoteAircraft
virtual BlackMisc::Simulation::CSimulatedAircraftList &remoteAircraft() override;
//! \copydoc IRemoteAircraftProvider::getAircraftForCallsign
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IRemoteAircraftProvider::getAircraftInRangeCount
//! \ingroup remoteaircraftprovider
virtual int getAircraftInRangeCount() const override;
//! \copydoc IRemoteAircraftProvider::remoteAircraftSituations
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Aviation::CAircraftSituationList remoteAircraftSituations(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IRemoteAircraftProvider::remoteAircraftSituationsCount
//! \ingroup remoteaircraftprovider
virtual int remoteAircraftSituationsCount(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IRemoteAircraftProvider::remoteAircraftParts
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeValuesBefore = -1) const override;
//! \copydoc IRemoteAircraftProviderReadOnly::isRemoteAircraftSupportingParts
//! \copydoc IRemoteAircraftProvider::isRemoteAircraftSupportingParts
//! \ingroup remoteaircraftprovider
virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraftSupportingParts
//! \copydoc IRemoteAircraftProvider::remoteAircraftSupportingParts
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Aviation::CCallsignSet remoteAircraftSupportingParts() const override;
//! \copydoc IRemoteAircraftProvider::updateAircraftEnabled
//! \ingroup remoteaircraftprovider
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator) override;
//! \copydoc IRemoteAircraftProvider::updateAircraftModel
//! \ingroup remoteaircraftprovider
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override;
//! \copydoc IRemoteAircraftProvider::updateFastPositionEnabled
//! \ingroup remoteaircraftprovider
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) override;
//! \copydoc IRemoteAircraftProvider::updateAircraftRendered
//! \ingroup remoteaircraftprovider
virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const QString &originator) override;
//! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered
//! \ingroup remoteaircraftprovider
virtual void updateMarkAllAsNotRendered(const QString &originator) override;
//! Returns the list of users we know about
BlackMisc::Network::CUserList getUsers() const;
@@ -119,8 +141,8 @@ namespace BlackCore
//! Test injected aircraft parts
void testAddAircraftParts(const BlackMisc::Aviation::CAircraftParts &parts, bool incremental);
//! \copydoc IRemoteAircraftProviderReadOnly::connectSignals
//! \copydoc IRemoteAircraftProviderReadOnly::connectSignals
//! \copydoc IRemoteAircraftProvider::connectSignals
//! \copydoc IRemoteAircraftProvider::connectSignals
virtual bool connectRemoteAircraftProviderSignals(
std::function<void(const BlackMisc::Aviation::CAircraftSituation &)> situationSlot,
std::function<void(const BlackMisc::Aviation::CAircraftParts &)> partsSlot,
@@ -138,17 +160,6 @@ namespace BlackCore
signals:
//--- signals for the provider, work locally only (not in DBus)
//! \copydoc IRemoteAircraftProviderReadOnly::addedRemoteAircraftPart
void addedRemoteAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
//! \copydoc IRemoteAircraftProviderReadOnly::addedRemoteAircraftPart
void addedRemoteAircraftParts(const BlackMisc::Aviation::CAircraftParts &parts);
//! \copydoc IRemoteAircraftProviderReadOnly::removedAircraft
void removedRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign);
//--- DBus / local signals
//! Online ATC stations were changed
@@ -166,9 +177,18 @@ namespace BlackCore
//! A new aircraft appeared
void addedAircraft(const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft);
//! Parts added
void addedAircraftParts(const BlackMisc::Aviation::CAircraftParts &parts);
//! Situation added
void addedAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
//! Read for model matching
void readyForModelMatching(const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft);
//! An aircraft disappeared
void removedAircraft(const BlackMisc::Aviation::CCallsign &callsign);
private:
BlackMisc::Aviation::CAtcStationList m_atcStationsOnline;
BlackMisc::Aviation::CAtcStationList m_atcStationsBooked;
@@ -196,7 +216,7 @@ namespace BlackCore
// locks
mutable QReadWriteLock m_lockSituations; //!< lock for situations
mutable QReadWriteLock m_lockParts; //!< lock for parts
mutable QReadWriteLock m_lockAircraft; //!< lock aircraft
// TODO FIXME (MS) should be in INetwork
void sendFsipiCustomPacket(const BlackMisc::Aviation::CCallsign &recipientCallsign) const;

29
src/blackcore/context_network.h
View File

@@ -121,13 +121,11 @@ namespace BlackCore
//! Bookings read
void vatsimBookingsRead();
/*!
* Connection status changed
* \param from old status
* \param to new status
* \remarks If I use the enum, adaptor / interface are not created correctly
* \see INetwork::ConnectionStatus
*/
//! Connection status changed
//! \param from old status
//! \param to new status
//! \remarks If I use the enum, adaptor / interface are not created correctly
//! \see INetwork::ConnectionStatus
void connectionStatusChanged(int from, int to);
//! Text messages received (also private chat messages, rfaio channel messages)
@@ -156,6 +154,9 @@ namespace BlackCore
//! Aircraft for given callsign
virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const = 0;
//! Aircraft count
virtual int getAircraftInRangeCount() const = 0;
//! Online station for callsign
virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const = 0;
@@ -192,17 +193,13 @@ namespace BlackCore
//! Callsigns enabled for fast position updates
virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() = 0;
/*!
* Connect to Network
* \return messages gererated during connecting
* \see INetwork::LoginMode
*/
//! Connect to Network
//! \return messages gererated during connecting
//! \see INetwork::LoginMode
virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, uint loginMode) = 0;
/*!
* Disconnect from network
* \return messages generated during disconnecting
*/
//! Disconnect from network
//! \return messages generated during disconnecting
virtual BlackMisc::CStatusMessage disconnectFromNetwork() = 0;
//! Network connected?

7
src/blackcore/context_network_empty.h
View File

@@ -66,6 +66,13 @@ namespace BlackCore
return BlackMisc::Simulation::CSimulatedAircraft();
}
//! \copydoc IRemoteAircraftProvider::getAircraftInRangeCount
virtual int getAircraftInRangeCount() const override
{
logEmptyContextWarning(Q_FUNC_INFO);
return 0;
}
//! \copydoc IContextNetwork::getOnlineStationForCallsign
virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override
{

52
src/blackcore/context_network_impl.cpp
View File

@@ -78,13 +78,16 @@ namespace BlackCore
connect(this->m_airspace, &CAirspaceMonitor::changedAtcStationsBooked, this, &CContextNetwork::changedAtcStationsBooked);
connect(this->m_airspace, &CAirspaceMonitor::changedAtcStationOnlineConnectionStatus, this, &CContextNetwork::changedAtcStationOnlineConnectionStatus);
connect(this->m_airspace, &CAirspaceMonitor::changedAircraftInRange, this, &CContextNetwork::changedAircraftInRange);
connect(this->m_airspace, &CAirspaceMonitor::removedRemoteAircraft, this, &IContextNetwork::removedAircraft); // DBus
connect(this->m_airspace, &CAirspaceMonitor::removedAircraft, this, &IContextNetwork::removedAircraft); // DBus
connect(this->m_airspace, &CAirspaceMonitor::readyForModelMatching, this, &CContextNetwork::readyForModelMatching);
connect(this->m_airspace, &CAirspaceMonitor::addedAircraft, this, &CContextNetwork::addedAircraft);
}
// remote provider, local only
connect(this->m_airspace, &CAirspaceMonitor::removedRemoteAircraft, this, &CContextNetwork::removedRemoteAircraft); // Local
connect(this->m_airspace, &CAirspaceMonitor::addedRemoteAircraftParts, this, &CContextNetwork::addedRemoteAircraftParts);
CContextNetwork *CContextNetwork::registerWithDBus(CDBusServer *server)
{
if (!server || this->m_mode != CRuntimeConfig::LocalInDbusServer) return this;
server->addObject(IContextNetwork::ObjectPath(), this);
return this;
}
CContextNetwork::~CContextNetwork()
@@ -92,18 +95,6 @@ namespace BlackCore
this->gracefulShutdown();
}
const CSimulatedAircraftList &CContextNetwork::remoteAircraft() const
{
Q_ASSERT(this->m_airspace);
return m_airspace->remoteAircraft();
}
CSimulatedAircraftList &CContextNetwork::remoteAircraft()
{
Q_ASSERT(this->m_airspace);
return m_airspace->remoteAircraft();
}
CAircraftSituationList CContextNetwork::remoteAircraftSituations(const CCallsign &callsign) const
{
Q_ASSERT(this->m_airspace);
@@ -480,13 +471,19 @@ namespace BlackCore
CSimulatedAircraftList CContextNetwork::getAircraftInRange() const
{
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
return this->m_airspace->remoteAircraft();
return this->m_airspace->getAircraftInRange();
}
int CContextNetwork::getAircraftInRangeCount() const
{
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
return this->m_airspace->getAircraftInRangeCount();
}
CSimulatedAircraft CContextNetwork::getAircraftForCallsign(const CCallsign &callsign) const
{
if (this->isDebugEnabled()) { BlackMisc::CLogMessage(this, BlackMisc::CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign; }
return this->m_airspace->remoteAircraft().findFirstByCallsign(callsign);
return this->m_airspace->getAircraftInRange().findFirstByCallsign(callsign);
}
CAtcStation CContextNetwork::getOnlineStationForCallsign(const CCallsign &callsign) const
@@ -527,7 +524,7 @@ namespace BlackCore
bool c = this->m_airspace->updateAircraftEnabled(callsign, enabledForRedering, originator);
if (c)
{
CSimulatedAircraft aircraft(this->remoteAircraft().findFirstByCallsign(callsign));
CSimulatedAircraft aircraft(this->getAircraftForCallsign(callsign));
emit this->changedRemoteAircraftEnabled(aircraft, originator);
}
return c;
@@ -539,7 +536,7 @@ namespace BlackCore
bool c = this->m_airspace->updateAircraftModel(callsign, model, originator);
if (c)
{
CSimulatedAircraft aircraft(this->remoteAircraft().findFirstByCallsign(callsign));
CSimulatedAircraft aircraft(this->getAircraftForCallsign(callsign));
emit this->changedRemoteAircraftModel(aircraft, originator);
}
return c;
@@ -551,13 +548,26 @@ namespace BlackCore
bool c = this->m_airspace->updateFastPositionEnabled(callsign, enableFastPositonUpdates, originator);
if (c)
{
CSimulatedAircraft aircraft(this->remoteAircraft().findFirstByCallsign(callsign));
CSimulatedAircraft aircraft(this->getAircraftForCallsign(callsign));
CLogMessage(this).info("Callsign %1 sets fast positions ") << aircraft.getCallsign() << BlackMisc::boolToOnOff(aircraft.fastPositionUpdates());
emit this->changedFastPositionUpdates(aircraft, originator);
}
return c;
}
bool CContextNetwork::updateAircraftRendered(const CCallsign &callsign, bool rendered, const QString &originator)
{
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << rendered << originator; }
bool c = this->m_airspace->updateAircraftRendered(callsign, rendered, originator);
return c;
}
void CContextNetwork::updateMarkAllAsNotRendered(const QString &originator)
{
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << originator; }
this->m_airspace->updateMarkAllAsNotRendered(originator);
}
bool CContextNetwork::isFastPositionSendingEnabled() const
{
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }

80
src/blackcore/context_network_impl.h
View File

@@ -51,43 +51,55 @@ namespace BlackCore
//! Destructor
virtual ~CContextNetwork();
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraft
virtual const BlackMisc::Simulation::CSimulatedAircraftList &remoteAircraft() const override;
//! \copydoc IRenderedAircraftProvider::remoteAircraft
virtual BlackMisc::Simulation::CSimulatedAircraftList &remoteAircraft() override;
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraftSituations
//! \copydoc IRemoteAircraftProvider::remoteAircraftSituations
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Aviation::CAircraftSituationList remoteAircraftSituations(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IRemoteAircraftProvider::remoteAircraftSituationsCount
//! \ingroup remoteaircraftprovider
virtual int remoteAircraftSituationsCount(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraftParts
//! \copydoc IRemoteAircraftProvider::remoteAircraftParts
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const override;
//! \copydoc IRemoteAircraftProviderReadOnly::isRemoteAircraftSupportingParts
//! \copydoc IRemoteAircraftProvider::isRemoteAircraftSupportingParts
//! \ingroup remoteaircraftprovider
virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const;
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraftSupportingParts
//! \copydoc IRemoteAircraftProvider::remoteAircraftSupportingParts
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Aviation::CCallsignSet remoteAircraftSupportingParts() const override;
//! \copydoc IRemoteAircraftProviderReadOnly::connectSignals
//! \copydoc IRemoteAircraftProvider::connectSignals
//! \ingroup remoteaircraftprovider
virtual bool connectRemoteAircraftProviderSignals(
std::function<void(const BlackMisc::Aviation::CAircraftSituation &)> situationSlot,
std::function<void(const BlackMisc::Aviation::CAircraftParts &)> partsSlot,
std::function<void(const BlackMisc::Aviation::CCallsign &)> removedAircraftSlot
) override;
signals:
//! \copydoc IRemoteAircraftProviderReadOnly::addedRemoteAircraftPart
void addedRemoteAircraftParts(const BlackMisc::Aviation::CAircraftParts &parts);
//! \copydoc IRemoteAircraftProvider::updateAircraftRendered
//! \ingroup remoteaircraftprovider
virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const QString &originator) override;
//! \copydoc IRemoteAircraftProviderReadOnly::removedAircraft
//! \sa IContextNetwork::removedAircraft() which is the equivalent when using IContextNetwork
void removedRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign);
//! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered
//! \ingroup remoteaircraftprovider
virtual void updateMarkAllAsNotRendered(const QString &originator) override;
public slots:
//! \copydoc IContextNetwork::updateAircraftEnabled
//! \ingroup remoteaircraftprovider
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator) override;
//! \copydoc IContextNetwork::updateAircraftModel
//! \ingroup remoteaircraftprovider
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override;
//! \copydoc IContextNetwork::updateFastPositionEnabled
//! \ingroup remoteaircraftprovider
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) override;
//! \copydoc IContextNetwork::readAtcBookingsFromSource()
virtual void readAtcBookingsFromSource() const override;
@@ -97,10 +109,16 @@ namespace BlackCore
//! \copydoc IContextNetwork::getAtcStationsBooked()
virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const override;
//! \copydoc IContextNetwork::getAircraftInRange()
//! \copydoc IContextNetwork::getAircraftInRange
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override;
//! \copydoc IRemoteAircraftProvider::getAircraftInRangeCount
//! \ingroup remoteaircraftprovider
virtual int getAircraftInRangeCount() const override;
//! \copydoc IContextNetwork::getAircraftForCallsign
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IContextNetwork::getOnlineStationForCallsign
@@ -115,14 +133,12 @@ namespace BlackCore
//! \copydoc IContextNetwork::isConnected()
virtual bool isConnected() const override;
/*!
* In transition state, e.g. connecting, disconnecting.
* \details In such a state it is advisable to wait until an end state (connected/disconnected) is reached
* \remarks Intentionally only running locally, not in interface
*/
//! In transition state, e.g. connecting, disconnecting.
//! \details In such a state it is advisable to wait until an end state (connected/disconnected) is reached
//! \remarks Intentionally only running locally, not in interface
bool isPendingConnection() const;
//! \addtogroup commandline
//! \ingroup commandline
//! @{
//! <pre>
//! .m .msg message text
@@ -176,15 +192,6 @@ namespace BlackCore
//! \copydoc IContextNetwork::requestAtisUpdates
virtual void requestAtisUpdates() override;
//! \copydoc IContextNetwork::updateAircraftEnabled
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator) override;
//! \copydoc IContextNetwork::updateAircraftModel
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override;
//! \copydoc IContextNetwork::updateFastPositionEnabled
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) override;
//! \copydoc IContextNetwork::isFastPositionSendingEnabled
virtual bool isFastPositionSendingEnabled() const override;
@@ -211,12 +218,7 @@ namespace BlackCore
CContextNetwork(CRuntimeConfig::ContextMode, CRuntime *runtime);
//! Register myself in DBus
CContextNetwork *registerWithDBus(CDBusServer *server)
{
if (!server || this->m_mode != CRuntimeConfig::LocalInDbusServer) return this;
server->addObject(IContextNetwork::ObjectPath(), this);
return this;
}
CContextNetwork *registerWithDBus(CDBusServer *server);
private:
CAirspaceMonitor *m_airspace = nullptr;

7
src/blackcore/context_network_proxy.cpp
View File

@@ -82,7 +82,7 @@ namespace BlackCore
"changedRemoteAircraftEnabled", this, SIGNAL(changedRemoteAircraftEnabled(BlackMisc::Simulation::CSimulatedAircraft, QString)));
Q_ASSERT(s);
s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
"changedFastPositionUpdates", this, SIGNAL(changedFastPositionUpdates(BlackMisc::Simulation::CSimulatedAircraft,QString)));
"changedFastPositionUpdates", this, SIGNAL(changedFastPositionUpdates(BlackMisc::Simulation::CSimulatedAircraft, QString)));
Q_ASSERT(s);
s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
"addedAircraft", this, SIGNAL(addedAircraft(BlackMisc::Simulation::CSimulatedAircraft)));
@@ -113,6 +113,11 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatedAircraftList>(QLatin1Literal("getAircraftInRange"));
}
int CContextNetworkProxy::getAircraftInRangeCount() const
{
return this->m_dBusInterface->callDBusRet<int>(QLatin1Literal("getAircraftInRangeCount"));
}
Simulation::CSimulatedAircraft CContextNetworkProxy::getAircraftForCallsign(const CCallsign &callsign) const
{
return this->m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatedAircraft>(QLatin1Literal("getAircraftForCallsign"), callsign);

3
src/blackcore/context_network_proxy.h
View File

@@ -66,6 +66,9 @@ namespace BlackCore
//! \copydoc IContextNetwork::getAircraftInRange()
virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override;
//! \copydoc IContextNetwork::getAircraftInRangeCount
virtual int getAircraftInRangeCount() const override;
//! \copydoc IContextNetwork::getAircraftForCallsign
virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;

4
src/blackcore/interpolator.cpp
View File

@@ -19,9 +19,9 @@ using namespace BlackMisc::Simulation;
namespace BlackCore
{
IInterpolator::IInterpolator(IRemoteAircraftProviderReadOnly *provider, const QString &workerName, QObject *parent) :
IInterpolator::IInterpolator(IRemoteAircraftProvider *provider, const QString &workerName, QObject *parent) :
CContinuousWorker(parent, workerName),
CRemoteAircraftAwareReadOnly(provider)
CRemoteAircraftAware(provider)
{
Q_ASSERT_X(provider, Q_FUNC_INFO, "missing provider");
}

4
src/blackcore/interpolator.h
View File

@@ -24,7 +24,7 @@ namespace BlackCore
//! Interpolator, calculation inbetween positions
class BLACKCORE_EXPORT IInterpolator :
public BlackMisc::CContinuousWorker,
public BlackMisc::Simulation::CRemoteAircraftAwareReadOnly
public BlackMisc::Simulation::CRemoteAircraftAware
{
Q_OBJECT
@@ -77,7 +77,7 @@ namespace BlackCore
protected:
//! Constructor
IInterpolator(BlackMisc::Simulation::IRemoteAircraftProviderReadOnly *provider, const QString &workerName, QObject *parent = nullptr);
IInterpolator(BlackMisc::Simulation::IRemoteAircraftProvider *provider, const QString &workerName, QObject *parent = nullptr);
bool m_withDebugMsg = false; //!< allows to disable debug messages
};

2
src/blackcore/interpolator_linear.h
View File

@@ -26,7 +26,7 @@ namespace BlackCore
{
public:
//! Constructor
CInterpolatorLinear(BlackMisc::Simulation::IRemoteAircraftProviderReadOnly *provider, QObject *parent = nullptr) :
CInterpolatorLinear(BlackMisc::Simulation::IRemoteAircraftProvider *provider, QObject *parent = nullptr) :
IInterpolator(provider, "CInterpolatorLinear", parent)
{}

5
src/blackcore/simulator.cpp
View File

@@ -90,8 +90,7 @@ namespace BlackCore
if (!isMaxAircraftRestricted()) { return; }
if (!isRenderingEnabled()) { return; }
//! \todo Simulator, why is there no difference on CSequence?
CSimulatedAircraftList newAircraftInRange(remoteAircraft().getClosestObjects(getMaxRenderedAircraft()));
CSimulatedAircraftList newAircraftInRange(getAircraftInRange().getClosestObjects(getMaxRenderedAircraft()));
CCallsignSet newAircraftCallsigns(newAircraftInRange.getCallsigns());
CCallsignSet toBeRemovedCallsigns(m_callsignsToBeRendered.difference(newAircraftCallsigns));
CCallsignSet toBeAddedCallsigns(newAircraftCallsigns.difference(m_callsignsToBeRendered));
@@ -108,7 +107,7 @@ namespace BlackCore
void CSimulatorCommon::resetAircraftFromBacked(const CCallsign &callsign)
{
CSimulatedAircraft aircraft(this->remoteAircraft().findFirstByCallsign(callsign));
CSimulatedAircraft aircraft(this->getAircraftForCallsign(callsign));
bool enabled = aircraft.isEnabled();
if (enabled)
{