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

Ref T275, IRemoteAircraftProvider::remoteAircraftParts cutoff time was never used so parameter was removed

Browse Source
This commit is contained in:
Klaus Basan
2018-06-13 18:24:20 +02:00
parent 978fe5eea2
commit fb93d26453
10 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/context/contextnetwork.h
View File

@@ -291,7 +291,7 @@ namespace BlackCore
virtual BlackMisc::CStatusMessageList getAircraftPartsHistory(const BlackMisc::Aviation::CCallsign &callsign) const = 0; virtual BlackMisc::CStatusMessageList getAircraftPartsHistory(const BlackMisc::Aviation::CCallsign &callsign) const = 0;
//! Get remote aircraft parts //! 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? //! Is storing the aircraft parts history enabled?
virtual bool isAircraftPartsHistoryEnabled() const = 0; virtual bool isAircraftPartsHistoryEnabled() const = 0;

3
src/blackcore/context/contextnetworkempty.h
View File

@@ -390,11 +390,10 @@ namespace BlackCore
} }
//! \copydoc IContextNetwork::getRemoteAircraftParts //! \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); logEmptyContextWarning(Q_FUNC_INFO);
Q_UNUSED(callsign); Q_UNUSED(callsign);
Q_UNUSED(cutoffTimeValuesBefore);
return BlackMisc::Aviation::CAircraftPartsList(); return BlackMisc::Aviation::CAircraftPartsList();
} }

12
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -115,16 +115,16 @@ namespace BlackCore
return m_airspace->remoteAircraftSituations(callsign); 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); 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); Q_ASSERT(m_airspace);
return m_airspace->remoteAircraftPartsCount(callsign, cutoffTimeBefore); return m_airspace->remoteAircraftPartsCount(callsign);
} }
int CContextNetwork::remoteAircraftSituationsCount(const CCallsign &callsign) const int CContextNetwork::remoteAircraftSituationsCount(const CCallsign &callsign) const
@@ -628,10 +628,10 @@ namespace BlackCore
return m_airspace->getAircraftPartsHistory(callsign); 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; } 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 int CContextNetwork::getRemoteAircraftSupportingPartsCount() const

6
src/blackcore/context/contextnetworkimpl.h
View File

