Ref T259, Ref T243 adjusted container, models and views to support CInterpolationSetupList

* added forward declarations * added some utility functions
2026-04-07 02:35:33 +08:00 · 2018-03-19 20:31:21 +01:00
parent 011f31ad2b
commit 74f52cf39c
13 changed files with 204 additions and 82 deletions
--- a/src/blackgui/models/allmodelcontainers.h
+++ b/src/blackgui/models/allmodelcontainers.h
@@ -10,19 +10,25 @@
 #ifndef BLACKGUI_MODELS_ALLMODELCONTAINERS_H
 #define BLACKGUI_MODELS_ALLMODELCONTAINERS_H

+#include "blackmisc/simulation/aircraftmodellist.h"
+#include "blackmisc/simulation/distributorlist.h"
+#include "blackmisc/simulation/interpolationsetuplist.h"
+#include "blackmisc/simulation/simulatedaircraftlist.h"
+#include "blackmisc/simulation/matchingstatistics.h"
 #include "blackmisc/aviation/aircrafticaocodelist.h"
 #include "blackmisc/aviation/airlineicaocodelist.h"
 #include "blackmisc/aviation/airportlist.h"
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/liverylist.h"
-#include "blackmisc/input/actionhotkeylist.h"
 #include "blackmisc/network/clientlist.h"
 #include "blackmisc/network/serverlist.h"
 #include "blackmisc/network/textmessagelist.h"
 #include "blackmisc/network/userlist.h"
-#include "blackmisc/simulation/aircraftmodellist.h"
-#include "blackmisc/simulation/distributorlist.h"
-#include "blackmisc/simulation/simulatedaircraftlist.h"
+#include "blackmisc/weather/cloudlayerlist.h"
+#include "blackmisc/weather/presentweatherlist.h"
+#include "blackmisc/weather/temperaturelayerlist.h"
+#include "blackmisc/weather/windlayerlist.h"
+#include "blackmisc/input/actionhotkeylist.h"
 #include "blackmisc/countrylist.h"
 #include "blackmisc/namevariantpairlist.h"
 #include "blackmisc/statusmessagelist.h"
--- a/src/blackgui/models/allmodels.h
+++ b/src/blackgui/models/allmodels.h
@@ -22,6 +22,7 @@
 #include "blackgui/models/countrylistmodel.h"
 #include "blackgui/models/distributorlistmodel.h"
 #include "blackgui/models/identifierlistmodel.h"
+#include "blackgui/models/interpolationsetupmodel.h"
 #include "blackgui/models/liverylistmodel.h"
 #include "blackgui/models/matchingstatisticsmodel.h"
 #include "blackgui/models/namevariantpairlistmodel.h"
