Merge pull request #1280 from srcejon/adsb_weather

ADS-B and Map updates
f4exb · Jun 6, 2022 · dfc166f · dfc166f
2 parents 76ed92c + 50e5f7c
commit dfc166f
Show file tree

Hide file tree

Showing 13 changed files with 786 additions and 210 deletions.
diff --git a/doc/img/ADSBDemod_plugin_displaysettings.png b/doc/img/ADSBDemod_plugin_displaysettings.png
diff --git a/plugins/channelrx/demodadsb/adsbdemoddisplaydialog.cpp b/plugins/channelrx/demodadsb/adsbdemoddisplaydialog.cpp
@@ -35,7 +35,8 @@ ADSBDemodDisplayDialog::ADSBDemodDisplayDialog(ADSBDemodSettings *settings, QWid
     ui->units->setCurrentIndex((int)settings->m_siUnits);
     ui->displayStats->setChecked(settings->m_displayDemodStats);
     ui->autoResizeTableColumns->setChecked(settings->m_autoResizeTableColumns);
-    ui->apiKey->setText(settings->m_apiKey);
+    ui->aviationstackAPIKey->setText(settings->m_aviationstackAPIKey);
+    ui->checkWXAPIKey->setText(settings->m_checkWXAPIKey);
     for (const auto& airspace: settings->m_airspaces)
     {
         QList<QListWidgetItem *> items = ui->airspaces->findItems(airspace, Qt::MatchExactly);
@@ -44,6 +45,7 @@ ADSBDemodDisplayDialog::ADSBDemodDisplayDialog(ADSBDemodSettings *settings, QWid
         }
     }
     ui->airspaceRange->setValue(settings->m_airspaceRange);
+    ui->mapProvider->setCurrentText(settings->m_mapProvider);
     ui->mapType->setCurrentIndex((int)settings->m_mapType);
     ui->navAids->setChecked(settings->m_displayNavAids);
     ui->photos->setChecked(settings->m_displayPhotos);
@@ -65,7 +67,8 @@ void ADSBDemodDisplayDialog::accept()
     m_settings->m_siUnits = ui->units->currentIndex() == 0 ? false : true;
     m_settings->m_displayDemodStats = ui->displayStats->isChecked();
     m_settings->m_autoResizeTableColumns = ui->autoResizeTableColumns->isChecked();
-    m_settings->m_apiKey = ui->apiKey->text();
+    m_settings->m_aviationstackAPIKey = ui->aviationstackAPIKey->text();
+    m_settings->m_checkWXAPIKey = ui->checkWXAPIKey->text();
     m_settings->m_airspaces = QStringList();
     for (int i = 0; i < ui->airspaces->count(); i++)
     {
@@ -75,6 +78,7 @@ void ADSBDemodDisplayDialog::accept()
         }
     }
     m_settings->m_airspaceRange = ui->airspaceRange->value();
+    m_settings->m_mapProvider = ui->mapProvider->currentText();
     m_settings->m_mapType = (ADSBDemodSettings::MapType)ui->mapType->currentIndex();
     m_settings->m_displayNavAids = ui->navAids->isChecked();
     m_settings->m_displayPhotos = ui->photos->isChecked();