@@ -93,8 +93,8 @@ namespace BlackCore
//! @{ //! @{
virtual BlackMisc::Aviation::CAircraftSituationList remoteAircraftSituations(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual BlackMisc::Aviation::CAircraftSituationList remoteAircraftSituations(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual int remoteAircraftSituationsCount(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 BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual int remoteAircraftPartsCount(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const override; virtual int remoteAircraftPartsCount(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual bool isRemoteAircraftSupportingParts(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 BlackMisc::Aviation::CCallsignSet remoteAircraftSupportingParts() const override;
virtual QList<QMetaObject::Connection> connectRemoteAircraftProviderSignals( virtual QList<QMetaObject::Connection> connectRemoteAircraftProviderSignals(
@@ -162,7 +162,7 @@ namespace BlackCore
virtual bool isReverseLookupMessagesEnabled() const override; virtual bool isReverseLookupMessagesEnabled() const override;
virtual void enableReverseLookupMessages(bool enabled) override; virtual void enableReverseLookupMessages(bool enabled) override;
virtual BlackMisc::CStatusMessageList getAircraftPartsHistory(const BlackMisc::Aviation::CCallsign &callsign) const 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 int getRemoteAircraftSupportingPartsCount() const override;
virtual bool isAircraftPartsHistoryEnabled() const override; virtual bool isAircraftPartsHistoryEnabled() const override;
virtual void enableAircraftPartsHistory(bool enabled) override; virtual void enableAircraftPartsHistory(bool enabled) override;

4
src/blackcore/context/contextnetworkproxy.cpp
View File

@@ -263,9 +263,9 @@ namespace BlackCore
return m_dBusInterface->callDBusRet<CStatusMessageList>(QLatin1String("getAircraftPartsHistory"), callsign); return m_dBusInterface->callDBusRet<CStatusMessageList>(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<CAircraftPartsList>(QLatin1String("getRemoteAircraftParts"), callsign, cutoffTimeValuesBefore); return m_dBusInterface->callDBusRet<CAircraftPartsList>(QLatin1String("getRemoteAircraftParts"), callsign);
} }
QString CContextNetworkProxy::getLibraryInfo(bool detailed) const QString CContextNetworkProxy::getLibraryInfo(bool detailed) const

2
src/blackcore/context/contextnetworkproxy.h
View File

@@ -116,7 +116,7 @@ namespace BlackCore
virtual bool isReverseLookupMessagesEnabled() const override; virtual bool isReverseLookupMessagesEnabled() const override;
virtual void enableReverseLookupMessages(bool enabled) override; virtual void enableReverseLookupMessages(bool enabled) override;
virtual BlackMisc::CStatusMessageList getAircraftPartsHistory(const BlackMisc::Aviation::CCallsign &callsign) const 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 QString getLibraryInfo(bool detailed) const override;
virtual bool isAircraftPartsHistoryEnabled() const override; virtual bool isAircraftPartsHistoryEnabled() const override;
virtual void enableAircraftPartsHistory(bool enabled) override; virtual void enableAircraftPartsHistory(bool enabled) override;

2
src/blackgui/components/aircraftpartshistory.cpp
View File

@@ -88,7 +88,7 @@ namespace BlackGui
if (!this->isVisible()) { return; } if (!this->isVisible()) { return; }
const CCallsign cs(ui->comp_CallsignCompleter->getCallsign()); const CCallsign cs(ui->comp_CallsignCompleter->getCallsign());
if (cs.isEmpty()) { return; } // no or invalid callsign 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); const auto aircraftPartsHistory = sGui->getIContextNetwork()->getAircraftPartsHistory(cs);
QString html; QString html;

2
src/blackgui/components/internalscomponent.cpp
View File

@@ -144,7 +144,7 @@ namespace BlackGui
const CCallsign callsign(ui->comp_RemoteAircraftSelector->getSelectedCallsign()); const CCallsign callsign(ui->comp_RemoteAircraftSelector->getSelectedCallsign());
if (callsign.isEmpty()) { return; } if (callsign.isEmpty()) { return; }
const CAircraftPartsList partsList = sGui->getIContextNetwork()->getRemoteAircraftParts(callsign, -1); const CAircraftPartsList partsList = sGui->getIContextNetwork()->getRemoteAircraftParts(callsign);
if (partsList.isEmpty()) if (partsList.isEmpty())
{ {
CStatusMessage(this).info("No parts for '%1'") << callsign.asString(); CStatusMessage(this).info("No parts for '%1'") << callsign.asString();

25
src/blackmisc/simulation/remoteaircraftprovider.cpp
View File

@@ -84,24 +84,17 @@ namespace BlackMisc
return m_situationsByCallsign[callsign].size(); 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; static const CAircraftPartsList empty;
QReadLocker l(&m_lockParts); QReadLocker l(&m_lockParts);
if (!m_partsByCallsign.contains(callsign)) { return empty; } if (!m_partsByCallsign.contains(callsign)) { return empty; }
if (cutoffTimeValuesBefore < 0) return m_partsByCallsign[callsign];
{
return m_partsByCallsign[callsign];
}
else
{
return m_partsByCallsign[callsign].findBefore(cutoffTimeValuesBefore);
}
} }
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; return s;
} }
@@ -676,16 +669,16 @@ namespace BlackMisc
return this->provider()->remoteAircraftSituationChange(callsign); 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"); 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"); 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 CCallsignSet CRemoteAircraftAware::remoteAircraftSupportingParts() const
@@ -775,7 +768,7 @@ namespace BlackMisc
CAircraftParts IRemoteAircraftProvider::getLatestAircraftParts(const CCallsign &callsign) const CAircraftParts IRemoteAircraftProvider::getLatestAircraftParts(const CCallsign &callsign) const
{ {
static const CAircraftParts empty; static const CAircraftParts empty;
const CAircraftPartsList parts = this->remoteAircraftParts(callsign, -1); const CAircraftPartsList parts = this->remoteAircraftParts(callsign);
return parts.isEmpty() ? empty : parts.latestObject(); return parts.isEmpty() ? empty : parts.latestObject();
} }

14
src/blackmisc/simulation/remoteaircraftprovider.h
View File

@@ -95,11 +95,11 @@ namespace BlackMisc
//! All parts (per callsign, time history) //! All parts (per callsign, time history)
//! \remark latest parts first //! \remark latest parts first
//! \threadsafe //! \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) //! All parts (per callsign, time history)
//! \threadsafe //! \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 //! Get the change object for callsign
//! \threadsafe //! \threadsafe
@@ -246,8 +246,8 @@ namespace BlackMisc
virtual bool isVtolAircraft(const Aviation::CCallsign &callsign) const override; virtual bool isVtolAircraft(const Aviation::CCallsign &callsign) const override;
virtual Aviation::CAircraftSituationList remoteAircraftSituations(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 int remoteAircraftSituationsCount(const Aviation::CCallsign &callsign) const override;
virtual Aviation::CAircraftPartsList remoteAircraftParts(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, qint64 cutoffTimeValuesBefore = -1) const override; virtual int remoteAircraftPartsCount(const Aviation::CCallsign &callsign) const override;
virtual bool isRemoteAircraftSupportingParts(const Aviation::CCallsign &callsign) const override; virtual bool isRemoteAircraftSupportingParts(const Aviation::CCallsign &callsign) const override;
virtual int getRemoteAircraftSupportingPartsCount() const override; virtual int getRemoteAircraftSupportingPartsCount() const override;
virtual Aviation::CCallsignSet remoteAircraftSupportingParts() const override; virtual Aviation::CCallsignSet remoteAircraftSupportingParts() const override;
@@ -381,7 +381,7 @@ namespace BlackMisc
CSimulatedAircraftList m_aircraftInRange; //!< aircraft, thread safe access required CSimulatedAircraftList m_aircraftInRange; //!< aircraft, thread safe access required
Aviation::CStatusMessageListPerCallsign m_reverseLookupMessages; //!< reverse lookup messages 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_situationsLastModified; //!< when situations last modified
Aviation::CTimestampPerCallsign m_partsLastModified; //!< when parts last modified Aviation::CTimestampPerCallsign m_partsLastModified; //!< when parts last modified
QHash<Aviation::CCallsign, PhysicalQuantities::CLength> m_testOffset; QHash<Aviation::CCallsign, PhysicalQuantities::CLength> m_testOffset;
@@ -432,10 +432,10 @@ namespace BlackMisc
int remoteAircraftSituationsCount(const Aviation::CCallsign &callsign) const; int remoteAircraftSituationsCount(const Aviation::CCallsign &callsign) const;
//! \copydoc IRemoteAircraftProvider::remoteAircraftParts //! \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 //! \copydoc IRemoteAircraftProvider::remoteAircraftPartsCount
int remoteAircraftPartsCount(const Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const; int remoteAircraftPartsCount(const Aviation::CCallsign &callsign) const;
//! \copydoc IRemoteAircraftProvider::remoteAircraftSituationChange //! \copydoc IRemoteAircraftProvider::remoteAircraftSituationChange
Aviation::CAircraftSituationChange remoteAircraftSituationChange(const Aviation::CCallsign &callsign) const; Aviation::CAircraftSituationChange remoteAircraftSituationChange(const Aviation::CCallsign &callsign) const;