From 2d4472d64fb8859da014d1f300c98b8016a41cea Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 16 Sep 2019 00:22:32 +0200 Subject: [PATCH] Ref T717, "fetch" simulator data for model browser --- src/blackcore/context/contextsimulatorempty.h | 1 + src/blackgui/components/modelbrowsercomponent.cpp | 10 ++++++++-- src/blackgui/components/modelbrowsercomponent.h | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/blackcore/context/contextsimulatorempty.h b/src/blackcore/context/contextsimulatorempty.h index cb03c7710..68a445aac 100644 --- a/src/blackcore/context/contextsimulatorempty.h +++ b/src/blackcore/context/contextsimulatorempty.h @@ -372,6 +372,7 @@ namespace BlackCore return false; } + //! \copydoc IContextSimulator::findClosestElevationWithinRange virtual BlackMisc::Geo::CElevationPlane findClosestElevationWithinRange(const BlackMisc::Geo::CCoordinateGeodetic &reference, const BlackMisc::PhysicalQuantities::CLength &range) const override { Q_UNUSED(reference); diff --git a/src/blackgui/components/modelbrowsercomponent.cpp b/src/blackgui/components/modelbrowsercomponent.cpp index ca692d05d..0b821ed25 100644 --- a/src/blackgui/components/modelbrowsercomponent.cpp +++ b/src/blackgui/components/modelbrowsercomponent.cpp @@ -106,9 +106,9 @@ namespace BlackGui { if (!this->hasContexts()) { return; } CAircraftParts parts = CAircraftParts::null(); - if (setParts) { parts = this->getParts(); } + if (setParts || ui->cb_UseParts->isChecked()) { parts = this->getParts(); } - if (setPbh) + if (setPbh || ui->cb_UsePBH->isChecked()) { ui->editor_Pbh->updateSituation(m_situation); } @@ -120,6 +120,11 @@ namespace BlackGui sGui->getISimulator()->testSendSituationAndParts(ISimulator::getTestCallsign(), m_situation, parts); } + void CModelBrowserComponent::fetchSimulatorValues() + { + if (!this->hasContexts()) { return; } + } + void CModelBrowserComponent::onModelDblClicked(const CVariant &object) { Q_UNUSED(object); @@ -164,6 +169,7 @@ namespace BlackGui ui->le_ModelInfo->setText(model.getModelStringAndDbKey()); ui->le_Info->setText(m_situation.toQString(true)); + sGui->getIContextSimulator()->requestElevationBySituation(m_situation); sGui->getIContextSimulator()->testRemoteAircraft(m_aircraft, true); } diff --git a/src/blackgui/components/modelbrowsercomponent.h b/src/blackgui/components/modelbrowsercomponent.h index 61696b022..f1bd685f2 100644 --- a/src/blackgui/components/modelbrowsercomponent.h +++ b/src/blackgui/components/modelbrowsercomponent.h @@ -54,6 +54,7 @@ namespace BlackGui void selectTabParts(); void onCGChecked(bool checked); void updatePartsAndPBH(bool setPbh, bool setParts); + void fetchSimulatorValues(); QScopedPointer ui; BlackMisc::Aviation::CAircraftSituation m_situation;