Ref T111, show sending and receiving API calls by LED

* monitor and log own signals
* indcated receiving and sending

src/plugins/simulator/emulated/simulatoremulated.cpp

@@ -45,6 +45,9 @@ namespace BlackSimPlugin
             m_monitorWidget.reset(new CSimulatorEmulatedMonitorDialog(this, sGui->mainApplicationWindow()));
             connect(qApp, &QApplication::aboutToQuit, this, &CSimulatorEmulated::closeMonitor);
             this->onSettingsChanged();
+
+            // connect own signals for monitoring
+            this->connectOwnSignals();
         }
 
         CSimulatorInfo CSimulatorEmulated::getSimulatorInfo() const
@@ -66,44 +69,44 @@ namespace BlackSimPlugin
                 m_monitorWidget->show();
             });
 
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO);
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO);
             return true;
         }
 
         bool CSimulatorEmulated::disconnectFrom()
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO);
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO);
             m_renderedAircraft.clear();
             return true;
         }
 
         bool CSimulatorEmulated::logicallyAddRemoteAircraft(const CSimulatedAircraft &remoteAircraft)
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, remoteAircraft.toQString());
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, remoteAircraft.toQString());
             return CSimulatorCommon::logicallyAddRemoteAircraft(remoteAircraft);
         }
 
         bool CSimulatorEmulated::logicallyRemoveRemoteAircraft(const CCallsign &callsign)
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, callsign.toQString());
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, callsign.toQString());
             return CSimulatorCommon::logicallyRemoveRemoteAircraft(callsign);
         }
 
         int CSimulatorEmulated::physicallyRemoveMultipleRemoteAircraft(const CCallsignSet &callsigns)
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, callsigns.toQString());
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, callsigns.toQString());
             return CSimulatorCommon::physicallyRemoveMultipleRemoteAircraft(callsigns);
         }
 
         bool CSimulatorEmulated::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft)
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, aircraft.toQString());
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, aircraft.toQString());
             return true;
         }
 
         bool CSimulatorEmulated::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft)
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, aircraft.toQString());
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, aircraft.toQString());
             const int c = m_renderedAircraft.setEnabled(aircraft.getCallsign(), aircraft.isEnabled(), true);
             emit this->aircraftRenderingChanged(m_renderedAircraft.findFirstByCallsign(aircraft.getCallsign(), aircraft));
             return c > 0;
@@ -111,7 +114,7 @@ namespace BlackSimPlugin
 
         bool CSimulatorEmulated::updateOwnSimulatorCockpit(const CSimulatedAircraft &aircraft, const CIdentifier &originator)
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, aircraft.toQString(), originator.toQString());
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, aircraft.toQString(), originator.toQString());
             if (originator == identifier()) { return false; } // myself
             m_myAircraft.setCockpit(aircraft);
             emit this->internalAircraftChanged();
@@ -120,7 +123,7 @@ namespace BlackSimPlugin
 
         bool CSimulatorEmulated::updateOwnSimulatorSelcal(const CSelcal &selcal, const CIdentifier &originator)
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, selcal.toQString(), originator.toQString());
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, selcal.toQString(), originator.toQString());
             if (originator == identifier()) { return false; } // myself
             if (m_myAircraft.getSelcal() == selcal) { return false; }
             m_myAircraft.setSelcal(selcal);
@@ -130,19 +133,19 @@ namespace BlackSimPlugin
 
         void CSimulatorEmulated::displayStatusMessage(const CStatusMessage &message) const
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, message.toQString());
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, message.toQString());
             m_monitorWidget->displayStatusMessage(message);
         }
 
         void CSimulatorEmulated::displayTextMessage(const CTextMessage &message) const
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, message.toQString());
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, message.toQString());
             m_monitorWidget->displayTextMessage(message);
         }
 
         bool CSimulatorEmulated::setTimeSynchronization(bool enable, const CTime &offset)
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, boolToTrueFalse(enable), offset.toQString());
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, boolToTrueFalse(enable), offset.toQString());
             m_timeSyncronized = enable;
             m_offsetTime = offset;
             return enable;
@@ -150,31 +153,31 @@ namespace BlackSimPlugin
 
         CTime CSimulatorEmulated::getTimeSynchronizationOffset() const
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO);
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO);
             return m_offsetTime;
         }
 
         bool CSimulatorEmulated::isPhysicallyRenderedAircraft(const CCallsign &callsign) const
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, callsign.toQString());
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, callsign.toQString());
             return m_renderedAircraft.containsCallsign(callsign);
         }
 
         CCallsignSet CSimulatorEmulated::physicallyRenderedAircraft() const
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO);
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO);
             return m_renderedAircraft.getCallsigns();
         }
 
         void CSimulatorEmulated::highlightAircraft(const CSimulatedAircraft &aircraftToHighlight, bool enableHighlight, const CTime &displayTime)
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, aircraftToHighlight.toQString(), boolToTrueFalse(enableHighlight), displayTime.toQString());
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, aircraftToHighlight.toQString(), boolToTrueFalse(enableHighlight), displayTime.toQString());
             CSimulatorCommon::highlightAircraft(aircraftToHighlight, enableHighlight, displayTime);
         }
 
         bool CSimulatorEmulated::parseCommandLine(const QString &commandLine, const CIdentifier &originator)
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, commandLine, originator.toQString());
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, commandLine, originator.toQString());
             return CSimulatorCommon::parseCommandLine(commandLine, originator);
         }
 
