sani7/remote-ui
1
0
Fork 0
mirror of https://github.com/Sani7/remote-ui.git synced 2026-10-26 21:51:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

sim base

Browse Source 
make PUSH_UI_ITEM define so it can be ported easily from server to client and vice versa
This commit is contained in:
sani7
2026-02-14 14:31:07 +01:00
parent 3c8c1abcbb
commit 82b4dbb161
6 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/simulator_base.hpp
+2
View File
@@ -13,6 +13,8 @@
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
using json = nlohmann::json; using json = nlohmann::json;
#define PUSH_UI_ITEM(item) push_ui_item(ui->item)
class Simulator_base : public QMainWindow class Simulator_base : public QMainWindow
{ {
Q_OBJECT Q_OBJECT
client/simulators/can_debugger.cpp
+1 -1
View File
@@ -6,7 +6,7 @@ Can_Debugger::Can_Debugger(Web_socket_wrapper *web_socket, QWidget *parent)
{ {
ui->setupUi(this); ui->setupUi(this);
this->push_ui_item(ui->can_transceive); this->PUSH_UI_ITEM(can_transceive);
} }
Can_Debugger::~Can_Debugger() Can_Debugger::~Can_Debugger()
client/simulators/test.cpp
+10 -10
View File
@@ -8,16 +8,16 @@ Test_Sim::Test_Sim(Web_socket_wrapper *web_socket, QWidget *parent)
this->setWindowTitle("Test Sim"); this->setWindowTitle("Test Sim");
this->setWindowState(Qt::WindowMaximized); this->setWindowState(Qt::WindowMaximized);
push_ui_item(ui->button); PUSH_UI_ITEM(button);
push_ui_item(ui->combobox); PUSH_UI_ITEM(combobox);
push_ui_item(ui->label); PUSH_UI_ITEM(label);
push_ui_item(ui->slider); PUSH_UI_ITEM(slider);
push_ui_item(ui->dial); PUSH_UI_ITEM(dial);
push_ui_item(ui->thermo); PUSH_UI_ITEM(thermo);
push_ui_item(ui->led); PUSH_UI_ITEM(led);
push_ui_item(ui->checkBox); PUSH_UI_ITEM(checkBox);
push_ui_item(ui->plot); PUSH_UI_ITEM(plot);
push_ui_item(ui->table); PUSH_UI_ITEM(table);
} }
Test_Sim::~Test_Sim() Test_Sim::~Test_Sim()
server/simulator_base.hpp
+2
View File
@@ -5,6 +5,8 @@
#include <QSerialPort> #include <QSerialPort>
#include <QTimer> #include <QTimer>
#define PUSH_UI_ITEM(item) push_ui_item(&item)
class Simulator_base : public QObject class Simulator_base : public QObject
{ {
Q_OBJECT Q_OBJECT
server/simulators/can_debugger.cpp
+1 -1
View File
@@ -4,7 +4,7 @@ Can_Debugger::Can_Debugger(CAN_Wrapper *can_wrapper, QSerialPort *serial, QObjec
: Simulator_base("Can Debugger", can_wrapper, serial, std::chrono::milliseconds(100), parent), : Simulator_base("Can Debugger", can_wrapper, serial, std::chrono::milliseconds(100), parent),
m_wrapper(can_wrapper), m_can_ui(Color::Black, Color::White) m_wrapper(can_wrapper), m_can_ui(Color::Black, Color::White)
{ {
this->push_ui_item(&this->m_can_ui); PUSH_UI_ITEM(m_can_ui);
connect(&m_can_ui, &UI_can::on_send, this, [=, this](QCanBusFrame frame) { m_wrapper->send_can_message(frame); }); connect(&m_can_ui, &UI_can::on_send, this, [=, this](QCanBusFrame frame) { m_wrapper->send_can_message(frame); });
} }
server/simulators/test_sim.cpp
+31 -31
View File
@@ -9,23 +9,23 @@ Test_Sim::Test_Sim(CAN_Wrapper *can_wrapper, QSerialPort *serial, QObject *paren
m_thermo("Thermo", "%", Color::White, Color::Black, 0, 100, 0), m_led("Led", Color::White, Color::Red), m_thermo("Thermo", "%", Color::White, Color::Black, 0, 100, 0), m_led("Led", Color::White, Color::Red),
m_table(4, 4, {"Row 1", "Row 2", "Row 3", "Row 4"}, {"Column 1", "Column 2", "Column 3", "Column 4"}) m_table(4, 4, {"Row 1", "Row 2", "Row 3", "Row 4"}, {"Column 1", "Column 2", "Column 3", "Column 4"})
{ {
this->m_thermo.set_start_color(Color::Red); m_thermo.set_start_color(Color::Red);
this->m_thermo.set_end_color(Color::Red); m_thermo.set_end_color(Color::Red);
this->m_thermo.add_color_stop(0.10, Color::Yellow); m_thermo.add_color_stop(0.10, Color::Yellow);
this->m_thermo.add_color_stop(0.50, Color::Green); m_thermo.add_color_stop(0.50, Color::Green);
this->m_thermo.add_color_stop(0.60, Color::Yellow); m_thermo.add_color_stop(0.60, Color::Yellow);
this->m_thermo.add_color_stop(0.90, Color::Red); m_thermo.add_color_stop(0.90, Color::Red);
this->push_ui_item(&this->m_button); PUSH_UI_ITEM(m_button);
this->push_ui_item(&this->m_combobox); PUSH_UI_ITEM(m_combobox);
this->push_ui_item(&this->m_label); PUSH_UI_ITEM(m_label);
this->push_ui_item(&this->m_slider); PUSH_UI_ITEM(m_slider);
this->push_ui_item(&this->m_dial); PUSH_UI_ITEM(m_dial);
this->push_ui_item(&this->m_thermo); PUSH_UI_ITEM(m_thermo);
this->push_ui_item(&this->m_led); PUSH_UI_ITEM(m_led);
this->push_ui_item(&this->m_checkbox); PUSH_UI_ITEM(m_checkbox);
this->push_ui_item(&this->m_plot); PUSH_UI_ITEM(m_plot);
this->push_ui_item(&this->m_table); PUSH_UI_ITEM(m_table);
for (size_t i = 0; i < m_table.capacity(); i++) for (size_t i = 0; i < m_table.capacity(); i++)
{ {
@@ -39,12 +39,12 @@ Test_Sim::Test_Sim(CAN_Wrapper *can_wrapper, QSerialPort *serial, QObject *paren
void Test_Sim::timer() void Test_Sim::timer()
{ {
this->m_button.click(); m_button.click();
if (this->m_slider.value() == this->m_slider.max()) if (m_slider.value() == m_slider.max())
{ {
this->m_slider.set_value(0); m_slider.set_value(0);
} }
this->m_slider.set_value(this->m_slider.value() + 1); m_slider.set_value(m_slider.value() + 1);
} }
void Test_Sim::run_at_startup() void Test_Sim::run_at_startup()
@@ -55,27 +55,27 @@ void Test_Sim::run_at_startup()
void Test_Sim::button_clicked(UI_button *id) void Test_Sim::button_clicked(UI_button *id)
{ {
if (id == &this->m_button) if (id == &m_button)
{ {
bool state = this->m_button.bg_color() == Color::Red ? true : false; bool state = m_button.bg_color() == Color::Red ? true : false;
this->m_button.set_bg_color(state ? Color::Green : Color::Red); m_button.set_bg_color(state ? Color::Green : Color::Red);
this->m_button.set_text(state ? "On" : "Off"); m_button.set_text(state ? "On" : "Off");
this->m_led.set_bg_color(state ? Color::Green : Color::Red); m_led.set_bg_color(state ? Color::Green : Color::Red);
this->m_checkbox.set_state(state); m_checkbox.set_state(state);
return; return;
} }
} }
void Test_Sim::slider_changed(UI_slider *id, double value) void Test_Sim::slider_changed(UI_slider *id, double value)
{ {
if (id == &this->m_slider) if (id == &m_slider)
{ {
SPDLOG_INFO("Test slider changed to {}", value); SPDLOG_INFO("Test slider changed to {}", value);
this->m_label.set_text(std::to_string(value)); m_label.set_text(std::to_string(value));
this->m_dial.set_value(value); m_dial.set_value(value);
this->m_thermo.set_value(value); m_thermo.set_value(value);
this->m_plot.add_value(value); m_plot.add_value(value);
return; return;
} }
} }