From fe99eb0fedd055f28380a5fded5c555acaacaefd Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 31 Jul 2018 21:40:37 +0200 Subject: [PATCH] Style and some view columns/UI renamings --- samples/blackmiscdbus/servicetool.cpp | 2 +- src/blackcore/simulator.cpp | 10 +++++----- src/blackgui/components/interpolationlogdisplay.h | 2 +- src/blackgui/components/interpolationlogdisplay.ui | 10 +++++----- src/blackgui/models/aircraftsituationlistmodel.cpp | 2 +- src/blackgui/models/listmodeltimestampobjects.cpp | 6 +++--- src/blackgui/models/listmodeltimestampobjects.h | 1 + 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/samples/blackmiscdbus/servicetool.cpp b/samples/blackmiscdbus/servicetool.cpp index 0727d4575..cbce652ba 100644 --- a/samples/blackmiscdbus/servicetool.cpp +++ b/samples/blackmiscdbus/servicetool.cpp @@ -56,7 +56,7 @@ using namespace BlackCore; namespace BlackSample { - void ServiceTool::dataTransferTestServer(BlackMisc::CDBusServer *dBusServer, bool verbose) + void ServiceTool::dataTransferTestServer(CDBusServer *dBusServer, bool verbose) { QDBusConnection sessionBusConnection = QDBusConnection::sessionBus(); if (sessionBusConnection.interface()->isServiceRegistered(CTestService::InterfaceName())) diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index f46f8372d..8b0bb00f6 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -97,7 +97,7 @@ namespace BlackCore m_highlightedAircraft.removeByCallsign(cs); if (enableHighlight) { - const qint64 deltaT = displayTime.valueRounded(CTimeUnit::ms(), 0); + const qint64 deltaT = displayTime.valueInteger(CTimeUnit::ms()); m_highlightEndTimeMsEpoch = QDateTime::currentMSecsSinceEpoch() + deltaT; m_highlightedAircraft.push_back(aircraftToHighlight); } @@ -457,7 +457,7 @@ namespace BlackCore this->clearAllRemoteAircraftData(); if (!msgs.isEmpty()) { emit this->driverMessages(msgs); } const CSimulatedAircraftList aircraft = this->getAircraftInRange(); - for (const CSimulatedAircraft a : aircraft) + for (const CSimulatedAircraft &a : aircraft) { if (a.isEnabled()) { this->logicallyAddRemoteAircraft(a); } } @@ -833,13 +833,13 @@ namespace BlackCore return false; } - int tokens = 0.1 * numberPerSecond; // 100ms + int tokens = qRound(0.1 * numberPerSecond); // 100ms do { if (tokens >= 3) { m_limitUpdateAircraftBucket.setInterval(100); break; } - tokens = 0.25 * numberPerSecond; // 250ms + tokens = qRound(0.25 * numberPerSecond); // 250ms if (tokens >= 3) { m_limitUpdateAircraftBucket.setInterval(250); break; } - tokens = 0.5 * numberPerSecond; // 500ms + tokens = qRound(0.5 * numberPerSecond); // 500ms if (tokens >= 3) { m_limitUpdateAircraftBucket.setInterval(500); break; } tokens = numberPerSecond; m_limitUpdateAircraftBucket.setInterval(1000); diff --git a/src/blackgui/components/interpolationlogdisplay.h b/src/blackgui/components/interpolationlogdisplay.h index 602ba51e5..aa6678bba 100644 --- a/src/blackgui/components/interpolationlogdisplay.h +++ b/src/blackgui/components/interpolationlogdisplay.h @@ -164,7 +164,7 @@ namespace BlackGui QTimer m_updateTimer; QPointer m_simulator; //!< related simulator QPointer m_airspaceMonitor; //!< related airspace monitor - BlackMisc::Aviation::CAircraftSituationList m_lastInterpolations; + BlackMisc::Aviation::CAircraftSituationList m_lastInterpolations; //!< list of last interpolations BlackMisc::Aviation::CCallsign m_callsign; //!< current callsign int m_elvRequested = 0; //!< counted via signal int m_elvReceived = 0; //!< counted via signal diff --git a/src/blackgui/components/interpolationlogdisplay.ui b/src/blackgui/components/interpolationlogdisplay.ui index 471c8769b..7e37fde1b 100644 --- a/src/blackgui/components/interpolationlogdisplay.ui +++ b/src/blackgui/components/interpolationlogdisplay.ui @@ -241,7 +241,7 @@ - 5 + 0 @@ -528,7 +528,7 @@ - Inbound situations + Inbound situations from network @@ -548,7 +548,7 @@ - Inbound parts + Inbound parts from network @@ -755,7 +755,7 @@ - Interpolated + Interpolated (from interpolation logger) @@ -777,7 +777,7 @@ - Loopback + Loopback from simulator diff --git a/src/blackgui/models/aircraftsituationlistmodel.cpp b/src/blackgui/models/aircraftsituationlistmodel.cpp index 44d759ea4..b2ff9e517 100644 --- a/src/blackgui/models/aircraftsituationlistmodel.cpp +++ b/src/blackgui/models/aircraftsituationlistmodel.cpp @@ -32,7 +32,7 @@ namespace BlackGui m_columns.addColumn(CColumn("altitude", CAircraftSituation::IndexAltitude, new CAltitudeFormatter())); m_columns.addColumn(CColumn("CG", CAircraftSituation::IndexCG, new CPhysiqalQuantiyFormatter(CLengthUnit::ft(), 1))); - m_columns.addColumn(CColumn("offset", CAircraftSituation::IndexSceneryOffset, new CPhysiqalQuantiyFormatter(CLengthUnit::ft(), 1))); + m_columns.addColumn(CColumn("sc.os.", "scenery offset", CAircraftSituation::IndexSceneryOffset, new CPhysiqalQuantiyFormatter(CLengthUnit::ft(), 1))); m_columns.addColumn(CColumn("latitude", CAircraftSituation::IndexLatitude, new CLatLonFormatter())); m_columns.addColumn(CColumn("longitude", CAircraftSituation::IndexLongitude, new CLatLonFormatter())); m_columns.addColumn(CColumn("gs.", CAircraftSituation::IndexGroundSpeed, new CSpeedKtsFormatter())); diff --git a/src/blackgui/models/listmodeltimestampobjects.cpp b/src/blackgui/models/listmodeltimestampobjects.cpp index f212a467a..e2e935921 100644 --- a/src/blackgui/models/listmodeltimestampobjects.cpp +++ b/src/blackgui/models/listmodeltimestampobjects.cpp @@ -29,7 +29,7 @@ namespace BlackGui void CListModelTimestampObjects::addTimestampColumns() { CListModelBaseNonTemplate::m_columns.addColumn(CColumn::standardString("timestamp", ObjectType::IndexUtcTimestampFormattedMdhmsz)); - CListModelBaseNonTemplate::m_columns.addColumn(CColumn("ms", ObjectType::IndexMSecsSinceEpoch, new CIntegerFormatter())); + CListModelBaseNonTemplate::m_columns.addColumn(CColumn("timestamp ms", "milliseconds since epoch", ObjectType::IndexMSecsSinceEpoch, new CIntegerFormatter())); } template class CListModelTimestampObjects; @@ -54,8 +54,8 @@ namespace BlackGui void CListModelTimestampWithOffsetObjects::addTimestampOffsetColumns() { CListModelTimestampObjects::addTimestampColumns(); - CListModelBaseNonTemplate::m_columns.addColumn(CColumn("ms adj.", ObjectType::IndexAdjustedMsWithOffset, new CIntegerFormatter())); - CListModelBaseNonTemplate::m_columns.addColumn(CColumn("offset", ObjectType::IndexOffsetMs, new CIntegerFormatter())); + CListModelBaseNonTemplate::m_columns.addColumn(CColumn("ms adj.", "milliseconds adjusted", ObjectType::IndexAdjustedMsWithOffset, new CIntegerFormatter())); + CListModelBaseNonTemplate::m_columns.addColumn(CColumn("t.os.", "time offset", ObjectType::IndexOffsetMs, new CIntegerFormatter())); } template class CListModelTimestampWithOffsetObjects; diff --git a/src/blackgui/models/listmodeltimestampobjects.h b/src/blackgui/models/listmodeltimestampobjects.h index bfa5a5eb3..b7d93a71d 100644 --- a/src/blackgui/models/listmodeltimestampobjects.h +++ b/src/blackgui/models/listmodeltimestampobjects.h @@ -57,4 +57,5 @@ namespace BlackGui }; } // namespace } // namespace + #endif // guard