From f4f2ab2dca8cc1032e2eda9575730386d0e633b0 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Fri, 4 Feb 2022 23:38:21 +0000 Subject: [PATCH] ADS-B - Ensure default 3D model --- plugins/channelrx/demodadsb/adsbdemodgui.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.cpp b/plugins/channelrx/demodadsb/adsbdemodgui.cpp index e0a303b80..90abab4f3 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodgui.cpp @@ -1058,6 +1058,18 @@ void ADSBDemodGUI::handleADSB( get3DModel(aircraft); } } + + if (aircraft->m_aircraft3DModel.isEmpty()) + { + // Default to A320 until we get some more info + aircraft->m_aircraftCat3DModel = get3DModel("A320"); + if (m_modelAltitudeOffset.contains("A320")) + { + aircraft->m_modelAltitudeOffset = m_modelAltitudeOffset.value("A320"); + aircraft->m_labelAltitudeOffset = m_labelAltitudeOffset.value("A320"); + } + } + if (m_settings.m_autoResizeTableColumns) ui->adsbData->resizeColumnsToContents(); ui->adsbData->setSortingEnabled(true); @@ -1235,6 +1247,7 @@ void ADSBDemodGUI::handleADSB( if (!aircraftType.isEmpty()) { + aircraft->m_aircraftCat3DModel = ""; if (aircraft->m_aircraftInfo) { aircraft->m_aircraftCat3DModel = get3DModel(aircraftType, aircraft->m_aircraftInfo->m_operatorICAO); }