From 3ccfa6db29f2eda83a1e4b2ab6d22fd869535bf1 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Fri, 26 Feb 2021 20:32:33 +0000
Subject: [PATCH] APRS updates Don't run windeployqt as redundant. Reduce chart
 margin size to give more area to graphs. Use latest packetmod URI.

---
 plugins/feature/aprs/CMakeLists.txt   | 5 -----
 plugins/feature/aprs/aprsgui.cpp      | 6 ++++++
 plugins/feature/aprs/aprssettings.cpp | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/feature/aprs/CMakeLists.txt b/plugins/feature/aprs/CMakeLists.txt
index 30d66a3ed..65cefdf7c 100644
--- a/plugins/feature/aprs/CMakeLists.txt
+++ b/plugins/feature/aprs/CMakeLists.txt
@@ -60,8 +60,3 @@ target_link_libraries(${TARGET_NAME}
 
 install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
 
-if(WIN32)
-  # Run deployqt for Charts etc
-  include(DeployQt)
-  windeployqt(${TARGET_NAME} ${SDRANGEL_BINARY_BIN_DIR} ${PROJECT_SOURCE_DIR}/aprs)
-endif()
diff --git a/plugins/feature/aprs/aprsgui.cpp b/plugins/feature/aprs/aprsgui.cpp
index bd8c78fc9..e44153bee 100644
--- a/plugins/feature/aprs/aprsgui.cpp
+++ b/plugins/feature/aprs/aprsgui.cpp
@@ -519,18 +519,24 @@ APRSGUI::APRSGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Feature *feat
     ui->weatherChart->setRenderHint(QPainter::Antialiasing);
     m_weatherChart.addAxis(&m_weatherChartXAxis, Qt::AlignBottom);
     m_weatherChart.addAxis(&m_weatherChartYAxis, Qt::AlignLeft);
+    m_weatherChart.layout()->setContentsMargins(0, 0, 0, 0);
+    m_weatherChart.setMargins(QMargins(1, 1, 1, 1));
 
     m_telemetryChart.legend()->hide();
     ui->telemetryChart->setChart(&m_telemetryChart);
     ui->telemetryChart->setRenderHint(QPainter::Antialiasing);
     m_telemetryChart.addAxis(&m_telemetryChartXAxis, Qt::AlignBottom);
     m_telemetryChart.addAxis(&m_telemetryChartYAxis, Qt::AlignLeft);
+    m_telemetryChart.layout()->setContentsMargins(0, 0, 0, 0);
+    m_telemetryChart.setMargins(QMargins(1, 1, 1, 1));
 
     m_motionChart.legend()->hide();
     ui->motionChart->setChart(&m_motionChart);
     ui->motionChart->setRenderHint(QPainter::Antialiasing);
     m_motionChart.addAxis(&m_motionChartXAxis, Qt::AlignBottom);
     m_motionChart.addAxis(&m_motionChartYAxis, Qt::AlignLeft);
+    m_motionChart.layout()->setContentsMargins(0, 0, 0, 0);
+    m_motionChart.setMargins(QMargins(1, 1, 1, 1));
 
     displaySettings();
     applySettings(true);
diff --git a/plugins/feature/aprs/aprssettings.cpp b/plugins/feature/aprs/aprssettings.cpp
index 6219d8613..368beca30 100644
--- a/plugins/feature/aprs/aprssettings.cpp
+++ b/plugins/feature/aprs/aprssettings.cpp
@@ -28,7 +28,7 @@ const QStringList APRSSettings::m_pipeTypes = {
 };
 
 const QStringList APRSSettings::m_pipeURIs = {
-    QStringLiteral("sdrangel.channelrx.packetdemod"),
+    QStringLiteral("sdrangel.channel.packetdemod"),
 };
 
 APRSSettings::APRSSettings()