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

convert selected

Browse Source 
move from string to index to reduce data size
This commit is contained in:
sani7
2026-02-14 14:32:03 +01:00
parent 99d537ac29
commit 7c91a64d71
8 changed files with 54 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/simulator_base.cpp
+4 -4
View File
@@ -326,7 +326,7 @@ void Simulator_base::process_ui_combobox(json &ui_item, QWidget *widget)
return;
}
QString selected = QString::fromStdString(ui_item["selected"]);
size_t selected = ui_item["selected"];
for (json &item : ui_item["options"])
{
@@ -334,9 +334,9 @@ void Simulator_base::process_ui_combobox(json &ui_item, QWidget *widget)
combobox->addItem(QString::fromStdString(item));
}
if (combobox->currentText() != selected)
if (combobox->currentIndex() != selected)
{
combobox->setCurrentText(selected);
combobox->setCurrentIndex(selected);
}
}
@@ -763,7 +763,7 @@ void Simulator_base::setup_combobox(QWidget *item, size_t index)
return;
connect(combobox, &QComboBox::activated, this, [=, this] {
m_web_socket->send_event(Web_socket_wrapper::Event::selected, index, combobox->currentText());
m_web_socket->send_event(Web_socket_wrapper::Event::selected, index, (size_t)combobox->currentIndex());
});
}
client/web_socket_wrapper.cpp
+36 -27
View File
@@ -26,26 +26,23 @@ Web_socket_wrapper::~Web_socket_wrapper()
close();
}
void Web_socket_wrapper::send_command(Command command, size_t id)
void Web_socket_wrapper::send_command(Command c, size_t id)
{
json j;
switch (command)
j["command"]["type"] = magic_enum::enum_name(c).data();
switch (c)
{
case Command::get_UI_element:
j["command"]["type"] = magic_enum::enum_name(command).data();
j["command"]["id"] = id;
m_web_socket->sendTextMessage(QString(j.dump().data()));
break;
case Command::get_UI_elements:
j["command"]["type"] = magic_enum::enum_name(command).data();
m_web_socket->sendTextMessage(QString(j.dump().data()));
break;
case Command::get_active_simulator_name:
j["command"]["type"] = magic_enum::enum_name(command).data();
m_web_socket->sendTextMessage(QString(j.dump().data()));
break;
case Command::get_simulators:
j["command"]["type"] = magic_enum::enum_name(command).data();
m_web_socket->sendTextMessage(QString(j.dump().data()));
break;
default:
@@ -53,14 +50,14 @@ void Web_socket_wrapper::send_command(Command command, size_t id)
}
}
void Web_socket_wrapper::send_command(Command command, QString id)
void Web_socket_wrapper::send_command(Command command, QString val)
{
json j;
j["command"]["type"] = magic_enum::enum_name(command).data();
switch (command)
{
case Command::switch_simulator:
j["command"]["type"] = magic_enum::enum_name(command).data();
j["command"]["name"] = id.toStdString();
j["command"]["name"] = val.toStdString();
m_web_socket->sendTextMessage(QString(j.dump().data()));
break;
default:
@@ -68,16 +65,16 @@ void Web_socket_wrapper::send_command(Command command, QString id)
}
}
void Web_socket_wrapper::send_event(Event event, size_t id)
void Web_socket_wrapper::send_event(Event e, size_t id)
{
if (m_inhibit_events)
return;
json j;
switch (event)
j["event"]["type"] = magic_enum::enum_name(e).data();
switch (e)
{
case Event::clicked:
case Event::can_clear:
j["event"]["type"] = magic_enum::enum_name(event).data();
j["event"]["id"] = id;
m_web_socket->sendTextMessage(QString(j.dump().data()));
break;
@@ -86,15 +83,33 @@ void Web_socket_wrapper::send_event(Event event, size_t id)
}
}
void Web_socket_wrapper::send_event(Event event, size_t id, double val)
void Web_socket_wrapper::send_event(Event e, size_t id, size_t val)
{
if (m_inhibit_events)
return;
json j;
switch (event)
j["event"]["type"] = magic_enum::enum_name(e).data();
switch (e)
{
case Event::selected:
j["event"]["id"] = id;
j["event"]["selected"] = val;
m_web_socket->sendTextMessage(QString(j.dump().data()));
break;
default:
break;
}
}
void Web_socket_wrapper::send_event(Event e, size_t id, double val)
{
if (m_inhibit_events)
return;
json j;
j["event"]["type"] = magic_enum::enum_name(e).data();
switch (e)
{
case Event::value_changed:
j["event"]["type"] = magic_enum::enum_name(event).data();
j["event"]["id"] = id;
j["event"]["value"] = val;
m_web_socket->sendTextMessage(QString(j.dump().data()));
@@ -104,39 +119,33 @@ void Web_socket_wrapper::send_event(Event event, size_t id, double val)
}
}
void Web_socket_wrapper::send_event(Event event, size_t id, QString val)
void Web_socket_wrapper::send_event(Event e, size_t id, QString val)
{
if (m_inhibit_events)
return;
json j;
switch (event)
j["event"]["type"] = magic_enum::enum_name(e).data();
switch (e)
{
case Event::text_changed:
j["event"]["type"] = magic_enum::enum_name(event).data();
j["event"]["id"] = id;
j["event"]["text"] = val.toStdString();
m_web_socket->sendTextMessage(QString(j.dump().data()));
break;
case Event::selected:
j["event"]["type"] = magic_enum::enum_name(event).data();
j["event"]["id"] = id;
j["event"]["selected"] = val.toStdString();
m_web_socket->sendTextMessage(QString(j.dump().data()));
break;
default:
break;
}
}
void Web_socket_wrapper::send_event(Event event, size_t id, uint32_t sid, uint8_t dlc, std::array<uint8_t, 8> payload)
void Web_socket_wrapper::send_event(Event e, size_t id, uint32_t sid, uint8_t dlc, std::array<uint8_t, 8> payload)
{
if (m_inhibit_events)
return;
json j;
switch (event)
j["event"]["type"] = magic_enum::enum_name(e).data();
switch (e)
{
case Event::can_send:
j["event"]["type"] = magic_enum::enum_name(event).data();
j["event"]["id"] = id;
j["event"]["sid"] = sid;
j["event"]["dlc"] = dlc;
client/web_socket_wrapper.hpp
+7 -6
View File
@@ -37,12 +37,13 @@ class Web_socket_wrapper : public QObject
public:
explicit Web_socket_wrapper(const QUrl &url, QObject *parent = nullptr);
~Web_socket_wrapper();
void send_command(Command command, size_t id = 0);
void send_command(Command command, QString id);
void send_event(Event event, size_t id);
void send_event(Event event, size_t id, double val);
void send_event(Event event, size_t id, QString val);
void send_event(Event event, size_t id, uint32_t sid, uint8_t dlc, std::array<uint8_t, 8> payload);
void send_command(Command c, size_t id = 0);
void send_command(Command c, QString val);
void send_event(Event e, size_t id);
void send_event(Event e, size_t id, size_t val);
void send_event(Event e, size_t id, double val);
void send_event(Event e, size_t id, QString val);
void send_event(Event e, size_t id, uint32_t sid, uint8_t dlc, std::array<uint8_t, 8> payload);
void close();
void inhibit_events(bool inhibit);