From 464c8dfe83aabcc24f6f6cce445479fa1abfa984 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 25 May 2018 21:22:00 +0200 Subject: [PATCH] Formatting --- src/blackcore/simulatorcommon.cpp | 25 ++++------- src/blackgui/components/dbloaddatadialog.h | 20 ++++----- .../editors/interpolationsetupform.ui | 18 ++++++-- src/blackgui/models/clientlistmodel.cpp | 43 ++++++++----------- src/blackgui/models/clientlistmodel.h | 5 +-- .../models/listmodelcallsignobjects.cpp | 1 - src/blackgui/views/countryview.h | 7 ++- src/blackgui/views/viewbase.h | 4 +- src/blackmisc/simulation/interpolator.h | 4 +- .../simulation/remoteaircraftprovider.h | 2 +- src/blackmisc/variant.h | 4 +- 11 files changed, 63 insertions(+), 70 deletions(-) diff --git a/src/blackcore/simulatorcommon.cpp b/src/blackcore/simulatorcommon.cpp index 31bde2f75..c22e39843 100644 --- a/src/blackcore/simulatorcommon.cpp +++ b/src/blackcore/simulatorcommon.cpp @@ -135,24 +135,17 @@ namespace BlackCore if (m_highlightedAircraft.isEmpty() || m_highlightEndTimeMsEpoch < 1) { return; } m_blinkCycle = !m_blinkCycle; - if (QDateTime::currentMSecsSinceEpoch() < m_highlightEndTimeMsEpoch) - { - // blink mode, toggle aircraft - for (const CSimulatedAircraft &aircraft : as_const(m_highlightedAircraft)) - { - if (m_blinkCycle) - { - this->callPhysicallyRemoveRemoteAircraft(aircraft.getCallsign()); - } - else - { - this->callPhysicallyAddRemoteAircraft(aircraft); // blink - } - } - } - else + if (QDateTime::currentMSecsSinceEpoch() > m_highlightEndTimeMsEpoch) { this->stopHighlighting(); + return; + } + + // blink mode, toggle aircraft + for (const CSimulatedAircraft &aircraft : as_const(m_highlightedAircraft)) + { + if (m_blinkCycle) { this->callPhysicallyRemoveRemoteAircraft(aircraft.getCallsign()); } + else { this->callPhysicallyAddRemoteAircraft(aircraft); } } } diff --git a/src/blackgui/components/dbloaddatadialog.h b/src/blackgui/components/dbloaddatadialog.h index 1a66de2cd..91247966a 100644 --- a/src/blackgui/components/dbloaddatadialog.h +++ b/src/blackgui/components/dbloaddatadialog.h @@ -9,8 +9,8 @@ //! \file -#ifndef DBLOADDATADIALOG_H -#define DBLOADDATADIALOG_H +#ifndef BLACKGUI_COMPONENTS_DBLOADDATADIALOG_H +#define BLACKGUI_COMPONENTS_DBLOADDATADIALOG_H #include "blackgui/blackguiexport.h" #include "blackmisc/network/entityflags.h" @@ -43,14 +43,6 @@ namespace BlackGui bool newerOrEmptyEntitiesDetected(BlackMisc::Network::CEntityFlags::Entity loadEntities); private: - QScopedPointer ui; - BlackMisc::Network::CEntityFlags::Entity m_pendingEntities = BlackMisc::Network::CEntityFlags::NoEntity; - BlackMisc::Simulation::Data::CModelSetCaches m_sets { true, this }; //!< caches - BlackMisc::Simulation::Data::CModelCaches m_models { true, this }; //!< models - int m_pendingEntitiesCount = -1; - bool m_consolidating = false; //! currently consolidating - bool m_autoConsolidate = false; - //! The string list model QStringListModel *entitiesModel() const; @@ -68,6 +60,14 @@ namespace BlackGui //! Consolidate void consolidate(); + + QScopedPointer ui; + BlackMisc::Network::CEntityFlags::Entity m_pendingEntities = BlackMisc::Network::CEntityFlags::NoEntity; + BlackMisc::Simulation::Data::CModelSetCaches m_sets { true, this }; //!< caches + BlackMisc::Simulation::Data::CModelCaches m_models { true, this }; //!< models + int m_pendingEntitiesCount = -1; + bool m_consolidating = false; //! currently consolidating + bool m_autoConsolidate = false; }; } // ns } // ns diff --git a/src/blackgui/editors/interpolationsetupform.ui b/src/blackgui/editors/interpolationsetupform.ui index 6738fee2a..25291ee09 100644 --- a/src/blackgui/editors/interpolationsetupform.ui +++ b/src/blackgui/editors/interpolationsetupform.ui @@ -6,14 +6,26 @@ 0 0 - 240 - 102 + 231 + 96 Frame - + + + 4 + + + 4 + + + 4 + + + 4 + diff --git a/src/blackgui/models/clientlistmodel.cpp b/src/blackgui/models/clientlistmodel.cpp index 7b9b0e041..c1c7e7f02 100644 --- a/src/blackgui/models/clientlistmodel.cpp +++ b/src/blackgui/models/clientlistmodel.cpp @@ -10,11 +10,11 @@ #include "blackgui/models/clientlistmodel.h" #include "blackgui/models/columnformatters.h" #include "blackgui/models/columns.h" -#include "blackmisc/compare.h" +#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/network/user.h" +#include "blackmisc/compare.h" #include "blackmisc/propertyindex.h" #include "blackmisc/propertyindexvariantmap.h" -#include "blackmisc/simulation/aircraftmodel.h" #include #include @@ -27,21 +27,18 @@ namespace BlackGui { namespace Models { - /* - * Constructor - */ CClientListModel::CClientListModel(QObject *parent) : - CListModelBase("ViewClientList", parent) + CListModelBase("ViewClientList", parent) { - this->m_columns.addColumn(CColumn("client", CClient::IndexIcon)); - this->m_columns.addColumn(CColumn::standardValueObject("callsign", CClient::IndexCallsign)); - this->m_columns.addColumn(CColumn::standardString("realname", { CClient::IndexUser, CUser::IndexRealName })); - this->m_columns.addColumn(CColumn("vo.", "voice capabilities", CClient::IndexVoiceCapabilitiesIcon, new CPixmapFormatter())); - this->m_columns.addColumn(CColumn::standardString("capabilities", CClient::IndexCapabilitiesString)); - this->m_columns.addColumn(CColumn::standardString("model", CClient::IndexModelString)); - this->m_columns.addColumn(CColumn("q.?", "queried", {CClient::IndexModelString, CAircraftModel::IndexHasQueriedModelString}, - new CBoolIconFormatter("queried", "not queried"))); - this->m_columns.addColumn(CColumn::standardString("server", CClient::IndexServer)); + m_columns.addColumn(CColumn("client", CClient::IndexIcon)); + m_columns.addColumn(CColumn::standardValueObject("callsign", CClient::IndexCallsign)); + m_columns.addColumn(CColumn::standardString("realname", { CClient::IndexUser, CUser::IndexRealName })); + m_columns.addColumn(CColumn("vo.", "voice capabilities", CClient::IndexVoiceCapabilitiesIcon, new CPixmapFormatter())); + m_columns.addColumn(CColumn::standardString("capabilities", CClient::IndexCapabilitiesString)); + m_columns.addColumn(CColumn::standardString("model", CClient::IndexModelString)); + m_columns.addColumn(CColumn("q.?", "queried", {CClient::IndexModelString, CAircraftModel::IndexHasQueriedModelString}, + new CBoolIconFormatter("queried", "not queried"))); + m_columns.addColumn(CColumn::standardString("server", CClient::IndexServer)); // force strings for translation in resource files (void)QT_TRANSLATE_NOOP("ViewClientList", "callsign"); @@ -56,26 +53,20 @@ namespace BlackGui static const CPropertyIndex ms({CClient::IndexModelString, CAircraftModel::IndexModelString}); static const CPropertyIndex qf({CClient::IndexModelString, CAircraftModel::IndexHasQueriedModelString}); if (role != Qt::DisplayRole && role != Qt::DecorationRole) { return CListModelBase::data(index, role); } - CPropertyIndex pi = modelIndexToPropertyIndex(index); + const CPropertyIndex pi = modelIndexToPropertyIndex(index); if (pi == ms && role == Qt::DisplayRole) { // no model string for ATC const CClient client = this->at(index); - bool atc = client.isAtc(); - if (atc) - { - return QVariant("ATC"); - } + const bool atc = client.isAtc(); + if (atc) { return QVariant("ATC"); } } else if (pi == qf && role == Qt::DecorationRole) { // no symbol for ATC const CClient client = this->at(index); - bool atc = client.isAtc(); - if (atc) - { - return QVariant(); - } + const bool atc = client.isAtc(); + if (atc) { return QVariant(); } } return CListModelBase::data(index, role); } diff --git a/src/blackgui/models/clientlistmodel.h b/src/blackgui/models/clientlistmodel.h index edc836a1d..461259a1d 100644 --- a/src/blackgui/models/clientlistmodel.h +++ b/src/blackgui/models/clientlistmodel.h @@ -9,12 +9,11 @@ //! \file -#ifndef BLACKGUI_CLIENTLISTMODEL_H -#define BLACKGUI_CLIENTLISTMODEL_H +#ifndef BLACKGUI_MODELS_CLIENTLISTMODEL_H +#define BLACKGUI_MODELS_CLIENTLISTMODEL_H #include "blackgui/blackguiexport.h" #include "blackgui/models/listmodelbase.h" -#include "blackmisc/network/client.h" #include "blackmisc/network/clientlist.h" #include diff --git a/src/blackgui/models/listmodelcallsignobjects.cpp b/src/blackgui/models/listmodelcallsignobjects.cpp index 03b6c7618..c445e2d90 100644 --- a/src/blackgui/models/listmodelcallsignobjects.cpp +++ b/src/blackgui/models/listmodelcallsignobjects.cpp @@ -9,7 +9,6 @@ #include "listmodelcallsignobjects.h" #include "allmodelcontainers.h" -#include "blackmisc/db/datastoreobjectlist.h" #include "blackmisc/orderable.h" #include diff --git a/src/blackgui/views/countryview.h b/src/blackgui/views/countryview.h index 352390d33..40a89897a 100644 --- a/src/blackgui/views/countryview.h +++ b/src/blackgui/views/countryview.h @@ -12,19 +12,18 @@ #ifndef BLACKGUI_VIEWS_COUNTRYVIEW_H #define BLACKGUI_VIEWS_COUNTRYVIEW_H -#include "blackgui/blackguiexport.h" -#include "blackgui/models/countrylistmodel.h" #include "blackgui/views/viewbase.h" +#include "blackgui/models/countrylistmodel.h" +#include "blackgui/blackguiexport.h" #include "blackmisc/countrylist.h" class QWidget; -namespace BlackMisc { class CCountry; } namespace BlackGui { namespace Views { - //! Distributors + //! Countries class BLACKGUI_EXPORT CCountryView : public CViewBase { public: diff --git a/src/blackgui/views/viewbase.h b/src/blackgui/views/viewbase.h index 35bfc2824..0bd5984a5 100644 --- a/src/blackgui/views/viewbase.h +++ b/src/blackgui/views/viewbase.h @@ -13,17 +13,17 @@ #define BLACKGUI_VIEWBASE_H #include "blackgui/components/enablefordockwidgetinfoarea.h" -#include "blackgui/menus/menuaction.h" #include "blackgui/models/modelfilter.h" #include "blackgui/models/selectionmodel.h" #include "blackgui/settings/guisettings.h" #include "blackgui/settings/viewdirectorysettings.h" -#include "blackgui/blackguiexport.h" +#include "blackgui/menus/menuaction.h" #include "blackmisc/namevariantpairlist.h" #include "blackmisc/propertyindex.h" #include "blackmisc/propertyindexvariantmap.h" #include "blackmisc/statusmessage.h" #include "blackmisc/variant.h" +#include "blackgui/blackguiexport.h" #include #include diff --git a/src/blackmisc/simulation/interpolator.h b/src/blackmisc/simulation/interpolator.h index 39f92416c..8a9a4906f 100644 --- a/src/blackmisc/simulation/interpolator.h +++ b/src/blackmisc/simulation/interpolator.h @@ -242,11 +242,11 @@ namespace BlackMisc qint64 m_currentTimeMsSinceEpoch = -1; //!< current time Aviation::CAircraftSituationList m_currentSituations; //!< current situations Aviation::CAircraftSituationChange m_currentSituationChange; //!< situations change - PhysicalQuantities::CLength m_currentSceneryOffset = PhysicalQuantities::CLength::null(); //!< calculated scenery offset if any CInterpolationAndRenderingSetupPerCallsign m_currentSetup; //!< used setup CInterpolationStatus m_currentInterpolationStatus; //!< this step's status CPartsStatus m_currentPartsStatus; //!< this step's status - Aviation::CAircraftSituation m_lastInterpolation { Aviation::CAircraftSituation::null() }; //!< latest interpolation + Aviation::CAircraftSituation m_lastInterpolation { Aviation::CAircraftSituation::null() }; //!< latest interpolation + PhysicalQuantities::CLength m_currentSceneryOffset { PhysicalQuantities::CLength::null() }; //!< calculated scenery offset if any qint64 m_situationsLastModified { -1 }; //!< when situations were last modified qint64 m_situationsLastModifiedUsed { -1 }; //!< interpolant based on situations last updated diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h index 7f11b48a0..6b79015f9 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -387,7 +387,7 @@ namespace BlackMisc CSimulatedAircraftList m_aircraftInRange; //!< aircraft, thread safe access required QMap m_reverseLookupMessages; - QMap m_aircraftPartsHistory; + QMap m_aircraftPartsHistory; //!< JSON aircraft parts history QMap m_situationsLastModified; QMap m_partsLastModified; QMap m_testOffset; diff --git a/src/blackmisc/variant.h b/src/blackmisc/variant.h index 98a38cf6e..2ac8e01a3 100644 --- a/src/blackmisc/variant.h +++ b/src/blackmisc/variant.h @@ -168,13 +168,13 @@ namespace BlackMisc CVariant &operator =(const CVariant &other) = default; //! Move assignment operatior. - CVariant &operator =(CVariant && other) noexcept = default; + CVariant &operator =(CVariant &&other) noexcept = default; //! Change the internal QVariant CVariant &operator =(const QVariant &var) { m_v = var; return *this; } //! Change the internal QVariant - CVariant &operator =(QVariant && var) noexcept { m_v = std::move(var); return *this; } + CVariant &operator =(QVariant &&var) noexcept { m_v = std::move(var); return *this; } //! Swap this variant with another. void swap(CVariant &other) noexcept { m_v.swap(other.m_v); }