@@ -230,25 +233,25 @@ namespace BlackSimPlugin
 
         bool CSimulatorEmulated::isConnected() const
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO);
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO);
             return m_connected;
         }
 
         bool CSimulatorEmulated::isPaused() const
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO);
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO);
             return m_paused;
         }
 
         bool CSimulatorEmulated::isSimulating() const
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO);
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO);
             return m_simulating;
         }
 
         bool CSimulatorEmulated::physicallyAddRemoteAircraft(const CSimulatedAircraft &remoteAircraft)
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, remoteAircraft.toQString());
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, remoteAircraft.toQString());
             CSimulatedAircraft aircraft(remoteAircraft);
             aircraft.setRendered(true);
             m_renderedAircraft.push_back(aircraft);
@@ -258,20 +261,20 @@ namespace BlackSimPlugin
 
         bool CSimulatorEmulated::physicallyRemoveRemoteAircraft(const CCallsign &callsign)
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, callsign.toQString());
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, callsign.toQString());
             const int c = m_renderedAircraft.removeByCallsign(callsign);
             return c > 0;
         }
 
         bool CSimulatorEmulated::setInterpolatorMode(CInterpolatorMulti::Mode mode, const CCallsign &callsign)
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO, CInterpolatorMulti::modeToString(mode), callsign.toQString());
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, CInterpolatorMulti::modeToString(mode), callsign.toQString());
             return false;
         }
 
         int CSimulatorEmulated::physicallyRemoveAllRemoteAircraft()
         {
-            if (canLog()) m_monitorWidget->appendFunctionCall(Q_FUNC_INFO);
+            if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO);
             return CSimulatorCommon::physicallyRemoveAllRemoteAircraft();
         }
 
@@ -319,6 +322,47 @@ namespace BlackSimPlugin
             this->updateOwnModel(settings.getOwnModel());
         }
 
+        void CSimulatorEmulated::connectOwnSignals()
+        {
+            //! \fixme signal name not hardcoded would be nice
+            m_connectionGuard.append(connect(this, &ISimulator::simulatorStatusChanged, this, [ = ](SimulatorStatus status)
+            {
+                if (!m_monitorWidget) return;
+                m_monitorWidget->appendSendingCall("simulatorStatusChanged", CSimulatorEmulated::statusToString(status));
+            }));
+
+            m_connectionGuard.append(connect(this, &ISimulator::ownAircraftModelChanged, this, [ = ](CAircraftModel model)
+            {
+                if (!m_monitorWidget) return;
+                m_monitorWidget->appendSendingCall("ownAircraftModelChanged", model.toQString());
+            }));
+
+            m_connectionGuard.append(connect(this, &ISimulator::renderRestrictionsChanged, this, [ = ](bool restricted, bool enabled, int maxAircraft, const BlackMisc::PhysicalQuantities::CLength & maxRenderedDistance)
+            {
+                if (!m_monitorWidget) return;
+                static const QString params("restricted: %1 enabled: %2 max aircraft: %3");
+                m_monitorWidget->appendSendingCall("renderRestrictionsChanged", params.arg(boolToYesNo(restricted), boolToYesNo(enabled)).arg(maxAircraft), maxRenderedDistance.valueRoundedWithUnit(CLengthUnit::m(), 1));
+            }));
+
+            m_connectionGuard.append(connect(this, &ISimulator::aircraftRenderingChanged, this, [ = ](const CSimulatedAircraft & aircraft)
+            {
+                if (!m_monitorWidget) return;
+                m_monitorWidget->appendSendingCall("aircraftRenderingChanged", aircraft.toQString());
+            }));
+
+            m_connectionGuard.append(connect(this, &ISimulator::physicallyAddingRemoteModelFailed, this, [ = ](const CSimulatedAircraft & aircraft)
+            {
+                if (!m_monitorWidget) return;
+                m_monitorWidget->appendSendingCall("physicallyAddingRemoteModelFailed", aircraft.toQString());
+            }));
+
+            m_connectionGuard.append(connect(this, &ISimulator::airspaceSnapshotHandled, this, [ = ]
+            {
+                if (!m_monitorWidget) return;
+                m_monitorWidget->appendSendingCall("airspaceSnapshotHandled");
+            }));
+        }
+
         CSimulatorEmulatedListener::CSimulatorEmulatedListener(const CSimulatorPluginInfo &info)
             : ISimulatorListener(info)
         { }

src/plugins/simulator/emulated/simulatoremulated.h

@@ -16,6 +16,7 @@
 #include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/simulation/settings/swiftpluginsettings.h"
 #include "blackmisc/pq/time.h"
+#include "blackmisc/connectionguard.h"
 #include "simulatoremulatedmonitordialog.h"
 
 #include <QScopedPointer>
