refs #849, model/view for statistics

src/blackgui/models/allmodels.h

@@ -23,6 +23,7 @@
 #include "blackgui/models/distributorlistmodel.h"
 #include "blackgui/models/identifierlistmodel.h"
 #include "blackgui/models/liverylistmodel.h"
+#include "blackgui/models/matchingstatisticsmodel.h"
 #include "blackgui/models/namevariantpairlistmodel.h"
 #include "blackgui/models/serverlistmodel.h"
 #include "blackgui/models/simulatedaircraftlistmodel.h"

src/blackgui/models/listmodelbase.cpp

@@ -47,6 +47,8 @@
 #include "blackmisc/simulation/distributorlist.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
+#include "blackmisc/simulation/matchingstatisticsentry.h"
+#include "blackmisc/simulation/matchingstatistics.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/variant.h"
@@ -774,13 +776,14 @@ namespace BlackGui
         template class CListModelBase<BlackMisc::Aviation::CAirport, BlackMisc::Aviation::CAirportList, true>;
         template class CListModelBase<BlackMisc::Aviation::CAircraftIcaoCode, BlackMisc::Aviation::CAircraftIcaoCodeList, true>;
         template class CListModelBase<BlackMisc::Aviation::CAirlineIcaoCode, BlackMisc::Aviation::CAirlineIcaoCodeList, true>;
-        template class CListModelBase<BlackMisc::Network::CServer, BlackMisc::Network::CServerList, false>;
+        template class CListModelBase<BlackMisc::Network::CServer, BlackMisc::Network::CServerList, true>;
         template class CListModelBase<BlackMisc::Network::CUser, BlackMisc::Network::CUserList, true>;
         template class CListModelBase<BlackMisc::Network::CTextMessage, BlackMisc::Network::CTextMessageList, false>;
         template class CListModelBase<BlackMisc::Network::CClient, BlackMisc::Network::CClientList, false>;
         template class CListModelBase<BlackMisc::Simulation::CAircraftModel, BlackMisc::Simulation::CAircraftModelList, true>;
         template class CListModelBase<BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::Simulation::CSimulatedAircraftList, true>;
         template class CListModelBase<BlackMisc::Simulation::CDistributor, BlackMisc::Simulation::CDistributorList, true>;
+        template class CListModelBase<BlackMisc::Simulation::CMatchingStatisticsEntry, BlackMisc::Simulation::CMatchingStatistics, true>;
         template class CListModelBase<BlackMisc::Weather::CCloudLayer, BlackMisc::Weather::CCloudLayerList, false>;
         template class CListModelBase<BlackMisc::Weather::CTemperatureLayer, BlackMisc::Weather::CTemperatureLayerList, false>;
         template class CListModelBase<BlackMisc::Weather::CWindLayer, BlackMisc::Weather::CWindLayerList, false>;

src/blackgui/models/matchingstatisticsmodel.cpp

