From fb93d264539978e38ff02c565eac2ea116a0dd55 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 13 Jun 2018 18:24:20 +0200 Subject: [PATCH] Ref T275, IRemoteAircraftProvider::remoteAircraftParts cutoff time was never used so parameter was removed --- src/blackcore/context/contextnetwork.h | 2 +- src/blackcore/context/contextnetworkempty.h | 3 +-- src/blackcore/context/contextnetworkimpl.cpp | 12 ++++----- src/blackcore/context/contextnetworkimpl.h | 6 ++--- src/blackcore/context/contextnetworkproxy.cpp | 4 +-- src/blackcore/context/contextnetworkproxy.h | 2 +- .../components/aircraftpartshistory.cpp | 2 +- .../components/internalscomponent.cpp | 2 +- .../simulation/remoteaircraftprovider.cpp | 25 +++++++------------ .../simulation/remoteaircraftprovider.h | 14 +++++------ 10 files changed, 32 insertions(+), 40 deletions(-) diff --git a/src/blackcore/context/contextnetwork.h b/src/blackcore/context/contextnetwork.h index c33be6b6c..f86c76e57 100644 --- a/src/blackcore/context/contextnetwork.h +++ b/src/blackcore/context/contextnetwork.h @@ -291,7 +291,7 @@ namespace BlackCore virtual BlackMisc::CStatusMessageList getAircraftPartsHistory(const BlackMisc::Aviation::CCallsign &callsign) const = 0; //! Get remote aircraft parts - virtual BlackMisc::Aviation::CAircraftPartsList getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeValuesBefore) const = 0; + virtual BlackMisc::Aviation::CAircraftPartsList getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const = 0; //! Is storing the aircraft parts history enabled? virtual bool isAircraftPartsHistoryEnabled() const = 0; diff --git a/src/blackcore/context/contextnetworkempty.h b/src/blackcore/context/contextnetworkempty.h index d695245aa..d7cd5475c 100644 --- a/src/blackcore/context/contextnetworkempty.h +++ b/src/blackcore/context/contextnetworkempty.h @@ -390,11 +390,10 @@ namespace BlackCore } //! \copydoc IContextNetwork::getRemoteAircraftParts - virtual BlackMisc::Aviation::CAircraftPartsList getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeValuesBefore) const override + virtual BlackMisc::Aviation::CAircraftPartsList getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const override { logEmptyContextWarning(Q_FUNC_INFO); Q_UNUSED(callsign); - Q_UNUSED(cutoffTimeValuesBefore); return BlackMisc::Aviation::CAircraftPartsList(); } diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index 4197cfb51..d456f3bbf 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -115,16 +115,16 @@ namespace BlackCore return m_airspace->remoteAircraftSituations(callsign); } - CAircraftPartsList CContextNetwork::remoteAircraftParts(const CCallsign &callsign, qint64 cutoffTimeBefore) const + CAircraftPartsList CContextNetwork::remoteAircraftParts(const CCallsign &callsign) const { Q_ASSERT(m_airspace); - return m_airspace->remoteAircraftParts(callsign, cutoffTimeBefore); + return m_airspace->remoteAircraftParts(callsign); } - int CContextNetwork::remoteAircraftPartsCount(const CCallsign &callsign, qint64 cutoffTimeBefore) const + int CContextNetwork::remoteAircraftPartsCount(const CCallsign &callsign) const { Q_ASSERT(m_airspace); - return m_airspace->remoteAircraftPartsCount(callsign, cutoffTimeBefore); + return m_airspace->remoteAircraftPartsCount(callsign); } int CContextNetwork::remoteAircraftSituationsCount(const CCallsign &callsign) const @@ -628,10 +628,10 @@ namespace BlackCore return m_airspace->getAircraftPartsHistory(callsign); } - CAircraftPartsList CContextNetwork::getRemoteAircraftParts(const CCallsign &callsign, qint64 cutoffTimeValuesBefore) const + CAircraftPartsList CContextNetwork::getRemoteAircraftParts(const CCallsign &callsign) const { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign; } - return m_airspace->remoteAircraftParts(callsign, cutoffTimeValuesBefore); + return m_airspace->remoteAircraftParts(callsign); } int CContextNetwork::getRemoteAircraftSupportingPartsCount() const diff --git a/src/blackcore/context/contextnetworkimpl.h b/src/blackcore/context/contextnetworkimpl.h index 697866b30..4ae4ba50f 100644 --- a/src/blackcore/context/contextnetworkimpl.h +++ b/src/blackcore/context/contextnetworkimpl.h @@ -93,8 +93,8 @@ namespace BlackCore //! @{ virtual BlackMisc::Aviation::CAircraftSituationList remoteAircraftSituations(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual int remoteAircraftSituationsCount(const BlackMisc::Aviation::CCallsign &callsign) const override; - virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const override; - virtual int remoteAircraftPartsCount(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const override; + virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const override; + virtual int remoteAircraftPartsCount(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual BlackMisc::Aviation::CCallsignSet remoteAircraftSupportingParts() const override; virtual QList connectRemoteAircraftProviderSignals( @@ -162,7 +162,7 @@ namespace BlackCore virtual bool isReverseLookupMessagesEnabled() const override; virtual void enableReverseLookupMessages(bool enabled) override; virtual BlackMisc::CStatusMessageList getAircraftPartsHistory(const BlackMisc::Aviation::CCallsign &callsign) const override; - virtual BlackMisc::Aviation::CAircraftPartsList getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeValuesBefore) const override; + virtual BlackMisc::Aviation::CAircraftPartsList getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual int getRemoteAircraftSupportingPartsCount() const override; virtual bool isAircraftPartsHistoryEnabled() const override; virtual void enableAircraftPartsHistory(bool enabled) override; diff --git a/src/blackcore/context/contextnetworkproxy.cpp b/src/blackcore/context/contextnetworkproxy.cpp index cc2ca6cd6..c13587278 100644 --- a/src/blackcore/context/contextnetworkproxy.cpp +++ b/src/blackcore/context/contextnetworkproxy.cpp @@ -263,9 +263,9 @@ namespace BlackCore return m_dBusInterface->callDBusRet(QLatin1String("getAircraftPartsHistory"), callsign); } - CAircraftPartsList CContextNetworkProxy::getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeValuesBefore) const + CAircraftPartsList CContextNetworkProxy::getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const { - return m_dBusInterface->callDBusRet(QLatin1String("getRemoteAircraftParts"), callsign, cutoffTimeValuesBefore); + return m_dBusInterface->callDBusRet(QLatin1String("getRemoteAircraftParts"), callsign); } QString CContextNetworkProxy::getLibraryInfo(bool detailed) const diff --git a/src/blackcore/context/contextnetworkproxy.h b/src/blackcore/context/contextnetworkproxy.h index 03b3d0d0a..b16ae97b3 100644 --- a/src/blackcore/context/contextnetworkproxy.h +++ b/src/blackcore/context/contextnetworkproxy.h @@ -116,7 +116,7 @@ namespace BlackCore virtual bool isReverseLookupMessagesEnabled() const override; virtual void enableReverseLookupMessages(bool enabled) override; virtual BlackMisc::CStatusMessageList getAircraftPartsHistory(const BlackMisc::Aviation::CCallsign &callsign) const override; - virtual BlackMisc::Aviation::CAircraftPartsList getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeValuesBefore) const override; + virtual BlackMisc::Aviation::CAircraftPartsList getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual QString getLibraryInfo(bool detailed) const override; virtual bool isAircraftPartsHistoryEnabled() const override; virtual void enableAircraftPartsHistory(bool enabled) override; diff --git a/src/blackgui/components/aircraftpartshistory.cpp b/src/blackgui/components/aircraftpartshistory.cpp index 6d3c964fa..d551401b8 100644 --- a/src/blackgui/components/aircraftpartshistory.cpp +++ b/src/blackgui/components/aircraftpartshistory.cpp @@ -88,7 +88,7 @@ namespace BlackGui if (!this->isVisible()) { return; } const CCallsign cs(ui->comp_CallsignCompleter->getCallsign()); if (cs.isEmpty()) { return; } // no or invalid callsign - const auto currentAircraftParts = sGui->getIContextNetwork()->getRemoteAircraftParts(cs, -1).frontOrDefault(); + const auto currentAircraftParts = sGui->getIContextNetwork()->getRemoteAircraftParts(cs).frontOrDefault(); const auto aircraftPartsHistory = sGui->getIContextNetwork()->getAircraftPartsHistory(cs); QString html; diff --git a/src/blackgui/components/internalscomponent.cpp b/src/blackgui/components/internalscomponent.cpp index 3992aa8eb..758bf0050 100644 --- a/src/blackgui/components/internalscomponent.cpp +++ b/src/blackgui/components/internalscomponent.cpp @@ -144,7 +144,7 @@ namespace BlackGui const CCallsign callsign(ui->comp_RemoteAircraftSelector->getSelectedCallsign()); if (callsign.isEmpty()) { return; } - const CAircraftPartsList partsList = sGui->getIContextNetwork()->getRemoteAircraftParts(callsign, -1); + const CAircraftPartsList partsList = sGui->getIContextNetwork()->getRemoteAircraftParts(callsign); if (partsList.isEmpty()) { CStatusMessage(this).info("No parts for '%1'") << callsign.asString(); diff --git a/src/blackmisc/simulation/remoteaircraftprovider.cpp b/src/blackmisc/simulation/remoteaircraftprovider.cpp index afa45cbfc..9f395bec1 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.cpp +++ b/src/blackmisc/simulation/remoteaircraftprovider.cpp @@ -84,24 +84,17 @@ namespace BlackMisc return m_situationsByCallsign[callsign].size(); } - CAircraftPartsList CRemoteAircraftProvider::remoteAircraftParts(const CCallsign &callsign, qint64 cutoffTimeValuesBefore) const + CAircraftPartsList CRemoteAircraftProvider::remoteAircraftParts(const CCallsign &callsign) const { static const CAircraftPartsList empty; QReadLocker l(&m_lockParts); if (!m_partsByCallsign.contains(callsign)) { return empty; } - if (cutoffTimeValuesBefore < 0) - { - return m_partsByCallsign[callsign]; - } - else - { - return m_partsByCallsign[callsign].findBefore(cutoffTimeValuesBefore); - } + return m_partsByCallsign[callsign]; } - int CRemoteAircraftProvider::remoteAircraftPartsCount(const CCallsign &callsign, qint64 cutoffTimeValuesBefore) const + int CRemoteAircraftProvider::remoteAircraftPartsCount(const CCallsign &callsign) const { - const int s = this->remoteAircraftParts(callsign, cutoffTimeValuesBefore).size(); + const int s = this->remoteAircraftParts(callsign).size(); return s; } @@ -676,16 +669,16 @@ namespace BlackMisc return this->provider()->remoteAircraftSituationChange(callsign); } - CAircraftPartsList CRemoteAircraftAware::remoteAircraftParts(const CCallsign &callsign, qint64 cutoffTimeBefore) const + CAircraftPartsList CRemoteAircraftAware::remoteAircraftParts(const CCallsign &callsign) const { Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available"); - return this->provider()->remoteAircraftParts(callsign, cutoffTimeBefore); + return this->provider()->remoteAircraftParts(callsign); } - int CRemoteAircraftAware::remoteAircraftPartsCount(const CCallsign &callsign, qint64 cutoffTimeBefore) const + int CRemoteAircraftAware::remoteAircraftPartsCount(const CCallsign &callsign) const { Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available"); - return this->provider()->remoteAircraftPartsCount(callsign, cutoffTimeBefore); + return this->provider()->remoteAircraftPartsCount(callsign); } CCallsignSet CRemoteAircraftAware::remoteAircraftSupportingParts() const @@ -775,7 +768,7 @@ namespace BlackMisc CAircraftParts IRemoteAircraftProvider::getLatestAircraftParts(const CCallsign &callsign) const { static const CAircraftParts empty; - const CAircraftPartsList parts = this->remoteAircraftParts(callsign, -1); + const CAircraftPartsList parts = this->remoteAircraftParts(callsign); return parts.isEmpty() ? empty : parts.latestObject(); } diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h index 8a47c0ec9..b3208f6d2 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -95,11 +95,11 @@ namespace BlackMisc //! All parts (per callsign, time history) //! \remark latest parts first //! \threadsafe - virtual Aviation::CAircraftPartsList remoteAircraftParts(const Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const = 0; + virtual Aviation::CAircraftPartsList remoteAircraftParts(const Aviation::CCallsign &callsign) const = 0; //! All parts (per callsign, time history) //! \threadsafe - virtual int remoteAircraftPartsCount(const Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const = 0; + virtual int remoteAircraftPartsCount(const Aviation::CCallsign &callsign) const = 0; //! Get the change object for callsign //! \threadsafe @@ -246,8 +246,8 @@ namespace BlackMisc virtual bool isVtolAircraft(const Aviation::CCallsign &callsign) const override; virtual Aviation::CAircraftSituationList remoteAircraftSituations(const Aviation::CCallsign &callsign) const override; virtual int remoteAircraftSituationsCount(const Aviation::CCallsign &callsign) const override; - virtual Aviation::CAircraftPartsList remoteAircraftParts(const Aviation::CCallsign &callsign, qint64 cutoffTimeValuesBefore = -1) const override; - virtual int remoteAircraftPartsCount(const Aviation::CCallsign &callsign, qint64 cutoffTimeValuesBefore = -1) const override; + virtual Aviation::CAircraftPartsList remoteAircraftParts(const Aviation::CCallsign &callsign) const override; + virtual int remoteAircraftPartsCount(const Aviation::CCallsign &callsign) const override; virtual bool isRemoteAircraftSupportingParts(const Aviation::CCallsign &callsign) const override; virtual int getRemoteAircraftSupportingPartsCount() const override; virtual Aviation::CCallsignSet remoteAircraftSupportingParts() const override; @@ -381,7 +381,7 @@ namespace BlackMisc CSimulatedAircraftList m_aircraftInRange; //!< aircraft, thread safe access required Aviation::CStatusMessageListPerCallsign m_reverseLookupMessages; //!< reverse lookup messages - Aviation::CStatusMessageListPerCallsign m_aircraftPartsHistory; //!< status messages for parts history + Aviation::CStatusMessageListPerCallsign m_aircraftPartsMessages; //!< status messages for parts history Aviation::CTimestampPerCallsign m_situationsLastModified; //!< when situations last modified Aviation::CTimestampPerCallsign m_partsLastModified; //!< when parts last modified QHash m_testOffset; @@ -432,10 +432,10 @@ namespace BlackMisc int remoteAircraftSituationsCount(const Aviation::CCallsign &callsign) const; //! \copydoc IRemoteAircraftProvider::remoteAircraftParts - Aviation::CAircraftPartsList remoteAircraftParts(const Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const; + Aviation::CAircraftPartsList remoteAircraftParts(const Aviation::CCallsign &callsign) const; //! \copydoc IRemoteAircraftProvider::remoteAircraftPartsCount - int remoteAircraftPartsCount(const Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const; + int remoteAircraftPartsCount(const Aviation::CCallsign &callsign) const; //! \copydoc IRemoteAircraftProvider::remoteAircraftSituationChange Aviation::CAircraftSituationChange remoteAircraftSituationChange(const Aviation::CCallsign &callsign) const;