Ref T270, changes to context/and interpolation log display so we can display "internals" of airspace monitor

This commit is contained in:
Klaus Basan
2018-05-24 19:44:45 +02:00
parent 27340f6906
commit 90f84149ed
8 changed files with 610 additions and 52 deletions

View File

@@ -9,11 +9,20 @@
#include "interpolationlogdisplay.h"
#include "ui_interpolationlogdisplay.h"
#include "blackgui/guiapplication.h"
#include "blackcore/context/contextnetworkimpl.h"
#include "blackcore/airspacemonitor.h"
#include "blackmisc/simulation/interpolationlogger.h"
#include "blackmisc/stringutils.h"
using namespace BlackCore;
using namespace BlackCore::Context;
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Network;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::PhysicalQuantities;
namespace BlackGui
{
@@ -24,6 +33,7 @@ namespace BlackGui
ui(new Ui::CInterpolationLogDisplay)
{
ui->setupUi(this);
ui->tw_LogTabs->setCurrentIndex(TabFlow);
constexpr int timeSecs = 5;
ui->hs_UpdateTime->setValue(timeSecs);
this->onSliderChanged(timeSecs);
@@ -32,6 +42,12 @@ namespace BlackGui
connect(ui->pb_StartStop, &QPushButton::released, this, &CInterpolationLogDisplay::toggleStartStop);
connect(ui->comp_CallsignCompleter, &CCallsignCompleter::validCallsignEntered, this, &CInterpolationLogDisplay::onCallsignEntered);
CLedWidget::LedShape shape = CLedWidget::Rounded;
ui->led_Parts->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "Parts received", "", 14);
ui->led_Situation->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "Situation received", "", 14);
ui->led_Elevation->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "Elevation received", "", 14);
ui->led_Running->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "Running", "Stopped", 14);
m_callsign = ui->comp_CallsignCompleter->getCallsign();
}
@@ -40,21 +56,59 @@ namespace BlackGui
void CInterpolationLogDisplay::setSimulator(CSimulatorCommon *simulatorCommon)
{
if (simulatorCommon && simulatorCommon == m_simulatorCommon) { return; } // same
if (m_simulatorCommon)
{
this->disconnect(m_simulatorCommon);
m_simulatorCommon->disconnect(this);
}
m_simulatorCommon = simulatorCommon;
connect(m_simulatorCommon, &CSimulatorCommon::receivedRequestedElevation, this, &CInterpolationLogDisplay::onElevationReceived);
connect(m_simulatorCommon, &CSimulatorCommon::requestedElevation, this, &CInterpolationLogDisplay::onElevationRequested);
}
void CInterpolationLogDisplay::setAirspaceMonitor(CAirspaceMonitor *airspaceMonitor)
{
if (airspaceMonitor && airspaceMonitor == m_airspaceMonitor) { return; } // same
if (m_airspaceMonitor)
{
this->disconnect(m_airspaceMonitor);
m_airspaceMonitor->disconnect(this);
}
m_airspaceMonitor = airspaceMonitor;
connect(m_airspaceMonitor, &CAirspaceMonitor::addedAircraftSituation, this, &CInterpolationLogDisplay::onSituationAdded, Qt::QueuedConnection);
connect(m_airspaceMonitor, &CAirspaceMonitor::addedAircraftParts, this, &CInterpolationLogDisplay::onPartsAdded, Qt::QueuedConnection);
}
void CInterpolationLogDisplay::updateLog()
{
const bool hasLogger = m_simulatorCommon;
if (hasLogger && !m_callsign.isEmpty())
if (!sGui || sGui->isShuttingDown()) { return; }
const bool hasLogger = m_simulatorCommon && m_airspaceMonitor;
if (!hasLogger || m_callsign.isEmpty())
{
ui->te_TextLog->setText("No logger attached or no callsign");
this->stop();
this->clear();
}
// only display visible tab
if (ui->tw_LogTabs->currentWidget() == ui->tb_TextLog)
{
const QString log = m_simulatorCommon->latestLoggedDataFormatted(m_callsign);
ui->te_Log->setText(log);
ui->te_TextLog->setText(log);
}
else
else if (ui->tw_LogTabs->currentWidget() == ui->tb_DataFlow)
{
ui->te_Log->setText("No logger attached or no callsign");
this->stop();
ui->le_CG->setText(m_airspaceMonitor->getCG(m_callsign).valueRoundedWithUnit(CLengthUnit::ft(), 1));
ui->le_CG->home(false);
ui->le_Parts->setText(boolToYesNo(m_airspaceMonitor->isRemoteAircraftSupportingParts(m_callsign)));
static const QString avgUpdateTime("%1ms");
ui->le_AvgUpdateTimeMs->setText(avgUpdateTime.arg(m_simulatorCommon->getStatisticsAverageUpdateTimeMs()));
const CClient client = m_airspaceMonitor->getClientOrDefaultForCallsign(m_callsign);
ui->le_GndFlag->setText(boolToYesNo(client.hasGndFlagCapability()));
}
}
@@ -73,12 +127,14 @@ namespace BlackGui
this->stop();
return;
}
if (m_callsign == cs) { return; }
// clear last callsign
if (!m_callsign.isEmpty())
{
m_simulatorCommon->setLogInterpolation(false, m_callsign); // stop logging "old" callsign
m_callsign = CCallsign(); // clear callsign
this->clear();
}
// set new callsign or stop
@@ -95,14 +151,8 @@ namespace BlackGui
void CInterpolationLogDisplay::toggleStartStop()
{
const bool running = m_updateTimer.isActive();
if (running)
{
this->stop();
}
else
{
this->start();
}
if (running) { this->stop(); }
else { this->start(); }
}
void CInterpolationLogDisplay::start()
@@ -110,12 +160,79 @@ namespace BlackGui
const int interval = ui->hs_UpdateTime->value() * 1000;
m_updateTimer.start(interval);
ui->pb_StartStop->setText(stopText());
ui->led_Running->setOn(true);
}
void CInterpolationLogDisplay::stop()
{
m_updateTimer.stop();
ui->pb_StartStop->setText(startText());
ui->led_Running->setOn(false);
}
bool CInterpolationLogDisplay::logCallsign(const CCallsign &cs) const
{
if (!sGui || sGui->isShuttingDown()) { return false; }
if (!m_airspaceMonitor || !m_simulatorCommon || m_callsign.isEmpty()) { return false; }
if (cs != m_callsign) { return false; }
return true;
}
void CInterpolationLogDisplay::onSituationAdded(const CAircraftSituation &situation)
{
const CCallsign cs = situation.getCallsign();
if (!this->logCallsign(cs)) { return; }
const CAircraftSituationList situations = m_airspaceMonitor->remoteAircraftSituations(cs);
ui->tvp_AircraftSituations->updateContainerAsync(situations);
ui->led_Situation->blink();
}
void CInterpolationLogDisplay::onPartsAdded(const CCallsign &callsign, const CAircraftParts &parts)
{
if (!this->logCallsign(callsign)) { return; }
Q_UNUSED(parts);
const CAircraftPartsList partsList = m_airspaceMonitor->remoteAircraftParts(callsign);
ui->tvp_AircraftParts->updateContainerAsync(partsList);
ui->led_Parts->blink();
}
void CInterpolationLogDisplay::onElevationReceived(const CElevationPlane &plane, const CCallsign &callsign)
{
if (!this->logCallsign(callsign)) { return; }
m_elvReceived++;
ui->le_Elevation->setText(plane.toQString());
ui->led_Elevation->blink();
ui->le_ElevationRec->setText(QString::number(m_elvReceived));
}
void CInterpolationLogDisplay::onElevationRequested(const CCallsign &callsign)
{
if (!this->logCallsign(callsign)) { return; }
m_elvRequested++;
ui->led_Elevation->blink();
ui->le_ElevationReq->setText(QString::number(m_elvRequested));
}
void CInterpolationLogDisplay::clear()
{
ui->tvp_AircraftParts->clear();
ui->tvp_AircraftSituations->clear();
ui->te_TextLog->clear();
ui->le_CG->clear();
ui->le_Elevation->clear();
ui->le_ElevationRec->clear();
ui->le_ElevationReq->clear();
ui->le_Parts->clear();
ui->le_AvgUpdateTimeMs->clear();
m_elvReceived = m_elvRequested = 0;
}
void CInterpolationLogDisplay::linkWithAirspaceMonitor()
{
if (!sGui || sGui->isShuttingDown() || !sGui->supportsContexts()) { return; }
if (!sGui->getCoreFacade() || !sGui->getCoreFacade()->getCContextNetwork()) { return; }
const CContextNetwork *cn = sGui->getCoreFacade()->getCContextNetwork();
this->setAirspaceMonitor(cn->airspace());
}
const QString &CInterpolationLogDisplay::startText()