From 296b04d8ea58788607e73b1330250b62c8584bfd Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 22 Jan 2018 05:08:44 +0100 Subject: [PATCH] Ref T231, Ref T232 show messages im simulator component --- src/blackgui/components/simulatorcomponent.cpp | 9 ++++++++- src/blackgui/components/simulatorcomponent.h | 13 ++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/blackgui/components/simulatorcomponent.cpp b/src/blackgui/components/simulatorcomponent.cpp index 79f492164..30e17c0b4 100644 --- a/src/blackgui/components/simulatorcomponent.cpp +++ b/src/blackgui/components/simulatorcomponent.cpp @@ -65,7 +65,8 @@ namespace BlackGui connect(ui->pb_RefreshInternals, &QPushButton::pressed, this, &CSimulatorComponent::refreshInternals); if (sGui->supportsContexts() && sGui->getIContextSimulator()) { - connect(sGui->getIContextSimulator(), &IContextSimulator::addingRemoteModelFailed, this, &CSimulatorComponent::onAddingRemoteModelFailed); + connect(sGui->getIContextSimulator(), &IContextSimulator::addingRemoteModelFailed, this, &CSimulatorComponent::onAddingRemoteModelFailed, Qt::QueuedConnection); + connect(sGui->getIContextSimulator(), &IContextSimulator::driverMessages, this, &CSimulatorComponent::onSimulatorMessages, Qt::QueuedConnection); } // init status @@ -174,6 +175,12 @@ namespace BlackGui ui->comp_StatusMessages->appendStatusMessageToList(message); } + void CSimulatorComponent::onSimulatorMessages(const BlackMisc::CStatusMessageList &messages) + { + if (messages.isEmpty()) { return; } + ui->comp_StatusMessages->appendStatusMessagesToList(messages); + } + void CSimulatorComponent::refreshInternals() { if (!sGui->getIContextSimulator()) { return; } diff --git a/src/blackgui/components/simulatorcomponent.h b/src/blackgui/components/simulatorcomponent.h index c4ba69af1..41f7abf3f 100644 --- a/src/blackgui/components/simulatorcomponent.h +++ b/src/blackgui/components/simulatorcomponent.h @@ -26,7 +26,15 @@ class QWidget; -namespace BlackMisc { class CIcon; namespace Simulation { class CSimulatedAircraft; }} +namespace BlackMisc +{ + class CIcon; + class CStatusMessageList; + namespace Simulation + { + class CSimulatedAircraft; + } +} namespace Ui { class CSimulatorComponent; } namespace BlackGui { @@ -66,6 +74,9 @@ namespace BlackGui //! \copydoc ISimulator::addingRemoteModelFailed void onAddingRemoteModelFailed(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CStatusMessage &message); + //! \copydoc ISimulator::onSimulatorMessages + void onSimulatorMessages(const BlackMisc::CStatusMessageList &messages); + //! Refresh the internals void refreshInternals();