@@ -0,0 +1,58 @@
+/* Copyright (C) 2017
+ * swift Project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+#include "matchingstatisticsmodel.h"
+#include "blackgui/models/columns.h"
+#include <QtGlobal>
+
+using namespace BlackMisc::Simulation;
+
+namespace BlackGui
+{
+    namespace Models
+    {
+        CMatchingStatisticsModel::CMatchingStatisticsModel(MatchingStatisticsMode mode, QObject *parent) :
+            CListModelBase("MatchingStatisticsModel", parent)
+        {
+            this->setMode(mode);
+
+            // force strings for translation in resource files
+            (void)QT_TRANSLATE_NOOP("MatchingStatisticsModel", "session");
+            (void)QT_TRANSLATE_NOOP("MatchingStatisticsModel", "model set");
+            (void)QT_TRANSLATE_NOOP("MatchingStatisticsModel", "combination");
+            (void)QT_TRANSLATE_NOOP("MatchingStatisticsModel", "type");
+            (void)QT_TRANSLATE_NOOP("MatchingStatisticsModel", "aircraft");
+            (void)QT_TRANSLATE_NOOP("MatchingStatisticsModel", "airline");
+        }
+
+        void CMatchingStatisticsModel::setMode(CMatchingStatisticsModel::MatchingStatisticsMode mode)
+        {
+            if (this->m_mode == mode) { return; }
+            this->m_mode = mode;
+            this->m_columns.clear();
+            switch (mode)
+            {
+            case ForMultiSessions:
+                this->m_columns.addColumn(CColumn::standardString("session", CMatchingStatisticsEntry::IndexSessionId));
+                this->m_columns.addColumn(CColumn::standardString("model set", CMatchingStatisticsEntry::IndexModelSetId));
+            // fall thru
+            case ForSingleSession:
+                this->m_columns.addColumn(CColumn("type", CMatchingStatisticsEntry::IndexEntryTypeAsIcon));
+                this->m_columns.addColumn(CColumn::standardString("aircraft", CMatchingStatisticsEntry::IndexAircraftDesignator));
+                this->m_columns.addColumn(CColumn::standardString("airline", CMatchingStatisticsEntry::IndexAirlineDesignator));
+                this->m_columns.addColumn(CColumn::standardString("description", CMatchingStatisticsEntry::IndexDescription));
+                this->m_columns.addColumn(CColumn::standardInteger("#", "count", CMatchingStatisticsEntry::IndexCount));
+                break;
+            default:
+                break;
+            }
+            this->setSortColumnByPropertyIndex(CMatchingStatisticsEntry::IndexAircraftDesignator);
+        }
+    } // namespace
+} // namespace

src/blackgui/models/matchingstatisticsmodel.h

@@ -0,0 +1,51 @@
+/* Copyright (C) 2017
+ * swift Project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+//! \file
+
+#ifndef BLACKGUI_MATCHINGSTATISTICSMODEL_H
+#define BLACKGUI_MATCHINGSTATISTICSMODEL_H
+
+#include "blackgui/blackguiexport.h"
+#include "blackgui/models/listmodelbase.h"
+#include "blackmisc/simulation/matchingstatistics.h"
+
+class QObject;
+
+namespace BlackGui
+{
+    namespace Models
+    {
+        //! Matching statistics entry
+        class BLACKGUI_EXPORT CMatchingStatisticsModel : public CListModelBase<BlackMisc::Simulation::CMatchingStatisticsEntry, BlackMisc::Simulation::CMatchingStatistics, true>
+        {
+        public:
+            //! How to display
+            enum MatchingStatisticsMode
+            {
+                NoSet,
+                ForSingleSession,
+                ForMultiSessions
+            };
+
+            //! Constructor
+            explicit CMatchingStatisticsModel(MatchingStatisticsMode mode, QObject *parent = nullptr);
+
+            //! Destructor
+            virtual ~CMatchingStatisticsModel() {}
+
+            //! Set mode
+            void setMode(MatchingStatisticsMode mode);
+
+        private:
+            MatchingStatisticsMode m_mode = NoSet;
+        };
+    } // ns
+} // ns
+#endif // guard

src/blackgui/views/matchingstatisticsview.cpp

@@ -0,0 +1,28 @@
+/* Copyright (C) 2017
+ * swift project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+#include "matchingstatisticsview.h"
+
+using namespace BlackGui::Models;
+
+namespace BlackGui
+{
+    namespace Views
+    {
+        CMatchingStatisticsView::CMatchingStatisticsView(QWidget *parent) : CViewBase(parent)
+        {
+            this->standardInit(new CMatchingStatisticsModel(CMatchingStatisticsModel::ForSingleSession, this));
+        }
+
+        void CMatchingStatisticsView::setStatisticsModelMode(CMatchingStatisticsModel::MatchingStatisticsMode mode)
+        {
+            this->m_model->setMode(mode);
+        }
+    }
+} // namespace

src/blackgui/views/matchingstatisticsview.h

@@ -0,0 +1,38 @@
+/* Copyright (C) 2017
+ * swift project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+//! \file
+
+#ifndef BLACKGUI_VIEWS_MATCHINGSTATISTICSVIEW_H
+#define BLACKGUI_VIEWS_MATCHINGSTATISTICSVIEW_H
+
+#include "blackgui/blackguiexport.h"
+#include "blackgui/models/matchingstatisticsmodel.h"
+#include "blackgui/views/viewbase.h"
+#include "blackmisc/network/serverlist.h"
+
+class QWidget;
+
+namespace BlackGui
+{
+    namespace Views
+    {
+        //! Matching statistics
+        class BLACKGUI_EXPORT CMatchingStatisticsView : public CViewBase<Models::CMatchingStatisticsModel, BlackMisc::Simulation::CMatchingStatistics, BlackMisc::Simulation::CMatchingStatisticsEntry>
+        {
+        public:
+            //! Constructor
+            explicit CMatchingStatisticsView(QWidget *parent = nullptr);
+
+            //! Set vie mode
+            void setStatisticsModelMode(Models::CMatchingStatisticsModel::MatchingStatisticsMode mode);
+        };
+    }
+} // ns
+#endif // guard

src/blackgui/views/viewbase.cpp

@@ -53,6 +53,8 @@
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/distributor.h"
 #include "blackmisc/simulation/distributorlist.h"
+#include "blackmisc/simulation/matchingstatisticsentry.h"
+#include "blackmisc/simulation/matchingstatistics.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
 #include "blackmisc/statusmessagelist.h"
@@ -1440,20 +1442,19 @@ namespace BlackGui
         template class CViewBase<BlackGui::Models::CAirportListModel, BlackMisc::Aviation::CAirportList, BlackMisc::Aviation::CAirport>;
         template class CViewBase<BlackGui::Models::CAtcStationListModel, BlackMisc::Aviation::CAtcStationList, BlackMisc::Aviation::CAtcStation>;
         template class CViewBase<BlackGui::Models::CClientListModel, BlackMisc::Network::CClientList, BlackMisc::Network::CClient>;
+        template class CViewBase<BlackGui::Models::CCloudLayerListModel, BlackMisc::Weather::CCloudLayerList, BlackMisc::Weather::CCloudLayer>;
         template class CViewBase<BlackGui::Models::CCountryListModel, BlackMisc::CCountryList, BlackMisc::CCountry>;
         template class CViewBase<BlackGui::Models::CDistributorListModel, BlackMisc::Simulation::CDistributorList, BlackMisc::Simulation::CDistributor>;
         template class CViewBase<BlackGui::Models::CIdentifierListModel, BlackMisc::CIdentifierList, BlackMisc::CIdentifier>;
         template class CViewBase<BlackGui::Models::CLiveryListModel, BlackMisc::Aviation::CLiveryList, BlackMisc::Aviation::CLivery>;
+        template class CViewBase<BlackGui::Models::CMatchingStatisticsModel, BlackMisc::Simulation::CMatchingStatistics, BlackMisc::Simulation::CMatchingStatisticsEntry>;
         template class CViewBase<BlackGui::Models::CNameVariantPairModel, BlackMisc::CNameVariantPairList, BlackMisc::CNameVariantPair>;
         template class CViewBase<BlackGui::Models::CServerListModel, BlackMisc::Network::CServerList, BlackMisc::Network::CServer>;
         template class CViewBase<BlackGui::Models::CSimulatedAircraftListModel, BlackMisc::Simulation::CSimulatedAircraftList, BlackMisc::Simulation::CSimulatedAircraft>;
         template class CViewBase<BlackGui::Models::CStatusMessageListModel, BlackMisc::CStatusMessageList, BlackMisc::CStatusMessage>;
+        template class CViewBase<BlackGui::Models::CTemperatureLayerListModel, BlackMisc::Weather::CTemperatureLayerList, BlackMisc::Weather::CTemperatureLayer>;
         template class CViewBase<BlackGui::Models::CTextMessageListModel, BlackMisc::Network::CTextMessageList, BlackMisc::Network::CTextMessage>;
         template class CViewBase<BlackGui::Models::CUserListModel, BlackMisc::Network::CUserList, BlackMisc::Network::CUser>;
-
-        template class CViewBase<BlackGui::Models::CTemperatureLayerListModel, BlackMisc::Weather::CTemperatureLayerList, BlackMisc::Weather::CTemperatureLayer>;
-        template class CViewBase<BlackGui::Models::CCloudLayerListModel, BlackMisc::Weather::CCloudLayerList, BlackMisc::Weather::CCloudLayer>;
         template class CViewBase<BlackGui::Models::CWindLayerListModel, BlackMisc::Weather::CWindLayerList, BlackMisc::Weather::CWindLayer>;
-
     } // namespace
 } // namespace