From 5236688e03b504655fee8bbe409cd4016bd895d2 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 12 Jul 2016 03:55:41 +0200 Subject: [PATCH] refs #689, refs #703, re-applied context change to subdir version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change MetarSet to MetarList: CMetarSet was implemented as a collection. This only makes sense for values which have one member variable only or hardly ever change. METARs often change and therefore a collection didn’t make much sense. Additional profiling showed that a sequence has better algorithmic performance. --- src/blackcore/context/contextnetworkimpl.cpp | 2 +- src/blackcore/context/contextnetworkimpl.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index 2b6ad8208..ef1262e0a 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -440,7 +440,7 @@ namespace BlackCore m_airspace->analyzer()->setSimulatorRenderRestrictionsChanged(restricted, enabled, maxAircraft, maxRenderedDistance, maxRenderedBoundary); } - void CContextNetwork::ps_updateMetars(const BlackMisc::Weather::CMetarSet &metars) + void CContextNetwork::ps_updateMetars(const BlackMisc::Weather::CMetarList &metars) { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } CLogMessage(this).info("%1 METARs updated") << metars.size(); diff --git a/src/blackcore/context/contextnetworkimpl.h b/src/blackcore/context/contextnetworkimpl.h index 13cbdb9f8..0455e5794 100644 --- a/src/blackcore/context/contextnetworkimpl.h +++ b/src/blackcore/context/contextnetworkimpl.h @@ -47,7 +47,7 @@ #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/statusmessage.h" #include "blackmisc/weather/metar.h" -#include "blackmisc/weather/metarset.h" +#include "blackmisc/weather/metarlist.h" class QTimer; @@ -295,7 +295,7 @@ namespace BlackCore private slots: //! Update METAR collection - void ps_updateMetars(const BlackMisc::Weather::CMetarSet &metars); + void ps_updateMetars(const BlackMisc::Weather::CMetarList &metars); //! Check if a supervisor message was received void ps_checkForSupervisiorTextMessage(const BlackMisc::Network::CTextMessageList &messages);