From e863d5d3c9d025908293d8be93388e8add159956 Mon Sep 17 00:00:00 2001
From: Kiara Navarro <sophiekovalevsky@fedoraproject.org>
Date: Sun, 29 May 2022 12:43:50 -0500
Subject: [PATCH] app/main/device: move metatypes to device

---
 Software/PC_Application/Device/device.cpp | 8 ++++++++
 Software/PC_Application/Device/device.h   | 2 ++
 Software/PC_Application/appwindow.cpp     | 5 -----
 Software/PC_Application/main.cpp          | 3 +++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Software/PC_Application/Device/device.cpp b/Software/PC_Application/Device/device.cpp
index 837332d..3b8a08e 100644
--- a/Software/PC_Application/Device/device.cpp
+++ b/Software/PC_Application/Device/device.cpp
@@ -234,6 +234,14 @@ Device::~Device()
     }
 }
 
+void Device::RegisterTypes()
+{
+    qRegisterMetaType<Protocol::Datapoint>("Datapoint");
+    qRegisterMetaType<Protocol::ManualStatusV1>("ManualV1");
+    qRegisterMetaType<Protocol::SpectrumAnalyzerResult>("SpectrumAnalyzerResult");
+    qRegisterMetaType<Protocol::AmplitudeCorrectionPoint>("AmplitudeCorrection");
+}
+
 bool Device::SendPacket(const Protocol::PacketInfo& packet, std::function<void(TransmissionResult)> cb, unsigned int timeout)
 {
     Transmission t;
diff --git a/Software/PC_Application/Device/device.h b/Software/PC_Application/Device/device.h
index 02395c1..eaad25c 100644
--- a/Software/PC_Application/Device/device.h
+++ b/Software/PC_Application/Device/device.h
@@ -58,6 +58,8 @@ public:
     // connect to a VNA device. If serial is specified only connecting to this device, otherwise to the first one found
     Device(QString serial = QString());
     ~Device();
+
+    static void RegisterTypes();
     bool SendPacket(const Protocol::PacketInfo& packet, std::function<void(TransmissionResult)> cb = nullptr, unsigned int timeout = 500);
     bool Configure(Protocol::SweepSettings settings, std::function<void(TransmissionResult)> cb = nullptr);
     bool Configure(Protocol::SpectrumAnalyzerSettings settings, std::function<void(TransmissionResult)> cb = nullptr);
diff --git a/Software/PC_Application/appwindow.cpp b/Software/PC_Application/appwindow.cpp
index ca3cf41..2b1e836 100644
--- a/Software/PC_Application/appwindow.cpp
+++ b/Software/PC_Application/appwindow.cpp
@@ -234,11 +234,6 @@ AppWindow::AppWindow(QWidget *parent)
     // Set default mode
     vna->activate();
 
-    qRegisterMetaType<Protocol::Datapoint>("Datapoint");
-    qRegisterMetaType<Protocol::ManualStatusV1>("ManualV1");
-    qRegisterMetaType<Protocol::SpectrumAnalyzerResult>("SpectrumAnalyzerResult");
-    qRegisterMetaType<Protocol::AmplitudeCorrectionPoint>("AmplitudeCorrection");
-
     auto pref = Preferences::getInstance();
     if(pref.Startup.UseSetupFile) {
         LoadSetup(pref.Startup.SetupFile);
diff --git a/Software/PC_Application/main.cpp b/Software/PC_Application/main.cpp
index 2ffbf9d..d1217c6 100644
--- a/Software/PC_Application/main.cpp
+++ b/Software/PC_Application/main.cpp
@@ -1,5 +1,6 @@
 #include "appwindow.h"
 #include <QtWidgets/QApplication>
+#include "Device/device.h"
 #ifdef Q_OS_UNIX
 #include <signal.h>
 #endif
@@ -23,6 +24,8 @@ int main(int argc, char *argv[]) {
     QCoreApplication::setApplicationVersion(window->getAppVersion() + "-" +
                                             window->getAppGitHash().left(9));
 
+    Device::RegisterTypes();
+
 #ifdef Q_OS_UNIX
     signal(SIGINT, tryExitGracefully);
 #endif