From 86d85c6b600142bf7f5c15fb34e525617e5ddf03 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 12 Jul 2016 03:05:04 +0200 Subject: [PATCH] refs #707, removed originator from some signatures * not used in remote aircraft provider * adjusted all using interfaces --- src/blackcore/context/contextnetwork.h | 12 +++--- src/blackcore/context/contextnetworkempty.h | 9 ++--- src/blackcore/context/contextnetworkimpl.cpp | 38 +++++++++---------- src/blackcore/context/contextnetworkimpl.h | 10 ++--- src/blackcore/context/contextnetworkproxy.cpp | 16 ++++---- src/blackcore/context/contextnetworkproxy.h | 7 ++-- .../context/contextsimulatorimpl.cpp | 8 ++-- src/blackcore/context/contextsimulatorimpl.h | 4 +- src/blackcore/simulator.h | 4 +- src/blackgui/components/mappingcomponent.cpp | 20 ++++------ src/blackgui/components/mappingcomponent.h | 6 +-- .../simulation/remoteaircraftprovider.cpp | 16 ++++---- .../simulation/remoteaircraftprovider.h | 19 +++++----- .../remoteaircraftproviderdummy.cpp | 15 +++----- .../simulation/remoteaircraftproviderdummy.h | 11 +++--- src/plugins/simulator/fs9/simulatorfs9.cpp | 16 ++++---- .../simulator/fscommon/simulatorfscommon.cpp | 9 ++--- .../simulator/fscommon/simulatorfscommon.h | 4 +- src/plugins/simulator/fsx/simulatorfsx.cpp | 8 ++-- src/plugins/simulator/fsx/simulatorfsx.h | 1 - .../fsx/simulatorfsxsimconnectproc.cpp | 2 +- .../simulator/xplane/simulatorxplane.cpp | 22 +++++------ .../simulator/xplane/simulatorxplane.h | 4 +- 23 files changed, 118 insertions(+), 143 deletions(-) diff --git a/src/blackcore/context/contextnetwork.h b/src/blackcore/context/contextnetwork.h index 61613aca6..9f7e15b2d 100644 --- a/src/blackcore/context/contextnetwork.h +++ b/src/blackcore/context/contextnetwork.h @@ -126,15 +126,15 @@ namespace BlackCore //! Aircraft model was changed //! \details All remote aircraft are stored in the network context. The model can be updated here //! via \sa updateAircraftModel and then this signal is fired - void changedRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator); + void changedRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft); //! Aircraft enabled / disabled //! \details All remote aircraft are stored in the network context. The aircraft can be enabled (for rendering) here //! via \sa updateAircraftEnabled and then this signal is fired - void changedRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator); + void changedRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft); //! Aircraft enabled / disabled - void changedFastPositionUpdates(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator); + void changedFastPositionUpdates(const BlackMisc::Simulation::CSimulatedAircraft &aircraft); //! Connection status changed for online station void changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &atcStation, bool connected); @@ -254,13 +254,13 @@ namespace BlackCore virtual void requestAtisUpdates() = 0; //! Enable/disable rendering - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::CIdentifier &originator) = 0; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering) = 0; //! Change model string - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) = 0; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model) = 0; //! Change fast position updates - virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const BlackMisc::CIdentifier &originator) = 0; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending) = 0; //! Get reverse lookup meesages virtual BlackMisc::CStatusMessageList getReverseLookupMessages(const BlackMisc::Aviation::CCallsign &callsign) const = 0; diff --git a/src/blackcore/context/contextnetworkempty.h b/src/blackcore/context/contextnetworkempty.h index da6749d9c..f049a0b4a 100644 --- a/src/blackcore/context/contextnetworkempty.h +++ b/src/blackcore/context/contextnetworkempty.h @@ -253,32 +253,29 @@ namespace BlackCore } //! \copydoc IContextNetwork::updateAircraftEnabled - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::CIdentifier &originator) override + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering) override { Q_UNUSED(callsign); - Q_UNUSED(originator); Q_UNUSED(enabledForRedering); logEmptyContextWarning(Q_FUNC_INFO); return false; } //! \copydoc IContextNetwork::updateAircraftModel - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model) override { Q_UNUSED(callsign); - Q_UNUSED(originator); Q_UNUSED(model); logEmptyContextWarning(Q_FUNC_INFO); return false; } //! \copydoc IContextNetwork::updateFastPositionEnabled - virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const BlackMisc::CIdentifier &originator) override + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending) override { logEmptyContextWarning(Q_FUNC_INFO); Q_UNUSED(callsign); Q_UNUSED(enableFastPositionSending); - Q_UNUSED(originator); return false; } diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index 14bc863aa..2b6ad8208 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -176,7 +176,6 @@ namespace BlackCore else { this->m_currentStatus = INetwork::Connecting; // as semaphore we are going to connect - this->m_airspace->setConnected(true); this->getIContextOwnAircraft()->updateOwnAircraftPilot(server.getUser()); const CSimulatedAircraft ownAircraft(this->ownAircraft()); this->m_network->presetServer(server); @@ -210,7 +209,6 @@ namespace BlackCore { this->m_currentStatus = INetwork::Disconnecting; // as semaphore we are going to disconnect this->m_network->terminateConnection(); - this->m_airspace->setConnected(false); return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityInfo, "Connection terminating"); } else if (this->isPendingConnection()) @@ -552,39 +550,39 @@ namespace BlackCore this->m_airspace->requestAtisUpdates(); } - bool CContextNetwork::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering, const BlackMisc::CIdentifier &originator) + bool CContextNetwork::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering) { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << enabledForRedering << originator; } - bool c = this->m_airspace->updateAircraftEnabled(callsign, enabledForRedering, originator); + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << enabledForRedering; } + bool c = this->m_airspace->updateAircraftEnabled(callsign, enabledForRedering); if (c) { CSimulatedAircraft aircraft(this->getAircraftInRangeForCallsign(callsign)); - emit this->changedRemoteAircraftEnabled(aircraft, originator); + emit this->changedRemoteAircraftEnabled(aircraft); } return c; } - bool CContextNetwork::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const BlackMisc::CIdentifier &originator) + bool CContextNetwork::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model) { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << model << originator; } - bool c = this->m_airspace->updateAircraftModel(callsign, model, originator); + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << model; } + bool c = this->m_airspace->updateAircraftModel(callsign, model); if (c) { CSimulatedAircraft aircraft(this->getAircraftInRangeForCallsign(callsign)); - emit this->changedRemoteAircraftModel(aircraft, originator); + emit this->changedRemoteAircraftModel(aircraft); } return c; } - bool CContextNetwork::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::CIdentifier &originator) + bool CContextNetwork::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates) { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << enableFastPositonUpdates << originator; } - bool c = this->m_airspace->updateFastPositionEnabled(callsign, enableFastPositonUpdates, originator); + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << enableFastPositonUpdates; } + bool c = this->m_airspace->updateFastPositionEnabled(callsign, enableFastPositonUpdates); if (c) { CSimulatedAircraft aircraft(this->getAircraftInRangeForCallsign(callsign)); CLogMessage(this).info("Callsign %1 sets fast positions ") << aircraft.getCallsign() << BlackMisc::boolToOnOff(aircraft.fastPositionUpdates()); - emit this->changedFastPositionUpdates(aircraft, originator); + emit this->changedFastPositionUpdates(aircraft); } return c; } @@ -596,17 +594,17 @@ namespace BlackCore sApp->getWebDataServices()->readInBackground(BlackMisc::Network::CEntityFlags::BookingEntity); } - bool CContextNetwork::updateAircraftRendered(const CCallsign &callsign, bool rendered, const CIdentifier &originator) + bool CContextNetwork::updateAircraftRendered(const CCallsign &callsign, bool rendered) { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << rendered << originator; } - bool c = this->m_airspace->updateAircraftRendered(callsign, rendered, originator); + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << rendered; } + bool c = this->m_airspace->updateAircraftRendered(callsign, rendered); return c; } - void CContextNetwork::updateMarkAllAsNotRendered(const CIdentifier &originator) + void CContextNetwork::updateMarkAllAsNotRendered() { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << originator; } - this->m_airspace->updateMarkAllAsNotRendered(originator); + if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } + this->m_airspace->updateMarkAllAsNotRendered(); } CAirspaceAircraftSnapshot CContextNetwork::getLatestAirspaceAircraftSnapshot() const diff --git a/src/blackcore/context/contextnetworkimpl.h b/src/blackcore/context/contextnetworkimpl.h index 29e1d421f..13cbdb9f8 100644 --- a/src/blackcore/context/contextnetworkimpl.h +++ b/src/blackcore/context/contextnetworkimpl.h @@ -116,11 +116,11 @@ namespace BlackCore //! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateAircraftRendered //! \ingroup remoteaircraftprovider - virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::CIdentifier &originator) override; + virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered) override; //! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateMarkAllAsNotRendered //! \ingroup remoteaircraftprovider - virtual void updateMarkAllAsNotRendered(const BlackMisc::CIdentifier &originator) override; + virtual void updateMarkAllAsNotRendered() override; //! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getLatestAirspaceAircraftSnapshot //! \ingroup remoteaircraftprovider @@ -132,15 +132,15 @@ namespace BlackCore public slots: //! \copydoc IContextNetwork::updateAircraftEnabled //! \ingroup remoteaircraftprovider - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::CIdentifier &originator) override; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering) override; //! \copydoc IContextNetwork::updateAircraftModel //! \ingroup remoteaircraftprovider - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model) override; //! \copydoc IContextNetwork::updateFastPositionEnabled //! \ingroup remoteaircraftprovider - virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::CIdentifier &originator) override; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates) override; //! \copydoc IContextNetwork::readAtcBookingsFromSource() virtual void readAtcBookingsFromSource() const override; diff --git a/src/blackcore/context/contextnetworkproxy.cpp b/src/blackcore/context/contextnetworkproxy.cpp index 682a2be7c..2f5fde36f 100644 --- a/src/blackcore/context/contextnetworkproxy.cpp +++ b/src/blackcore/context/contextnetworkproxy.cpp @@ -76,10 +76,10 @@ namespace BlackCore Q_ASSERT(s); s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), - "changedRemoteAircraftEnabled", this, SIGNAL(changedRemoteAircraftEnabled(BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::CIdentifier))); + "changedRemoteAircraftEnabled", this, SIGNAL(changedRemoteAircraftEnabled(BlackMisc::Simulation::CSimulatedAircraft))); Q_ASSERT(s); s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), - "changedFastPositionUpdates", this, SIGNAL(changedFastPositionUpdates(BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::CIdentifier))); + "changedFastPositionUpdates", this, SIGNAL(changedFastPositionUpdates(BlackMisc::Simulation::CSimulatedAircraft))); Q_ASSERT(s); s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), "addedAircraft", this, SIGNAL(addedAircraft(BlackMisc::Simulation::CSimulatedAircraft))); @@ -185,19 +185,19 @@ namespace BlackCore this->m_dBusInterface->callDBus(QLatin1Literal("requestAtisUpdates")); } - bool CContextNetworkProxy::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering, const CIdentifier &originator) + bool CContextNetworkProxy::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering) { - return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateAircraftEnabled"), callsign, enabledForRedering, originator); + return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateAircraftEnabled"), callsign, enabledForRedering); } - bool CContextNetworkProxy::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const CIdentifier &originator) + bool CContextNetworkProxy::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model) { - return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateAircraftModel"), callsign, model, originator); + return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateAircraftModel"), callsign, model); } - bool CContextNetworkProxy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionSending, const CIdentifier &originator) + bool CContextNetworkProxy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionSending) { - return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateFastPositionEnabled"), callsign, enableFastPositionSending, originator); + return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateFastPositionEnabled"), callsign, enableFastPositionSending); } void CContextNetworkProxy::setFastPositionEnabledCallsigns(CCallsignSet &callsigns) diff --git a/src/blackcore/context/contextnetworkproxy.h b/src/blackcore/context/contextnetworkproxy.h index cf8bace30..0bc67db3f 100644 --- a/src/blackcore/context/contextnetworkproxy.h +++ b/src/blackcore/context/contextnetworkproxy.h @@ -57,7 +57,6 @@ namespace BlackCore class CCoreFacade; namespace Context { - //! Network context proxy //! \ingroup dbus class BLACKCORE_EXPORT CContextNetworkProxy : public IContextNetwork @@ -156,13 +155,13 @@ namespace BlackCore virtual void requestAtisUpdates() override; //! \copydoc IContextNetwork::updateAircraftEnabled - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::CIdentifier &originator) override; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering) override; //! \copydoc IContextNetwork::updateAircraftModel - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model) override; //! \copydoc IContextNetwork::updateFastPositionEnabled - virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const BlackMisc::CIdentifier &originator) override; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending) override; //! \copydoc IContextNetwork::setFastPositionEnabledCallsigns virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignSet &callsigns) override; diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp index ab92571c0..3211cd723 100644 --- a/src/blackcore/context/contextsimulatorimpl.cpp +++ b/src/blackcore/context/contextsimulatorimpl.cpp @@ -543,16 +543,16 @@ namespace BlackCore getIContextOwnAircraft()->changedAircraftCockpit(ownAircraft, IContextSimulator::InterfaceName()); } - void CContextSimulator::ps_changedRemoteAircraftModel(const CSimulatedAircraft &aircraft, const CIdentifier &originator) + void CContextSimulator::ps_changedRemoteAircraftModel(const CSimulatedAircraft &aircraft) { Q_ASSERT(m_simulatorPlugin.second); - m_simulatorPlugin.second->changeRemoteAircraftModel(aircraft, originator); + m_simulatorPlugin.second->changeRemoteAircraftModel(aircraft); } - void CContextSimulator::ps_changedRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const CIdentifier &originator) + void CContextSimulator::ps_changedRemoteAircraftEnabled(const CSimulatedAircraft &aircraft) { Q_ASSERT(m_simulatorPlugin.second); - m_simulatorPlugin.second->changeRemoteAircraftEnabled(aircraft, originator); + m_simulatorPlugin.second->changeRemoteAircraftEnabled(aircraft); } void CContextSimulator::ps_updateSimulatorCockpitFromContext(const CSimulatedAircraft &ownAircraft, const CIdentifier &originator) diff --git a/src/blackcore/context/contextsimulatorimpl.h b/src/blackcore/context/contextsimulatorimpl.h index 6e181916a..58c74f1ab 100644 --- a/src/blackcore/context/contextsimulatorimpl.h +++ b/src/blackcore/context/contextsimulatorimpl.h @@ -173,10 +173,10 @@ namespace BlackCore void ps_cockpitChangedFromSimulator(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft); //! Changed remote aircraft model - void ps_changedRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator); + void ps_changedRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft); //! Enable / disable aircraft - void ps_changedRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator); + void ps_changedRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft); //! Update simulator cockpit from context, because someone else has changed cockpit (e.g. GUI, 3rd party) //! \remarks set by runtime, only to be used locally (not via DBus) diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index 808c3bdd1..4c907d52a 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -98,10 +98,10 @@ namespace BlackCore virtual bool logicallyRemoveRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign) = 0; //! Change remote aircraft per property - virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) = 0; + virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft) = 0; //! Aircraft got enabled / disabled - virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) = 0; + virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft) = 0; //! Update own aircraft cockpit (usually from context) virtual bool updateOwnSimulatorCockpit(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) = 0; diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp index 31ab80ef2..dc0cad13f 100644 --- a/src/blackgui/components/mappingcomponent.cpp +++ b/src/blackgui/components/mappingcomponent.cpp @@ -177,7 +177,7 @@ namespace BlackGui bool enabled = sa.propertyByIndex(index).toBool(); if (saFromBackend.isEnabled() == enabled) { return; } CLogMessage(this).info("Request to %1 aircraft %2") << (enabled ? "enable" : "disable") << saFromBackend.getCallsign().toQString(); - sGui->getIContextNetwork()->updateAircraftEnabled(saFromBackend.getCallsign(), enabled, mappingIdentifier()); + sGui->getIContextNetwork()->updateAircraftEnabled(saFromBackend.getCallsign(), enabled); } else { @@ -275,12 +275,12 @@ namespace BlackGui CAircraftModel model(models.front()); model.setModelType(CAircraftModel::TypeManuallySet); CLogMessage(this).info("Requesting changes for %1") << callsign.asString(); - sGui->getIContextNetwork()->updateAircraftModel(aircraftFromBackend.getCallsign(), model, mappingIdentifier()); + sGui->getIContextNetwork()->updateAircraftModel(aircraftFromBackend.getCallsign(), model); changed = true; } if (aircraftFromBackend.isEnabled() != enabled) { - sGui->getIContextNetwork()->updateAircraftEnabled(aircraftFromBackend.getCallsign(), enabled, mappingIdentifier()); + sGui->getIContextNetwork()->updateAircraftEnabled(aircraftFromBackend.getCallsign(), enabled); changed = true; } @@ -326,24 +326,21 @@ namespace BlackGui this->ui->le_AircraftModel->setCompleter(this->m_modelCompleter); } - void CMappingComponent::ps_onRemoteAircraftModelChanged(const CSimulatedAircraft &aircraft, const CIdentifier &originator) + void CMappingComponent::ps_onRemoteAircraftModelChanged(const CSimulatedAircraft &aircraft) { this->updateSimulatedAircraftView(); - Q_UNUSED(originator); Q_UNUSED(aircraft); } - void CMappingComponent::ps_onChangedAircraftEnabled(const CSimulatedAircraft &aircraft, const CIdentifier &originator) + void CMappingComponent::ps_onChangedAircraftEnabled(const CSimulatedAircraft &aircraft) { this->updateSimulatedAircraftView(); - Q_UNUSED(originator); Q_UNUSED(aircraft); } - void CMappingComponent::ps_onFastPositionUpdatesEnabled(const CSimulatedAircraft &aircraft, const CIdentifier &originator) + void CMappingComponent::ps_onFastPositionUpdatesEnabled(const CSimulatedAircraft &aircraft) { this->updateSimulatedAircraftView(); - Q_UNUSED(originator); Q_UNUSED(aircraft); } @@ -365,7 +362,7 @@ namespace BlackGui { if (sGui->getIContextNetwork()) { - sGui->getIContextNetwork()->updateFastPositionEnabled(aircraft.getCallsign(), aircraft.fastPositionUpdates(), mappingIdentifier()); + sGui->getIContextNetwork()->updateFastPositionEnabled(aircraft.getCallsign(), aircraft.fastPositionUpdates()); } } @@ -381,7 +378,7 @@ namespace BlackGui { if (sGui->getIContextNetwork()) { - sGui->getIContextNetwork()->updateAircraftEnabled(aircraft.getCallsign(), aircraft.isEnabled(), mappingIdentifier()); + sGui->getIContextNetwork()->updateAircraftEnabled(aircraft.getCallsign(), aircraft.isEnabled()); } } @@ -432,6 +429,5 @@ namespace BlackGui this->updateSimulatedAircraftView(true); } } - } // namespace } // namespace diff --git a/src/blackgui/components/mappingcomponent.h b/src/blackgui/components/mappingcomponent.h index b51a8f529..61d7c90ca 100644 --- a/src/blackgui/components/mappingcomponent.h +++ b/src/blackgui/components/mappingcomponent.h @@ -105,13 +105,13 @@ namespace BlackGui void ps_onModelsUpdateRequested(); //! Rendered aircraft changed in backend - void ps_onRemoteAircraftModelChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator); + void ps_onRemoteAircraftModelChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft); //! Aircraft enabled, disabled in backend - void ps_onChangedAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator); + void ps_onChangedAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft); //! Fast position updates on/off in backend - void ps_onFastPositionUpdatesEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator); + void ps_onFastPositionUpdatesEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft); //! Connection status has been changed void ps_onConnectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to); diff --git a/src/blackmisc/simulation/remoteaircraftprovider.cpp b/src/blackmisc/simulation/remoteaircraftprovider.cpp index 2c3f7b764..e87e97b5e 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.cpp +++ b/src/blackmisc/simulation/remoteaircraftprovider.cpp @@ -76,22 +76,22 @@ namespace BlackMisc return this->m_remoteAircraftProvider->remoteAircraftSituationsCount(callsign); } - bool CRemoteAircraftAware::updateAircraftModel(const Aviation::CCallsign &callsign, const CAircraftModel &model, const CIdentifier &originator) + bool CRemoteAircraftAware::updateAircraftModel(const Aviation::CCallsign &callsign, const CAircraftModel &model) { Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available"); - return this->m_remoteAircraftProvider->updateAircraftModel(callsign, model, originator); + return this->m_remoteAircraftProvider->updateAircraftModel(callsign, model); } - bool CRemoteAircraftAware::updateAircraftRendered(const CCallsign &callsign, bool rendered, const CIdentifier &originator) + bool CRemoteAircraftAware::updateAircraftRendered(const CCallsign &callsign, bool rendered) { Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available"); - return this->m_remoteAircraftProvider->updateAircraftRendered(callsign, rendered, originator); + return this->m_remoteAircraftProvider->updateAircraftRendered(callsign, rendered); } - void CRemoteAircraftAware::updateMarkAllAsNotRendered(const CIdentifier &originator) + void CRemoteAircraftAware::updateMarkAllAsNotRendered() { Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available"); - return this->m_remoteAircraftProvider->updateMarkAllAsNotRendered(originator); + return this->m_remoteAircraftProvider->updateMarkAllAsNotRendered(); } bool CRemoteAircraftAware::isRemoteAircraftSupportingParts(const CCallsign &callsign) const @@ -100,10 +100,10 @@ namespace BlackMisc return this->m_remoteAircraftProvider->isRemoteAircraftSupportingParts(callsign); } - bool CRemoteAircraftAware::updateAircraftEnabled(const Aviation::CCallsign &callsign, bool enabledForRedering, const CIdentifier &originator) + bool CRemoteAircraftAware::updateAircraftEnabled(const Aviation::CCallsign &callsign, bool enabledForRedering) { Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available"); - return this->m_remoteAircraftProvider->updateAircraftEnabled(callsign, enabledForRedering, originator); + return this->m_remoteAircraftProvider->updateAircraftEnabled(callsign, enabledForRedering); } } // namespace diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h index 33ce5251d..57c8a4564 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -102,23 +102,23 @@ namespace BlackMisc //! Enable/disable rendering //! \threadsafe - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering, const BlackMisc::CIdentifier &originator) = 0; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering) = 0; //! Rendered? //! \threadsafe - virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::CIdentifier &originator) = 0; + virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered) = 0; //! Mark all as not rendered //! \threadsafe - virtual void updateMarkAllAsNotRendered(const BlackMisc::CIdentifier &originator) = 0; + virtual void updateMarkAllAsNotRendered() = 0; //! Change model string //! \threadsafe - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) = 0; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model) = 0; //! Change fast position updates //! \threadsafe - virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::CIdentifier &originator) = 0; + virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates) = 0; //! Get reverse lookup meesages //! \threadsafe @@ -185,16 +185,16 @@ namespace BlackMisc virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const; //! \copydoc IRemoteAircraftProvider::updateAircraftEnabled - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::CIdentifier &originator); + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering); //! \copydoc IRemoteAircraftProvider::updateAircraftModel - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator); + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model); //! \copydoc IRemoteAircraftProvider::updateAircraftRendered - virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::CIdentifier &originator); + virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered); //! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered - virtual void updateMarkAllAsNotRendered(const CIdentifier &originator); + virtual void updateMarkAllAsNotRendered(); //! Destructor virtual ~CRemoteAircraftAware() {} @@ -204,7 +204,6 @@ namespace BlackMisc CRemoteAircraftAware(IRemoteAircraftProvider *remoteAircraftProvider) : m_remoteAircraftProvider(remoteAircraftProvider) { Q_ASSERT(remoteAircraftProvider); } IRemoteAircraftProvider *m_remoteAircraftProvider = nullptr; //!< access to object }; - } // namespace } // namespace diff --git a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp index bc17825c1..dd63e3df4 100644 --- a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp +++ b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp @@ -101,41 +101,36 @@ namespace BlackMisc return c; } - bool CRemoteAircraftProviderDummy::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRendering, const CIdentifier &originator) + bool CRemoteAircraftProviderDummy::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRendering) { - Q_UNUSED(originator); CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexEnabled, CVariant::fromValue(enabledForRendering)); int n = this->m_aircraft.applyIfCallsign(callsign, vm); return n > 0; } - bool CRemoteAircraftProviderDummy::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const CIdentifier &originator) + bool CRemoteAircraftProviderDummy::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model) { - Q_UNUSED(originator); CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexModel, CVariant::from(model)); int n = this->m_aircraft.applyIfCallsign(callsign, vm); return n > 0; } - bool CRemoteAircraftProviderDummy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionUpdates, const CIdentifier &originator) + bool CRemoteAircraftProviderDummy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionUpdates) { - Q_UNUSED(originator); CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexFastPositionUpdates, CVariant::fromValue(enableFastPositionUpdates)); int n = this->m_aircraft.applyIfCallsign(callsign, vm); return n > 0; } - bool CRemoteAircraftProviderDummy::updateAircraftRendered(const CCallsign &callsign, bool rendered, const CIdentifier &originator) + bool CRemoteAircraftProviderDummy::updateAircraftRendered(const CCallsign &callsign, bool rendered) { - Q_UNUSED(originator); CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexRendered, CVariant::fromValue(rendered)); int n = this->m_aircraft.applyIfCallsign(callsign, vm); return n > 0; } - void CRemoteAircraftProviderDummy::updateMarkAllAsNotRendered(const CIdentifier &originator) + void CRemoteAircraftProviderDummy::updateMarkAllAsNotRendered() { - Q_UNUSED(originator); this->m_aircraft.markAllAsNotRendered(); } diff --git a/src/blackmisc/simulation/remoteaircraftproviderdummy.h b/src/blackmisc/simulation/remoteaircraftproviderdummy.h index af9e18fd1..a04d9f01b 100644 --- a/src/blackmisc/simulation/remoteaircraftproviderdummy.h +++ b/src/blackmisc/simulation/remoteaircraftproviderdummy.h @@ -40,7 +40,6 @@ namespace BlackMisc namespace Simulation { - //! Dummy implementation for testing purpose, not thread safe class BLACKMISC_EXPORT CRemoteAircraftProviderDummy : public QObject, @@ -96,19 +95,19 @@ namespace BlackMisc ) override; //! \copydoc IRemoteAircraftProvider::updateAircraftEnabled - virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering, const BlackMisc::CIdentifier &originator) override; + virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering) override; //! \copydoc IRemoteAircraftProvider::updateAircraftModel - virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override; + virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model) override; //! \copydoc IRemoteAircraftProvider::updateFastPositionEnabled - virtual bool updateFastPositionEnabled(const Aviation::CCallsign &callsign, bool enableFastPositionUpdates, const BlackMisc::CIdentifier &originator) override; + virtual bool updateFastPositionEnabled(const Aviation::CCallsign &callsign, bool enableFastPositionUpdates) override; //! \copydoc IRemoteAircraftProvider::updateAircraftRendered - virtual bool updateAircraftRendered(const Aviation::CCallsign &callsign, bool rendered, const BlackMisc::CIdentifier &originator) override; + virtual bool updateAircraftRendered(const Aviation::CCallsign &callsign, bool rendered) override; //! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered - virtual void updateMarkAllAsNotRendered(const BlackMisc::CIdentifier &originator) override; + virtual void updateMarkAllAsNotRendered() override; //! \copydoc IRemoteAircraftProvider::getReverseLookupMessages virtual BlackMisc::CStatusMessageList getReverseLookupMessages(const BlackMisc::Aviation::CCallsign &callsign) const override; diff --git a/src/plugins/simulator/fs9/simulatorfs9.cpp b/src/plugins/simulator/fs9/simulatorfs9.cpp index 767620d75..cae7d6085 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.cpp +++ b/src/plugins/simulator/fs9/simulatorfs9.cpp @@ -64,7 +64,7 @@ namespace BlackSimPlugin else dHigh = dHigh - dLow; - position.setLongitude(CLongitude(dHigh * 360.0 / ( 65536.0 * 65536.0), CAngleUnit::deg())); + position.setLongitude(CLongitude(dHigh * 360.0 / (65536.0 * 65536.0), CAngleUnit::deg())); dHigh = positionVelocity.alt_i; dLow = positionVelocity.alt_f; @@ -167,8 +167,8 @@ namespace BlackSimPlugin // matched models CAircraftModel aircraftModel = getClosestMatch(newRemoteAircraftCopy); Q_ASSERT(newRemoteAircraft.getCallsign() == aircraftModel.getCallsign()); - updateAircraftModel(newRemoteAircraft.getCallsign(), aircraftModel, identifier()); - updateAircraftRendered(newRemoteAircraft.getCallsign(), true, identifier()); + updateAircraftModel(newRemoteAircraft.getCallsign(), aircraftModel); + updateAircraftRendered(newRemoteAircraft.getCallsign(), true); CSimulatedAircraft aircraftAfterModelApplied(getAircraftInRangeForCallsign(newRemoteAircraft.getCallsign())); aircraftAfterModelApplied.setRendered(true); emit modelMatchingCompleted(aircraftAfterModelApplied); @@ -179,7 +179,7 @@ namespace BlackSimPlugin client->start(); m_hashFs9Clients.insert(callsign, client); - updateAircraftRendered(callsign, true, this->identifier()); + updateAircraftRendered(callsign, true); CLogMessage(this).info("FS9: Added aircraft %1") << callsign.toQString(); return true; } @@ -191,7 +191,7 @@ namespace BlackSimPlugin auto fs9Client = m_hashFs9Clients.value(callsign); fs9Client->quit(); m_hashFs9Clients.remove(callsign); - updateAircraftRendered(callsign, false, this->identifier()); + updateAircraftRendered(callsign, false); CLogMessage(this).info("FS9: Removed aircraft %1") << callsign.toQString(); return true; } @@ -334,7 +334,7 @@ namespace BlackSimPlugin const auto currentPosition = CCoordinateGeodetic { aircraftSituation.latitude(), aircraftSituation.longitude(), {0} }; if (CWeatherScenario::isRealWeatherScenario(m_weatherScenarioSettings.get()) && - calculateGreatCircleDistance(m_lastWeatherPosition, currentPosition).value(CLengthUnit::mi()) > 20 ) + calculateGreatCircleDistance(m_lastWeatherPosition, currentPosition).value(CLengthUnit::mi()) > 20) { m_lastWeatherPosition = currentPosition; const auto weatherGrid = CWeatherGrid { { "GLOB", currentPosition } }; @@ -389,8 +389,8 @@ namespace BlackSimPlugin } CSimulatorFs9Listener::CSimulatorFs9Listener(const CSimulatorPluginInfo &info, - const QSharedPointer &fs9Host, - const QSharedPointer &lobbyClient) : + const QSharedPointer &fs9Host, + const QSharedPointer &lobbyClient) : BlackCore::ISimulatorListener(info), m_timer(new QTimer(this)), m_fs9Host(fs9Host), diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.cpp b/src/plugins/simulator/fscommon/simulatorfscommon.cpp index 81c6231d9..ae0175110 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.cpp +++ b/src/plugins/simulator/fscommon/simulatorfscommon.cpp @@ -106,18 +106,15 @@ namespace BlackSimPlugin return pm; } - bool CSimulatorFsCommon::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft, const CIdentifier &originator) + bool CSimulatorFsCommon::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft) { - if (originator == this->identifier()) { return false; } - // remove upfront, and then enable / disable again this->physicallyRemoveRemoteAircraft(aircraft.getCallsign()); - return this->changeRemoteAircraftEnabled(aircraft, originator); + return this->changeRemoteAircraftEnabled(aircraft); } - bool CSimulatorFsCommon::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const CIdentifier &originator) + bool CSimulatorFsCommon::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft) { - if (originator == this->identifier()) { return false; } if (aircraft.isEnabled()) { this->physicallyAddRemoteAircraft(aircraft); diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.h b/src/plugins/simulator/fscommon/simulatorfscommon.h index 623ecbd51..33b7afb1e 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.h +++ b/src/plugins/simulator/fscommon/simulatorfscommon.h @@ -61,10 +61,10 @@ namespace BlackSimPlugin virtual BlackMisc::CPixmap iconForModel(const QString &modelString) const override; //! \copydoc BlackCore::ISimulator::changeRemoteAircraftModel - virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) override; + virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft) override; //! \copydoc BlackCore::ISimulator::changeRemoteAircraftEnabled - virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) override; + virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft) override; //! \copydoc BlackCore::ISimulator::enableDebugMessages virtual void enableDebugMessages(bool driver, bool interpolator) override; diff --git a/src/plugins/simulator/fsx/simulatorfsx.cpp b/src/plugins/simulator/fsx/simulatorfsx.cpp index 5c1c86bfb..944feaee7 100644 --- a/src/plugins/simulator/fsx/simulatorfsx.cpp +++ b/src/plugins/simulator/fsx/simulatorfsx.cpp @@ -150,7 +150,7 @@ namespace BlackSimPlugin CAircraftModel aircraftModel = getClosestMatch(newRemoteAircraft); Q_ASSERT_X(newRemoteAircraft.getCallsign() == aircraftModel.getCallsign(), Q_FUNC_INFO, "mismatching callsigns"); - this->updateAircraftModel(callsign, aircraftModel, identifier()); + this->updateAircraftModel(callsign, aircraftModel); CSimulatedAircraft aircraftAfterModelApplied(getAircraftInRangeForCallsign(newRemoteAircraft.getCallsign())); // create AI @@ -174,7 +174,7 @@ namespace BlackSimPlugin } aircraftAfterModelApplied.setRendered(rendered); - this->updateAircraftRendered(callsign, rendered, identifier()); + this->updateAircraftRendered(callsign, rendered); emit modelMatchingCompleted(aircraftAfterModelApplied); return rendered; @@ -430,7 +430,7 @@ namespace BlackSimPlugin const auto currentPosition = CCoordinateGeodetic { aircraftSituation.latitude(), aircraftSituation.longitude(), {0} }; if (CWeatherScenario::isRealWeatherScenario(m_weatherScenarioSettings.get()) && - calculateGreatCircleDistance(m_lastWeatherPosition, currentPosition).value(CLengthUnit::mi()) > 20 ) + calculateGreatCircleDistance(m_lastWeatherPosition, currentPosition).value(CLengthUnit::mi()) > 20) { m_lastWeatherPosition = currentPosition; const auto weatherGrid = CWeatherGrid { { "GLOB", currentPosition } }; @@ -549,7 +549,7 @@ namespace BlackSimPlugin CCallsign callsign(simObject.getCallsign()); m_simConnectObjects.remove(callsign); SimConnect_AIRemoveObject(m_hSimConnect, static_cast(simObject.getObjectId()), static_cast(simObject.getRequestId())); - updateAircraftRendered(callsign, false, identifier()); + updateAircraftRendered(callsign, false); CLogMessage(this).info("FSX: Removed aircraft %1") << simObject.getCallsign().toQString(); return true; } diff --git a/src/plugins/simulator/fsx/simulatorfsx.h b/src/plugins/simulator/fsx/simulatorfsx.h index e68ced0eb..6dd64df22 100644 --- a/src/plugins/simulator/fsx/simulatorfsx.h +++ b/src/plugins/simulator/fsx/simulatorfsx.h @@ -233,7 +233,6 @@ namespace BlackSimPlugin QTimer *m_timer { nullptr }; }; } - } // namespace #endif // guard diff --git a/src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp b/src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp index 17c1ff2e3..868735af6 100644 --- a/src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp +++ b/src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp @@ -186,7 +186,7 @@ namespace BlackSimPlugin if (!CAirportIcaoCode::isValidIcaoDesignator(icao)) { continue; } // tiny airfields in SIM CCoordinateGeodetic pos(pFacilityAirport->Latitude, pFacilityAirport->Longitude, pFacilityAirport->Altitude); CAirport airport(CAirportIcaoCode(icao), pos); - CLength d = airport.calculcateDistanceAndBearingToOwnAircraft(posAircraft); + CLength d = airport.calculcateAndUpdateRelativeDistanceAndBearing(posAircraft); if (d > maxDistance) { continue; } simulatorFsx->m_airportsInRange.replaceOrAddByIcao(airport); } diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 43b88b38d..d0bcf5bf8 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -167,7 +167,7 @@ namespace BlackSimPlugin const auto currentPosition = CCoordinateGeodetic { situation.latitude(), situation.longitude(), {0} }; if (CWeatherScenario::isRealWeatherScenario(m_weatherScenarioSettings.get()) && - calculateGreatCircleDistance(m_lastWeatherPosition, currentPosition).value(CLengthUnit::mi()) > 20) + calculateGreatCircleDistance(m_lastWeatherPosition, currentPosition).value(CLengthUnit::mi()) > 20) { m_lastWeatherPosition = currentPosition; const auto weatherGrid = CWeatherGrid { { "", currentPosition } }; @@ -467,7 +467,7 @@ namespace BlackSimPlugin Q_ASSERT_X(newRemoteAircraft.getCallsign() == aircraftModel.getCallsign(), Q_FUNC_INFO, "mismatching callsigns"); CCallsign callsign(newRemoteAircraft.getCallsign()); - this->updateAircraftModel(callsign, aircraftModel, identifier()); + this->updateAircraftModel(callsign, aircraftModel); CSimulatedAircraft aircraftAfterModelApplied(getAircraftInRangeForCallsign(newRemoteAircraft.getCallsign())); QString livery = aircraftModel.getLivery().getCombinedCode(); //! \todo livery resolution for XP @@ -475,12 +475,12 @@ namespace BlackSimPlugin newRemoteAircraft.getAircraftIcaoCode().getDesignator(), newRemoteAircraft.getAirlineIcaoCode().getDesignator(), livery); - updateAircraftRendered(newRemoteAircraft.getCallsign(), true, identifier()); + updateAircraftRendered(newRemoteAircraft.getCallsign(), true); CLogMessage(this).info("XP: Added aircraft %1") << newRemoteAircraft.getCallsign().toQString(); bool rendered = true; aircraftAfterModelApplied.setRendered(rendered); - this->updateAircraftRendered(callsign, rendered, identifier()); + this->updateAircraftRendered(callsign, rendered); emit modelMatchingCompleted(aircraftAfterModelApplied); return rendered; @@ -518,7 +518,7 @@ namespace BlackSimPlugin { Q_ASSERT(isConnected()); m_traffic->removePlane(callsign.asString()); - updateAircraftRendered(callsign, false, identifier()); + updateAircraftRendered(callsign, false); CLogMessage(this).info("XP: Removed aircraft %1") << callsign.toQString(); return true; } @@ -528,7 +528,7 @@ namespace BlackSimPlugin //! \todo XP driver obtain number of removed aircraft int r = getAircraftInRangeCount(); m_traffic->removeAllPlanes(); - updateMarkAllAsNotRendered(identifier()); + updateMarkAllAsNotRendered(); CLogMessage(this).info("XP: Removed all aircraft"); return r; } @@ -539,18 +539,15 @@ namespace BlackSimPlugin return getAircraftInRange().findByRendered(true).getCallsigns(); // just a poor workaround } - bool CSimulatorXPlane::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft, const CIdentifier &originator) + bool CSimulatorXPlane::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft) { - if (originator == this->identifier()) { return false; } - // remove upfront, and then enable / disable again this->physicallyRemoveRemoteAircraft(aircraft.getCallsign()); - return this->changeRemoteAircraftEnabled(aircraft, originator); + return this->changeRemoteAircraftEnabled(aircraft); } - bool CSimulatorXPlane::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const CIdentifier &originator) + bool CSimulatorXPlane::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft) { - if (originator == this->identifier()) { return false; } if (aircraft.isEnabled()) { this->physicallyAddRemoteAircraft(aircraft); @@ -716,6 +713,5 @@ namespace BlackSimPlugin start(); } } - } // namespace } // namespace diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index 42b1ed735..0ecf979f4 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -88,8 +88,8 @@ namespace BlackSimPlugin virtual int physicallyRemoveAllRemoteAircraft() override; virtual BlackMisc::Aviation::CCallsignSet physicallyRenderedAircraft() const override; virtual bool isPhysicallyRenderedAircraft(const BlackMisc::Aviation::CCallsign &callsign) const override; - virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) override; - virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) override; + virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft) override; + virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft) override; virtual bool updateOwnSimulatorCockpit(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) override; virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override; virtual void displayTextMessage(const BlackMisc::Network::CTextMessage &message) const override;