From 4fb0db01bd54d8cff9e178e8310ec0e76478393d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 26 Feb 2019 00:42:51 +0100 Subject: [PATCH] Ref T554, "auto publish test data" for emulated driver --- .../simulatoremulatedmonitordialog.cpp | 10 +++++- .../emulated/simulatoremulatedmonitordialog.h | 3 ++ .../simulatoremulatedmonitordialog.ui | 36 +++++++++++++++---- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp index 3a66bf5d9..573f66689 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp @@ -10,8 +10,10 @@ #include "simulatoremulated.h" #include "ui_simulatoremulatedmonitordialog.h" #include "blackmisc/logmessage.h" + #include +using namespace BlackConfig; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Simulation; @@ -24,7 +26,7 @@ namespace BlackSimPlugin { const CLogCategoryList &CSimulatorEmulatedMonitorDialog::getLogCategories() { - static const BlackMisc::CLogCategoryList cats { CLogCategory::driver(), CLogCategory::plugin() }; + static const CLogCategoryList cats { CLogCategory::driver(), CLogCategory::plugin() }; return cats; } @@ -64,6 +66,7 @@ namespace BlackSimPlugin connect(ui->pb_InterpolatorStartLog, &QPushButton::clicked, this, &CSimulatorEmulatedMonitorDialog::interpolatorLogButton); connect(ui->pb_InterpolatorFetch, &QPushButton::clicked, this, &CSimulatorEmulatedMonitorDialog::interpolatorLogButton); connect(ui->pb_EmitAddedFailed, &QPushButton::clicked, this, &CSimulatorEmulatedMonitorDialog::emitSignal); + connect(ui->pb_AddAutoPublishData, &QPushButton::clicked, this, &CSimulatorEmulatedMonitorDialog::addAutoPublishTestData); ui->led_Receiving->setToolTips("receiving", "idle"); ui->led_Receiving->setShape(CLedWidget::Rounded); @@ -292,5 +295,10 @@ namespace BlackSimPlugin emit m_simulator->physicallyAddingRemoteModelFailed(aircraft, true, ui->cb_Failover->isChecked(), msg); } } + + void CSimulatorEmulatedMonitorDialog::addAutoPublishTestData() + { + m_simulator->m_autoPublishing.testData(); + } } // ns } // ns diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h index 19f9d756d..3091741f6 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h @@ -107,6 +107,9 @@ namespace BlackSimPlugin //! Emit a simulator signal void emitSignal(); + //! Test data for auto publishing + void addAutoPublishTestData(); + QScopedPointer ui; CSimulatorEmulated *m_simulator = nullptr; QTimer m_uiUpdateTimer; diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui index b36a91641..4194af93e 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui @@ -293,7 +293,7 @@ - + Qt::Horizontal @@ -552,6 +552,22 @@ + + + + Auto publish + + + + + + add + + + + + + @@ -574,8 +590,8 @@ 0 0 - 546 - 369 + 535 + 339 @@ -679,6 +695,11 @@ tw_SwiftMonitorDialog le_SimulatorPlugin le_Simulator + cb_Connected + cb_Simulating + cb_Paused + cb_Failover + pb_EmitAddedFailed le_InterpolatorTimeMs pb_InterpolatorFetch pb_InterpolatorClearLog @@ -695,6 +716,7 @@ le_SituationAdded le_PartsAdded le_PartsEnabledAircraft + pb_AddAutoPublishData sa_LogMessages @@ -706,8 +728,8 @@ accept() - 248 - 254 + 255 + 585 157 @@ -722,8 +744,8 @@ reject() - 316 - 260 + 323 + 585 286