@@ -131,6 +132,9 @@ namespace BlackSimPlugin
             //! Values from UI
             void onSimulatorStatusChanged();
 
+            //! Connect own signals for monitoring
+            void connectOwnSignals();
+
             bool m_log = false; //!< from settings
             bool m_paused = false;
             bool m_connected = true;
@@ -142,6 +146,7 @@ namespace BlackSimPlugin
 
             QScopedPointer<CSimulatorEmulatedMonitorDialog> m_monitorWidget; //!< parent will be main window, so we need to destroy widget when destroyed
             BlackMisc::CSettingReadOnly<BlackMisc::Simulation::Settings::TSwiftPlugin> m_settings { this, &CSimulatorEmulated::onSettingsChanged };
+            BlackMisc::CConnectionGuard m_connectionGuard;
         };
 
         //! Listener for swift

src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp

@@ -14,6 +14,7 @@
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Simulation;
+using namespace BlackGui;
 using namespace BlackGui::Editors;
 
 namespace BlackSimPlugin
@@ -49,6 +50,11 @@ namespace BlackSimPlugin
             connect(ui->editor_Com, &CCockpitComForm::changedCockpitValues, this, &CSimulatorEmulatedMonitorDialog::changeComFromUi);
             connect(ui->editor_Com, &CCockpitComForm::changedSelcal, this, &CSimulatorEmulatedMonitorDialog::changeSelcalFromUi);
 
+            ui->wi_LedReceiving->setToolTips("receiving", "idle");
+            ui->wi_LedReceiving->setShape(CLedWidget::Rounded);
+            ui->wi_LedSending->setToolTips("sending", "idle");
+            ui->wi_LedSending->setShape(CLedWidget::Rounded);
+
             this->setSimulatorUiValues();
             this->setInteralAircraftUiValues();
         }
@@ -66,6 +72,18 @@ namespace BlackSimPlugin
             ui->comp_LogComponent->appendStatusMessagesToList(statusMessages);
         }
 
+        void CSimulatorEmulatedMonitorDialog::appendReceivingCall(const QString &function, const QString &p1, const QString &p2, const QString &p3)
+        {
+            ui->wi_LedReceiving->blink();
+            this->appendFunctionCall(function, p1, p2, p3);
+        }
+
+        void CSimulatorEmulatedMonitorDialog::appendSendingCall(const QString &function, const QString &p1, const QString &p2, const QString &p3)
+        {
+            ui->wi_LedSending->blink();
+            this->appendFunctionCall(function, p1, p2, p3);
+        }
+
         void CSimulatorEmulatedMonitorDialog::appendFunctionCall(const QString &function, const QString &p1, const QString &p2, const QString &p3)
         {
             static const QString c1("%1 %2");

src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h

@@ -48,8 +48,11 @@ namespace BlackSimPlugin
             //! \copydoc BlackGui::Components::CLogComponent::appendStatusMessagesToList
             void appendStatusMessagesToList(const BlackMisc::CStatusMessageList &statusMessages);
 
-            //! Append a function call as status message
-            void appendFunctionCall(const QString &function, const QString &p1 = {}, const QString &p2 = {}, const QString &p3 = {});
+            //! Receiving call to be written in log widget
+            void appendReceivingCall(const QString &function, const QString &p1 = {}, const QString &p2 = {}, const QString &p3 = {});
+
+            //! Sending call to be written in log widget
+            void appendSendingCall(const QString &function, const QString &p1 = {}, const QString &p2 = {}, const QString &p3 = {});
 
             //! Display status message
             void displayStatusMessage(const BlackMisc::CStatusMessage &message);
@@ -60,6 +63,9 @@ namespace BlackSimPlugin
         private:
             static int constexpr MaxLogMessages = 500; //!< desired log message number
 
+            //! Append a function call as status message
+            void appendFunctionCall(const QString &function, const QString &p1 = {}, const QString &p2 = {}, const QString &p3 = {});
+
             //! UI values changed
             void onSimulatorValuesChanged();
 

src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui

@@ -6,14 +6,59 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>718</width>
-    <height>480</height>
+    <width>582</width>
+    <height>593</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Emulated simulator monitor</string>
   </property>
   <layout class="QVBoxLayout" name="vl_Settings">
+   <item>
+    <widget class="QFrame" name="fr_LedHeader">
+     <layout class="QHBoxLayout" name="hl_LedHeader">
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="lbl_Receiving">
+        <property name="text">
+         <string>Receiving</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="BlackGui::CLedWidget" name="wi_LedReceiving" native="true"/>
+      </item>
+      <item>
+       <widget class="QLabel" name="lbl_Sending">
+        <property name="text">
+         <string>Sending</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="BlackGui::CLedWidget" name="wi_LedSending" native="true"/>
+      </item>
+      <item>
+       <spacer name="hs_LedHeader">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <widget class="QTabWidget" name="tw_SwiftMonitorDialog">
      <property name="currentIndex">
@@ -331,6 +376,12 @@
    <header>blackgui/editors/cockpitcomform.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>BlackGui::CLedWidget</class>
+   <extends>QWidget</extends>
+   <header>blackgui/led.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections>