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

main

Browse Source 
use global ptr to sims instead of global instance
and init the global ptr in main
This commit is contained in:
sani7
2024-08-27 11:10:39 +02:00
parent 981d101052
commit 162018b002
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/main.cpp
+6 -3
View File
@@ -27,7 +27,7 @@ private:
std::function <void(std::string)> log_function; std::function <void(std::string)> log_function;
}; };
Simulators g_simulators; Simulators* g_simulators;
Websocket* g_web_socket; Websocket* g_web_socket;
Spdlog_buffer g_info_buffer([](std::string message) { spdlog::info(message); }); Spdlog_buffer g_info_buffer([](std::string message) { spdlog::info(message); });
Spdlog_buffer g_error_buffer([](std::string message) { spdlog::error(message); }); Spdlog_buffer g_error_buffer([](std::string message) { spdlog::error(message); });
@@ -41,7 +41,7 @@ void int_handler(int s)
g_out << "Caught Ctrl + C" << std::endl; g_out << "Caught Ctrl + C" << std::endl;
if (g_web_socket != nullptr) if (g_web_socket != nullptr)
g_web_socket->stop(); g_web_socket->stop();
g_simulators.stop(); g_simulators->stop();
g_out << "Shutting down." << std::endl; g_out << "Shutting down." << std::endl;
// delay to allow the server to stop gracefully // delay to allow the server to stop gracefully
std::this_thread::sleep_for(std::chrono::milliseconds(1000)); std::this_thread::sleep_for(std::chrono::milliseconds(1000));
@@ -76,7 +76,10 @@ int main(void)
// The server starts in this thread // The server starts in this thread
spdlog::info("Starting server"); spdlog::info("Starting server");
Websocket web_socket(9002, &g_out, &g_err, [](std::string message) { return message_parser(message); }, []() { return g_simulators.changed_UI_items().dump(); }); Simulators simulators;
g_simulators = &simulators;
Websocket web_socket(9002, &g_out, &g_err, [](std::string message) { return message_parser(message); }, []() { return g_simulators->changed_UI_items().dump(); });
g_web_socket = &web_socket; g_web_socket = &web_socket;
// Start the message processor and broadcast processor in separate threads // Start the message processor and broadcast processor in separate threads
tools/message_parser.cpp
+10 -10
View File
@@ -2,7 +2,7 @@
#include <magic_enum.hpp> #include <magic_enum.hpp>
#include <iostream> #include <iostream>
extern Simulators g_simulators; extern Simulators* g_simulators;
std::string message_parser(std::string message) std::string message_parser(std::string message)
{ {
@@ -32,27 +32,27 @@ json command_parser(json command)
case Command::get_UI_element: case Command::get_UI_element:
spdlog::info("Command {}: {}", type, std::string(command["id"])); spdlog::info("Command {}: {}", type, std::string(command["id"]));
j["response"]["type"] = type; j["response"]["type"] = type;
j["response"]["UI_item"] = g_simulators.invoke_active_simulator()->get_UI_item(command["id"])->to_json(); j["response"]["UI_item"] = g_simulators->invoke_active_simulator()->get_UI_item(command["id"])->to_json();
break; break;
case Command::get_UI_elements: case Command::get_UI_elements:
spdlog::info("Command {}", type); spdlog::info("Command {}", type);
j["response"]["type"] = type; j["response"]["type"] = type;
j["response"]["UI_items"] = g_simulators.invoke_active_simulator()->get_UI_items()["UI_items"]; j["response"]["UI_items"] = g_simulators->invoke_active_simulator()->get_UI_items()["UI_items"];
break; break;
case Command::switch_simulator: case Command::switch_simulator:
spdlog::info("Command {} to {}", type, std::string(command["name"])); spdlog::info("Command {} to {}", type, std::string(command["name"]));
g_simulators.switch_simulator(command["name"]); g_simulators->switch_simulator(command["name"]);
j["response"]["type"] = type; j["response"]["type"] = type;
break; break;
case Command::get_active_simulator_name: case Command::get_active_simulator_name:
spdlog::info("Command {}", type); spdlog::info("Command {}", type);
j["response"]["type"] = type; j["response"]["type"] = type;
j["response"]["name"] = g_simulators.active_simulator_name(); j["response"]["name"] = g_simulators->active_simulator_name();
break; break;
case Command::get_simulators: case Command::get_simulators:
spdlog::info("Command {}", type); spdlog::info("Command {}", type);
j["response"]["type"] = type; j["response"]["type"] = type;
j["response"]["simulators"] = g_simulators.list_simulators(); j["response"]["simulators"] = g_simulators->list_simulators();
break; break;
default: default:
break; break;
@@ -70,25 +70,25 @@ void event_handler(json event)
case Event::clicked: case Event::clicked:
{ {
spdlog::info("Event {}: {}", type, std::string(event["id"])); spdlog::info("Event {}: {}", type, std::string(event["id"]));
g_simulators.invoke_active_simulator()->get_UI_item(std::string(event["id"]))->click(); g_simulators->invoke_active_simulator()->get_UI_item(std::string(event["id"]))->click();
break; break;
} }
case Event::value_changed: case Event::value_changed:
{ {
spdlog::info("Event {}: {} {}", type, std::string(event["id"]), (double)(event["value"])); spdlog::info("Event {}: {} {}", type, std::string(event["id"]), (double)(event["value"]));
g_simulators.invoke_active_simulator()->get_UI_item(std::string(event["id"]))->set_value((double)event["value"]); g_simulators->invoke_active_simulator()->get_UI_item(std::string(event["id"]))->set_value((double)event["value"]);
break; break;
} }
case Event::text_changed: case Event::text_changed:
{ {
spdlog::info("Event {}: {} {}", type, std::string(event["id"]), std::string(event["text"])); spdlog::info("Event {}: {} {}", type, std::string(event["id"]), std::string(event["text"]));
g_simulators.invoke_active_simulator()->get_UI_item(std::string(event["id"]))->set_text(std::string(event["text"])); g_simulators->invoke_active_simulator()->get_UI_item(std::string(event["id"]))->set_text(std::string(event["text"]));
break; break;
} }
case Event::selected: case Event::selected:
{ {
spdlog::info("Event {}: {} {}", type, std::string(event["id"]), std::string(event["selected"])); spdlog::info("Event {}: {} {}", type, std::string(event["id"]), std::string(event["selected"]));
g_simulators.invoke_active_simulator()->get_UI_item(std::string(event["id"]))->set_selected(std::string(event["selected"])); g_simulators->invoke_active_simulator()->get_UI_item(std::string(event["id"]))->set_selected(std::string(event["selected"]));
break; break;
} }
default: default: