Style and some view columns/UI renamings

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()))

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);

src/blackgui/components/interpolationlogdisplay.h

@@ -164,7 +164,7 @@ namespace BlackGui
             QTimer m_updateTimer;
             QPointer<BlackCore::ISimulator> m_simulator; //!< related simulator
             QPointer<BlackCore::CAirspaceMonitor> 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

src/blackgui/components/interpolationlogdisplay.ui

@@ -241,7 +241,7 @@
    <item>
     <widget class="QTabWidget" name="tw_LogTabs">
      <property name="currentIndex">
-      <number>5</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tb_DataFlow">
       <attribute name="title">
@@ -528,7 +528,7 @@
             </property>
             <widget class="QGroupBox" name="gb_InboundSituations">
              <property name="title">
-              <string>Inbound situations</string>
+              <string>Inbound situations from network</string>
              </property>
              <layout class="QVBoxLayout" name="vl_InboundSituations">
               <item>
@@ -548,7 +548,7 @@
             </widget>
             <widget class="QGroupBox" name="gb_InboundParts">
              <property name="title">
-              <string>Inbound parts</string>
+              <string>Inbound parts from network</string>
              </property>
              <layout class="QVBoxLayout" name="vl_InboundParts">
               <item>
@@ -755,7 +755,7 @@
        <item>
         <widget class="QGroupBox" name="gb_InterpolatedSituations">
          <property name="title">
-          <string>Interpolated</string>
+          <string>Interpolated (from interpolation logger)</string>
          </property>
          <layout class="QVBoxLayout" name="vl_InterpolatedGb">
           <item>
@@ -777,7 +777,7 @@
        <item>
         <widget class="QGroupBox" name="gb_LoopbackSituations">
          <property name="title">
-          <string>Loopback</string>
+          <string>Loopback from simulator</string>
          </property>
          <layout class="QVBoxLayout" name="vl_LoopbackGb">
           <item>

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, CLength>(CLengthUnit::ft(), 1)));
-            m_columns.addColumn(CColumn("offset", CAircraftSituation::IndexSceneryOffset, new CPhysiqalQuantiyFormatter<CLengthUnit, CLength>(CLengthUnit::ft(), 1)));
+            m_columns.addColumn(CColumn("sc.os.", "scenery offset", CAircraftSituation::IndexSceneryOffset, new CPhysiqalQuantiyFormatter<CLengthUnit, CLength>(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()));

src/blackgui/models/listmodeltimestampobjects.cpp

@@ -29,7 +29,7 @@ namespace BlackGui
         void CListModelTimestampObjects<ObjectType, ContainerType, UseCompare>::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<BlackMisc::CStatusMessage, BlackMisc::CStatusMessageList, true>;
@@ -54,8 +54,8 @@ namespace BlackGui
         void CListModelTimestampWithOffsetObjects<ObjectType, ContainerType, UseCompare>::addTimestampOffsetColumns()
         {
             CListModelTimestampObjects<ObjectType, ContainerType, UseCompare>::addTimestampColumns();
-            CListModelBaseNonTemplate::m_columns.addColumn(CColumn("ms adj.", ObjectType::IndexAdjustedMsWithOffset, new CIntegerFormatter()));
+            CListModelBaseNonTemplate::m_columns.addColumn(CColumn("ms adj.", "milliseconds adjusted", ObjectType::IndexAdjustedMsWithOffset, new CIntegerFormatter()));
-            CListModelBaseNonTemplate::m_columns.addColumn(CColumn("offset", ObjectType::IndexOffsetMs, new CIntegerFormatter()));
+            CListModelBaseNonTemplate::m_columns.addColumn(CColumn("t.os.", "time offset", ObjectType::IndexOffsetMs, new CIntegerFormatter()));
         }
 
         template class CListModelTimestampWithOffsetObjects<BlackMisc::Aviation::CAircraftParts, BlackMisc::Aviation::CAircraftPartsList, true>;

src/blackgui/models/listmodeltimestampobjects.h

@@ -57,4 +57,5 @@ namespace BlackGui
         };
     } // namespace
 } // namespace
+
 #endif // guard