From 3c1ec5a128f828cd7ab15921095ab9562154803c Mon Sep 17 00:00:00 2001 From: Sander Speetjens Date: Thu, 20 Mar 2025 16:11:35 +0100 Subject: [PATCH] Change sim names --- client/mainwindow.cpp | 9 +++++---- server/simulators/can_debugger.cpp | 2 +- server/simulators/test_sim.cpp | 17 +++++++---------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp index 9fd5e0f..68b7d93 100644 --- a/client/mainwindow.cpp +++ b/client/mainwindow.cpp @@ -8,10 +8,11 @@ MainWindow::MainWindow(QUrl ws_url, QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow), m_web_socket(new Web_socket_wrapper(ws_url)), - m_error_dialog(new NetworkError(this)), m_sims{{"Can_Debugger", new Can_Debugger(m_web_socket, this)}, - {"Scope_Mux_Tester", new Scope_Mux_Tester(m_web_socket, this)}, - {"CVS_I10", new CVS_I10(m_web_socket, this)}, - {"Test_Sim", new Test_Sim(m_web_socket, this)}} + m_error_dialog(new NetworkError(this)), m_sims{{"Cable Tester", new Cable_Tester(m_web_socket, this)}, + {"Can Debugger", new Can_Debugger(m_web_socket, this)}, + {"Scope Mux Tester", new Scope_Mux_Tester(m_web_socket, this)}, + {"CVS I10", new CVS_I10(m_web_socket, this)}, + {"Test Sim", new Test_Sim(m_web_socket, this)}} { ui->setupUi(this); this->setWindowTitle("Simulator Selector"); diff --git a/server/simulators/can_debugger.cpp b/server/simulators/can_debugger.cpp index 49ca10e..c28894c 100644 --- a/server/simulators/can_debugger.cpp +++ b/server/simulators/can_debugger.cpp @@ -1,7 +1,7 @@ #include "can_debugger.hpp" Can_Debugger::Can_Debugger(CAN_Wrapper *can_wrapper, QObject *parent) - : Simulator_base("Can_Debugger", can_wrapper, std::chrono::milliseconds(100), parent), m_wrapper(can_wrapper), + : Simulator_base("Can Debugger", can_wrapper, std::chrono::milliseconds(100), parent), m_wrapper(can_wrapper), m_can_ui(Color::Black, Color::White) { this->push_ui_item(&this->m_can_ui); diff --git a/server/simulators/test_sim.cpp b/server/simulators/test_sim.cpp index 52f9dc5..d9af221 100644 --- a/server/simulators/test_sim.cpp +++ b/server/simulators/test_sim.cpp @@ -1,15 +1,12 @@ #include "test_sim.hpp" -Test_Sim::Test_Sim(QObject* parent) : -Simulator_base("Test_Sim", std::chrono::milliseconds(1000), parent), -m_button("Off", Color(Color::White), Color(Color::Red)), -m_combobox(Color(Color::White), Color(Color::Black), {"Option 1", "Option 2", "Option 3"}, 0), -m_label("Label", Color(Color::White), Color(Color::Black)), -m_checkbox("Option 1", Color(Color::White), Color(Color::Black)), -m_slider("Slider", Color(Color::White), Color(Color::Black), 0, 100, 0), -m_dial("Dial", Color(Color::White), Color(Color::Black), 0, 100, 0), -m_thermo("Thermo", "%", Color(Color::White), Color(Color::Black), 0, 100, 0), -m_led("Led", Color(Color::White), Color(Color::Black), Color(Color::Red)) +Test_Sim::Test_Sim(CAN_Wrapper *can_wrapper, QObject *parent) + : Simulator_base("Test Sim", can_wrapper, std::chrono::milliseconds(1000), parent), + m_button("Off", Color::White, Color::Red), + m_combobox(Color::White, Color::Black, {"Option 1", "Option 2", "Option 3"}, 0), + m_label("Label", Color::White, Color::Black), m_checkbox("Option 1", Color::Default, Color::Default), + m_slider("Slider", Color::White, Color::Black, 0, 100, 0), m_dial("Dial", Color::White, Color::Black, 0, 100, 0), + m_thermo("Thermo", "%", Color::White, Color::Black, 0, 100, 0), m_led("Led", Color::White, Color::Red) { this->m_thermo.set_start_color(Color::Red); this->m_thermo.set_end_color(Color::Red);