From 734a8dfca2b456a47538e90235987b8ca8cab67b Mon Sep 17 00:00:00 2001 From: Sander Speetjens Date: Thu, 12 Sep 2024 17:04:56 +0200 Subject: [PATCH] Move to Qt Move to QTimer Remove unused submodules --- .gitmodules | 8 +------- external/CMakeLists.txt | 2 -- external/timer | 1 - external/websocketpp | 1 - tools/CMakeLists.txt | 3 +-- tools/simulator_base.cpp | 7 ++++--- tools/simulator_base.hpp | 4 ++-- 7 files changed, 8 insertions(+), 18 deletions(-) delete mode 160000 external/timer delete mode 160000 external/websocketpp diff --git a/.gitmodules b/.gitmodules index 40dd4a0..ce9aa3d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,6 @@ [submodule "external/color"] path = external/color url = git@github.com:Sani7/cpp_color_lib.git -[submodule "external/timer"] - path = external/timer - url = git@github.com:Sani7/cpp_timer.git -[submodule "external/websocketpp"] - path = external/websocketpp - url = git@github.com:Sani7/websocketpp.git [submodule "external/spdlog"] path = external/spdlog - url = git@github.com:gabime/spdlog.git + url = git@github.com:gabime/spdlog.git \ No newline at end of file diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index d198741..e623423 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -1,4 +1,2 @@ add_subdirectory(color) add_subdirectory(spdlog) -add_subdirectory(timer) -add_subdirectory(websocketpp) \ No newline at end of file diff --git a/external/timer b/external/timer deleted file mode 160000 index 693d297..0000000 --- a/external/timer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 693d29797dfea7cd9eb0c44a6bfe2fdf0d2a3ca8 diff --git a/external/websocketpp b/external/websocketpp deleted file mode 160000 index cbe02ed..0000000 --- a/external/websocketpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cbe02ed984a8512cf94f3dcd2b44bc98cbd05845 diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index dc8d0d6..2a43c53 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -40,8 +40,7 @@ target_include_directories(server target_link_libraries(server PRIVATE Qt::WebSockets - UI - Timer magic_enum::magic_enum spdlog + UI ) diff --git a/tools/simulator_base.cpp b/tools/simulator_base.cpp index 1ab7999..294725f 100644 --- a/tools/simulator_base.cpp +++ b/tools/simulator_base.cpp @@ -1,8 +1,9 @@ #include "simulator_base.hpp" Simulator_base::Simulator_base(std::string name, std::chrono::milliseconds interval, QObject* parrent) - : QObject(parrent), m_name(name), m_timer([this] { timer(); }), m_interval(interval) + : QObject(parrent), m_name(name), m_timer(new QTimer(this)), m_interval(interval) { + connect(m_timer, &QTimer::timeout, this, [this]{timer();}); } std::string Simulator_base::name() const @@ -59,14 +60,14 @@ UI_item *Simulator_base::get_UI_item(std::string id) const void Simulator_base::run() { // Start the timer - m_timer.setInterval(m_interval); + m_timer->start(m_interval); run_at_startup(); } void Simulator_base::stop() { // Stop the simulator - m_timer.stop(); + m_timer->stop(); } void Simulator_base::shutdown() diff --git a/tools/simulator_base.hpp b/tools/simulator_base.hpp index 3d37fd2..8190200 100644 --- a/tools/simulator_base.hpp +++ b/tools/simulator_base.hpp @@ -2,7 +2,7 @@ #include "UI.hpp" #include "spdlog/spdlog.h" -#include "timer.hpp" +#include class Simulator_base : public QObject { @@ -89,6 +89,6 @@ class Simulator_base : public QObject std::string m_name; std::vector m_UI_items; std::map m_UI_items_map; - Timer m_timer; + QTimer* m_timer; std::chrono::milliseconds m_interval; };