Comms: Update LogReplayLink Threading

mavlink · Jan 7, 2025 · 112ffe3 · 112ffe3
1 parent 29ca1b0
commit 112ffe3
Show file tree

Hide file tree

Showing 10 changed files with 661 additions and 597 deletions.
diff --git a/src/Comms/CMakeLists.txt b/src/Comms/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_subdirectory(AirLink)
 add_subdirectory(MockLink)
 
-find_package(Qt6 REQUIRED COMPONENTS Core Network Qml Test Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Core Network Qml)
 
 qt_add_library(Comms STATIC
     LinkConfiguration.cc
@@ -12,6 +12,8 @@ qt_add_library(Comms STATIC
     LinkManager.h
     LogReplayLink.cc
     LogReplayLink.h
+    LogReplayLinkController.cc
+    LogReplayLinkController.h
     MAVLinkProtocol.cc
     MAVLinkProtocol.h
     TCPLink.cc
@@ -23,7 +25,6 @@ qt_add_library(Comms STATIC
 target_link_libraries(Comms
     PRIVATE
         Qt6::Qml
-        Qt6::Test
         MockLink
         PositionManager
         QGC

diff --git a/src/Comms/LinkConfiguration.cc b/src/Comms/LinkConfiguration.cc
@@ -82,7 +82,7 @@ LinkConfiguration *LinkConfiguration::createSettings(int type, const QString &na
         break;
 #endif
     case TypeLogReplay:
-        config = new LogReplayLinkConfiguration(name);
+        config = new LogReplayConfiguration(name);
         break;
 #ifdef QT_DEBUG
     case TypeMock:
@@ -124,7 +124,7 @@ LinkConfiguration *LinkConfiguration::duplicateSettings(const LinkConfiguration
         break;
 #endif
     case TypeLogReplay:
-        dupe = new LogReplayLinkConfiguration(qobject_cast<const LogReplayLinkConfiguration*>(source));
+        dupe = new LogReplayConfiguration(qobject_cast<const LogReplayConfiguration*>(source));
         break;
 #ifdef QT_DEBUG
     case TypeMock:

diff --git a/src/Comms/LinkInterface.h b/src/Comms/LinkInterface.h
@@ -31,7 +31,7 @@ class LinkInterface : public QThread
     Q_INVOKABLE virtual void disconnect() = 0; // FIXME: This gets called 3x when closing link
 
     virtual bool isConnected() const = 0;
-    virtual bool isLogReplay() { return false; }
+    virtual bool isLogReplay() const { return false; }
     virtual bool isSecureConnection() { return false; } ///< Returns true if the connection is secure (e.g. USB, wired ethernet)
 
     SharedLinkConfigurationPtr linkConfiguration() { return _config; }

diff --git a/src/Comms/LinkManager.cc b/src/Comms/LinkManager.cc
@@ -9,7 +9,7 @@
 
 #include "LinkManager.h"
 #include "DeviceInfo.h"
-#include "LogReplayLink.h"
+#include "LogReplayLinkController.h"
 #include "MAVLinkProtocol.h"
 #include "MultiVehicleManager.h"
 #include "QGCApplication.h"
@@ -346,7 +346,7 @@ void LinkManager::loadLinkConfigurationList()
                 break;
 #endif
             case LinkConfiguration::TypeLogReplay:
-                link = new LogReplayLinkConfiguration(name);
+                link = new LogReplayConfiguration(name);
                 break;
 #ifdef QT_DEBUG
             case LinkConfiguration::TypeMock:
@@ -705,7 +705,7 @@ void LinkManager::freeMavlinkChannel(uint8_t channel)
 
 LogReplayLink *LinkManager::startLogReplay(const QString &logFile)
 {
-    LogReplayLinkConfiguration* const linkConfig = new LogReplayLinkConfiguration(tr("Log Replay"));
+    LogReplayConfiguration* const linkConfig = new LogReplayConfiguration(tr("Log Replay"));
     linkConfig->setLogFilename(logFile);
     linkConfig->setName(linkConfig->logFilenameShort());