--- a/src/blackgui/models/interpolationsetupmodel.cpp
+++ b/src/blackgui/models/interpolationsetupmodel.cpp
@@ -0,0 +1,40 @@
+/* Copyright (C) 2018
+ * 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 "blackgui/models/columns.h"
+#include "blackgui/models/interpolationsetupmodel.h"
+
+#include <Qt>
+#include <QtGlobal>
+
+using namespace BlackMisc;
+using namespace BlackMisc::Aviation;
+using namespace BlackMisc::Simulation;
+
+namespace BlackGui
+{
+    namespace Models
+    {
+        CInterpolationSetupListModel::CInterpolationSetupListModel(QObject *parent) :
+            CListModelCallsignObjects("CInterpolationSetupListModel", parent)
+        {
+            m_columns.addColumn(CColumn::standardValueObject("cs.", "callsign", CInterpolationAndRenderingSetupPerCallsign::IndexCallsign, CCallsign::IndexCallsignString));
+            m_columns.addColumn(CColumn("sim.dbg.", "simulator debug", CInterpolationAndRenderingSetupPerCallsign::IndexSimulatorDebugMessages, new CBoolIconFormatter("sim.dbg.", "simulator debug")));
+            m_columns.addColumn(CColumn("log.int.", "log.interpolation", CInterpolationAndRenderingSetupPerCallsign::IndexLogInterpolation, new CBoolIconFormatter("log.int.", "log.interpolation")));
+            m_columns.addColumn(CColumn("parts", "aircraft parts", CInterpolationAndRenderingSetupPerCallsign::IndexEnabledAircraftParts, new CBoolIconFormatter("parts", "aircraft parts")));
+            m_columns.addColumn(CColumn("log.int.", "log.interpolation", CInterpolationAndRenderingSetupPerCallsign::IndexEnableGndFlag, new CBoolIconFormatter("log.int.", "log.interpolation")));
+            m_columns.addColumn(CColumn("send gnd.", "send gnd.", CInterpolationAndRenderingSetupPerCallsign::IndexSendGndFlagToSimulator, new CBoolIconFormatter("send gnd.", "send gnd.")));
+            m_columns.addColumn(CColumn("full", "full int.", CInterpolationAndRenderingSetupPerCallsign::IndexForceFullInterpolation, new CBoolIconFormatter("full", "full int.")));
+
+            // default sort order
+            this->setSortColumnByPropertyIndex(CCountry::IndexIsoCode);
+            m_sortOrder = Qt::AscendingOrder;
+        }
+    } // ns
+} // ns
--- a/src/blackgui/models/interpolationsetupmodel.h
+++ b/src/blackgui/models/interpolationsetupmodel.h
@@ -0,0 +1,37 @@
+/* Copyright (C) 2018
+ * 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_MODELS_INTERPOLATIONSETUPMODEL_H
+#define BLACKGUI_MODELS_INTERPOLATIONSETUPMODEL_H
+
+#include "blackmisc/simulation/interpolationsetuplist.h"
+#include "blackgui/models/listmodelcallsignobjects.h"
+#include "blackgui/blackguiexport.h"
+#include <QString>
+
+namespace BlackGui
+{
+    namespace Models
+    {
+        //! Country list model
+        class BLACKGUI_EXPORT CInterpolationSetupListModel :
+            public CListModelCallsignObjects<BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign, BlackMisc::Simulation::CInterpolationSetupList, false>
+        {
+        public:
+            //! Constructor
+            explicit CInterpolationSetupListModel(QObject *parent = nullptr);
+
+            //! Destructor
+            virtual ~CInterpolationSetupListModel() {}
+        };
+    } // ns
+} // ns
+#endif // guard
--- a/src/blackgui/models/listmodelbase.cpp
+++ b/src/blackgui/models/listmodelbase.cpp
@@ -13,49 +13,13 @@
 #include "blackgui/guiutility.h"
 #include "blackgui/models/columnformatters.h"
 #include "blackgui/models/listmodelbase.h"
-#include "blackmisc/aviation/aircrafticaocode.h"
-#include "blackmisc/aviation/aircrafticaocodelist.h"
-#include "blackmisc/aviation/airlineicaocode.h"
-#include "blackmisc/aviation/airlineicaocodelist.h"
-#include "blackmisc/aviation/airport.h"
-#include "blackmisc/aviation/airportlist.h"
-#include "blackmisc/aviation/atcstation.h"
-#include "blackmisc/aviation/atcstationlist.h"
-#include "blackmisc/aviation/livery.h"
-#include "blackmisc/aviation/liverylist.h"
+#include "blackgui/models/allmodelcontainers.h"
 #include "blackmisc/compare.h"
-#include "blackmisc/country.h"
-#include "blackmisc/countrylist.h"
-#include "blackmisc/identifier.h"
-#include "blackmisc/identifierlist.h"
-#include "blackmisc/namevariantpair.h"
-#include "blackmisc/namevariantpairlist.h"
-#include "blackmisc/network/client.h"
-#include "blackmisc/network/clientlist.h"
-#include "blackmisc/network/server.h"
-#include "blackmisc/network/serverlist.h"
-#include "blackmisc/network/textmessage.h"
-#include "blackmisc/network/textmessagelist.h"
-#include "blackmisc/network/user.h"
-#include "blackmisc/network/userlist.h"
 #include "blackmisc/predicates.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/simulation/aircraftmodel.h"
-#include "blackmisc/simulation/aircraftmodellist.h"
-#include "blackmisc/simulation/distributor.h"
-#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"
 #include "blackmisc/verify.h"
-#include "blackmisc/weather/cloudlayerlist.h"
-#include "blackmisc/weather/temperaturelayerlist.h"
-#include "blackmisc/weather/windlayerlist.h"
 #include "blackmisc/worker.h"

 #include <QFlags>
@@ -793,6 +757,7 @@ namespace BlackGui
        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::CInterpolationAndRenderingSetupPerCallsign, BlackMisc::Simulation::CInterpolationSetupList, false>;
        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>;
--- a/src/blackgui/models/listmodelcallsignobjects.cpp
+++ b/src/blackgui/models/listmodelcallsignobjects.cpp
@@ -55,5 +55,6 @@ namespace BlackGui
        // https://isocpp.org/wiki/faq/templates#separate-template-fn-defn-from-decl
        template class CListModelCallsignObjects<BlackMisc::Aviation::CAtcStation, BlackMisc::Aviation::CAtcStationList, true>;
        template class CListModelCallsignObjects<BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::Simulation::CSimulatedAircraftList, true>;
+        template class CListModelCallsignObjects<BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign, BlackMisc::Simulation::CInterpolationSetupList, false>;
    } // namespace
 } // namespace