From 5a702fe0f8007348cbefa3e4c78fa9342f740b42 Mon Sep 17 00:00:00 2001 From: "Ivan I. Ovchinnikov" Date: Mon, 27 Jul 2026 21:29:50 +0300 Subject: [PATCH] style refactor --- include/ConnectionWindow.h | 36 ++++++------- include/LogWindow.h | 2 +- include/PayloadWindow.h | 6 +-- include/SerialApp.h | 24 ++++----- main.cpp | 6 +-- sources/ConnectionWindow.cpp | 98 ++++++++++++++++++------------------ sources/LogWindow.cpp | 6 +-- sources/PayloadWindow.cpp | 24 ++++----- sources/SerialApp.cpp | 36 ++++++------- 9 files changed, 119 insertions(+), 119 deletions(-) diff --git a/include/ConnectionWindow.h b/include/ConnectionWindow.h index 512b93d..7465749 100644 --- a/include/ConnectionWindow.h +++ b/include/ConnectionWindow.h @@ -5,38 +5,38 @@ #include #include -struct SerialPortInfo { - std::string port_name; - std::string description; -}; - class ConnectionWindow { public: ConnectionWindow(); ~ConnectionWindow(); - void Initialize(); - void Render(bool* p_open); + void initialize(); + void render(bool* p_open); - bool IsConnected() const { return is_connected; } - struct sp_port* GetActivePort() const { return active_port; } + bool isConnected() const { return connected; } + struct sp_port* getActivePort() const { return activePort; } - void ForceLogMessage(const std::string& msg); - std::string& GetSharedLog() { return tx_log; } + void forceLogMessage(const std::string& msg); + std::string& getSharedLog() { return txLog; } private: - void RefreshPorts(); + void refreshPorts(); + + struct SerialPortInfo { + std::string portName; + std::string description; + }; std::vector ports; - int selected_port_idx; + int selectedPortIdx; // Новые переменные для выпадающего списка Baud Rate - std::vector baud_rates; - int selected_baud_idx; + std::vector baudRates; + int selectedBaudIdx; - bool is_connected; - struct sp_port* active_port; - std::string tx_log; + bool connected; + struct sp_port* activePort; + std::string txLog; }; #endif // SERIAL_SAMPLE_CONNECTIONWINDOW_H diff --git a/include/LogWindow.h b/include/LogWindow.h index 23a49a9..ee6cef9 100644 --- a/include/LogWindow.h +++ b/include/LogWindow.h @@ -8,7 +8,7 @@ public: LogWindow() = default; ~LogWindow() = default; - void Render(bool* p_open, ConnectionWindow& conn_win); + void render(bool* paramOpen, ConnectionWindow& connectionWindow); }; #endif // SERIAL_SAMPLE_LOGWINDOW_H diff --git a/include/PayloadWindow.h b/include/PayloadWindow.h index 630c4dc..15a2772 100644 --- a/include/PayloadWindow.h +++ b/include/PayloadWindow.h @@ -12,11 +12,11 @@ public: PayloadWindow(); ~PayloadWindow() = default; - void Render(bool* p_open, ConnectionWindow& conn_win); + void render(bool* p_open, ConnectionWindow& connectionWindow); private: - void SendHexPayload(const std::string& hex_str, ConnectionWindow& conn_win); - char hex_input_buffer[256]; + void sendHexPayload(const std::string& hexString, ConnectionWindow& connectionWindow); + char hexInputBuffer[256]; }; #endif // SERIAL_SAMPLE_PAYLOADWINDOW_H diff --git a/include/SerialApp.h b/include/SerialApp.h index 70c9c60..dee72c9 100644 --- a/include/SerialApp.h +++ b/include/SerialApp.h @@ -11,24 +11,24 @@ public: SerialApp(); ~SerialApp() = default; - void Initialize(); - void RenderUI(); + void initialize(); + void renderUI(); - bool ShouldClose() const { return should_close; } + bool isClosing() const { return shouldClose; } private: - void RenderMainMenuBar(); - bool LoadTheme(const std::string& filepath); // Метод парсинга файла темы + void renderMainMenuBar(); + bool loadTheme(const std::string& filepath); // Метод парсинга файла темы - bool show_connection_window = true; - bool show_payload_window = true; - bool show_log_window = true; + bool showConnectionWindow = true; + bool showPayloadWindow = true; + bool showLogWindow = true; - bool should_close; + bool shouldClose; - ConnectionWindow connection_window; - PayloadWindow payload_window; - LogWindow log_window; + ConnectionWindow connectionWindow; + PayloadWindow payloadWindow; + LogWindow logWindow; }; #endif // SERIAL_SAMPLE_SERIALAPP_H diff --git a/main.cpp b/main.cpp index 8d51a24..2a60316 100644 --- a/main.cpp +++ b/main.cpp @@ -39,7 +39,7 @@ int main(int, char**) { // Создаем и инициализируем наше изолированное приложение SerialApp app; - app.Initialize(); + app.initialize(); // Главный цикл приложения while (!glfwWindowShouldClose(window)) { @@ -51,8 +51,8 @@ int main(int, char**) { ImGui::NewFrame(); // Рендерим наше кастомное UI - app.RenderUI(); - if (app.ShouldClose()) { + app.renderUI(); + if (app.isClosing()) { glfwSetWindowShouldClose(window, GLFW_TRUE); } diff --git a/sources/ConnectionWindow.cpp b/sources/ConnectionWindow.cpp index 1f9d8f6..2e31f62 100644 --- a/sources/ConnectionWindow.cpp +++ b/sources/ConnectionWindow.cpp @@ -3,29 +3,29 @@ #include ConnectionWindow::ConnectionWindow() - : selected_port_idx(0), is_connected(false), active_port(nullptr) { + : selectedPortIdx(0), connected(false), activePort(nullptr) { // Заполняем массив стандартными скоростями UART - baud_rates = { 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600 }; + baudRates = { 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600 }; // По умолчанию выбираем 9600 (индекс 0 в векторе) - selected_baud_idx = 0; + selectedBaudIdx = 0; } ConnectionWindow::~ConnectionWindow() { - if (is_connected && active_port) { - sp_close(active_port); - sp_free_port(active_port); + if (connected && activePort) { + sp_close(activePort); + sp_free_port(activePort); } } -void ConnectionWindow::Initialize() { - RefreshPorts(); +void ConnectionWindow::initialize() { + refreshPorts(); } -void ConnectionWindow::RefreshPorts() { +void ConnectionWindow::refreshPorts() { ports.clear(); - selected_port_idx = 0; + selectedPortIdx = 0; struct sp_port** port_list; if (sp_list_ports(&port_list) == SP_OK) { @@ -33,7 +33,7 @@ void ConnectionWindow::RefreshPorts() { struct sp_port* port = port_list[i]; SerialPortInfo info; const char* name = sp_get_port_name(port); - info.port_name = name ? name : "Unknown"; + info.portName = name ? name : "Unknown"; const char* desc = sp_get_port_description(port); info.description = desc ? desc : "No Description"; ports.push_back(info); @@ -46,48 +46,48 @@ void ConnectionWindow::RefreshPorts() { } } -void ConnectionWindow::ForceLogMessage(const std::string& msg) { - tx_log += msg + "\n"; +void ConnectionWindow::forceLogMessage(const std::string& msg) { + txLog += msg + "\n"; } -void ConnectionWindow::Render(bool* p_open) { +void ConnectionWindow::render(bool* p_open) { if (!ImGui::Begin("Connection Settings", p_open)) { ImGui::End(); return; } - if (ImGui::Button("Refresh Ports") && !is_connected) { - RefreshPorts(); + if (ImGui::Button("Refresh Ports") && !connected) { + refreshPorts(); } ImGui::SameLine(); // 1. Выбор COM-порта - std::string combo_preview = ports[selected_port_idx].port_name; - if (ports[selected_port_idx].port_name != "None") { - combo_preview += " (" + ports[selected_port_idx].description + ")"; + std::string combo_preview = ports[selectedPortIdx].portName; + if (ports[selectedPortIdx].portName != "None") { + combo_preview += " (" + ports[selectedPortIdx].description + ")"; } - ImGui::BeginDisabled(is_connected); + ImGui::BeginDisabled(connected); if (ImGui::BeginCombo("Serial Port", combo_preview.c_str())) { for (int n = 0; n < ports.size(); n++) { - const bool is_selected = (selected_port_idx == n); - std::string item_text = ports[n].port_name + " - " + ports[n].description; + const bool is_selected = (selectedPortIdx == n); + std::string item_text = ports[n].portName + " - " + ports[n].description; if (ImGui::Selectable(item_text.c_str(), is_selected)) { - selected_port_idx = n; + selectedPortIdx = n; } } ImGui::EndCombo(); } // 2. Выбор Baud Rate через выпадающий список - std::string baud_preview = std::to_string(baud_rates[selected_baud_idx]); + std::string baud_preview = std::to_string(baudRates[selectedBaudIdx]); if (ImGui::BeginCombo("Baud Rate", baud_preview.c_str())) { - for (int b = 0; b < baud_rates.size(); b++) { - const bool is_selected = (selected_baud_idx == b); - std::string baud_item_text = std::to_string(baud_rates[b]); + for (int b = 0; b < baudRates.size(); b++) { + const bool is_selected = (selectedBaudIdx == b); + std::string baud_item_text = std::to_string(baudRates[b]); if (ImGui::Selectable(baud_item_text.c_str(), is_selected)) { - selected_baud_idx = b; + selectedBaudIdx = b; } } ImGui::EndCombo(); @@ -95,26 +95,26 @@ void ConnectionWindow::Render(bool* p_open) { ImGui::EndDisabled(); // 3. Логика подключения - if (!is_connected) { - ImGui::BeginDisabled(ports[selected_port_idx].port_name == "None"); + if (!connected) { + ImGui::BeginDisabled(ports[selectedPortIdx].portName == "None"); if (ImGui::Button("Connect", ImVec2(120, 0))) { - if (sp_get_port_by_name(ports[selected_port_idx].port_name.c_str(), &active_port) == SP_OK) { - if (sp_open(active_port, SP_MODE_READ_WRITE) == SP_OK) { + if (sp_get_port_by_name(ports[selectedPortIdx].portName.c_str(), &activePort) == SP_OK) { + if (sp_open(activePort, SP_MODE_READ_WRITE) == SP_OK) { // Передаем реальное значение скорости из выбранного индекса массива - int real_baud = baud_rates[selected_baud_idx]; - sp_set_baudrate(active_port, real_baud); + int real_baud = baudRates[selectedBaudIdx]; + sp_set_baudrate(activePort, real_baud); - sp_set_bits(active_port, 8); - sp_set_parity(active_port, SP_PARITY_NONE); - sp_set_stopbits(active_port, 1); + sp_set_bits(activePort, 8); + sp_set_parity(activePort, SP_PARITY_NONE); + sp_set_stopbits(activePort, 1); - is_connected = true; - ForceLogMessage("[SYSTEM] Connected to " + ports[selected_port_idx].port_name + " at " + std::to_string(real_baud) + " baud."); + connected = true; + forceLogMessage("[SYSTEM] Connected to " + ports[selectedPortIdx].portName + " at " + std::to_string(real_baud) + " baud."); } else { - ForceLogMessage("[SYSTEM ERROR] Could not open port " + ports[selected_port_idx].port_name); - sp_free_port(active_port); - active_port = nullptr; + forceLogMessage("[SYSTEM ERROR] Could not open port " + ports[selectedPortIdx].portName); + sp_free_port(activePort); + activePort = nullptr; } } } @@ -122,19 +122,19 @@ void ConnectionWindow::Render(bool* p_open) { } else { ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.8f, 0.1f, 0.1f, 1.0f)); if (ImGui::Button("Disconnect", ImVec2(120, 0))) { - if (active_port) { - sp_close(active_port); - sp_free_port(active_port); - active_port = nullptr; + if (activePort) { + sp_close(activePort); + sp_free_port(activePort); + activePort = nullptr; } - is_connected = false; - ForceLogMessage("[SYSTEM] Disconnected."); + connected = false; + forceLogMessage("[SYSTEM] Disconnected."); } ImGui::PopStyleColor(); } ImGui::SameLine(); - ImGui::Text("Status: %s", is_connected ? "CONNECTED" : "DISCONNECTED"); + ImGui::Text("Status: %s", connected ? "CONNECTED" : "DISCONNECTED"); ImGui::End(); } diff --git a/sources/LogWindow.cpp b/sources/LogWindow.cpp index 1c3083e..cdb45da 100644 --- a/sources/LogWindow.cpp +++ b/sources/LogWindow.cpp @@ -2,13 +2,13 @@ #include "../include/ConnectionWindow.h" #include "imgui.h" -void LogWindow::Render(bool* p_open, ConnectionWindow& conn_win) { - if (!ImGui::Begin("Transaction Log", p_open)) { +void LogWindow::render(bool* paramOpen, ConnectionWindow& connectionWindow) { + if (!ImGui::Begin("Transaction Log", paramOpen)) { ImGui::End(); return; } - std::string& log_ref = conn_win.GetSharedLog(); + std::string& log_ref = connectionWindow.getSharedLog(); ImGui::BeginChild("ScrollingRegion", ImVec2(0, -ImGui::GetFrameHeightWithSpacing()), true, ImGuiWindowFlags_HorizontalScrollbar); ImGui::TextUnformatted(log_ref.c_str()); diff --git a/sources/PayloadWindow.cpp b/sources/PayloadWindow.cpp index 56c50d3..0ee0f22 100644 --- a/sources/PayloadWindow.cpp +++ b/sources/PayloadWindow.cpp @@ -8,15 +8,15 @@ #include PayloadWindow::PayloadWindow() { - std::snprintf(hex_input_buffer, sizeof(hex_input_buffer), "AA BB 01 02 03 FF"); + std::snprintf(hexInputBuffer, sizeof(hexInputBuffer), "AA BB 01 02 03 FF"); } -void PayloadWindow::SendHexPayload(const std::string& hex_str, ConnectionWindow& conn_win) { - struct sp_port* port = conn_win.GetActivePort(); - if (!conn_win.IsConnected() || !port) return; +void PayloadWindow::sendHexPayload(const std::string& hexString, ConnectionWindow& connectionWindow) { + struct sp_port* port = connectionWindow.getActivePort(); + if (!connectionWindow.isConnected() || !port) return; std::vector bytes; - std::stringstream ss(hex_str); + std::stringstream ss(hexString); std::string byte_string; while (ss >> byte_string) { @@ -29,7 +29,7 @@ void PayloadWindow::SendHexPayload(const std::string& hex_str, ConnectionWindow& } if (bytes.empty()) { - conn_win.ForceLogMessage("[ERROR] No valid bytes found to send."); + connectionWindow.forceLogMessage("[ERROR] No valid bytes found to send."); return; } @@ -41,25 +41,25 @@ void PayloadWindow::SendHexPayload(const std::string& hex_str, ConnectionWindow& for (size_t i = 0; i < bytes.size(); ++i) { log_ss << std::uppercase << std::hex << std::setw(2) << std::setfill('0') << (int)bytes[i] << " "; } - conn_win.ForceLogMessage(log_ss.str()); + connectionWindow.forceLogMessage(log_ss.str()); } else { - conn_win.ForceLogMessage("[ERROR] Failed to write data to serial port."); + connectionWindow.forceLogMessage("[ERROR] Failed to write data to serial port."); } } -void PayloadWindow::Render(bool* p_open, ConnectionWindow& conn_win) { +void PayloadWindow::render(bool* p_open, ConnectionWindow& connectionWindow) { if (!ImGui::Begin("Raw Payload Terminal", p_open)) { ImGui::End(); return; } - ImGui::InputText("HEX Bytes", hex_input_buffer, IM_ARRAYSIZE(hex_input_buffer)); + ImGui::InputText("HEX Bytes", hexInputBuffer, IM_ARRAYSIZE(hexInputBuffer)); ImGui::TextDisabled("Example: AA BB 0F 45"); ImGui::Spacing(); - ImGui::BeginDisabled(!conn_win.IsConnected()); + ImGui::BeginDisabled(!connectionWindow.isConnected()); if (ImGui::Button("SEND PACKET", ImVec2(-1, 35))) { - SendHexPayload(hex_input_buffer, conn_win); + sendHexPayload(hexInputBuffer, connectionWindow); } ImGui::EndDisabled(); diff --git a/sources/SerialApp.cpp b/sources/SerialApp.cpp index 43aa81e..a387365 100644 --- a/sources/SerialApp.cpp +++ b/sources/SerialApp.cpp @@ -5,13 +5,13 @@ #include #include -SerialApp::SerialApp() : should_close(false) {} +SerialApp::SerialApp() : shouldClose(false) {} -void SerialApp::Initialize() { - connection_window.Initialize(); +void SerialApp::initialize() { + connectionWindow.initialize(); // Загружаем тему при старте. Если лежит в корне сборки — просто имя файла. - if (!LoadTheme("dracula.theme")) { + if (!loadTheme("dracula.theme")) { // Если файла нет, оставляем стандартную тему ImGui, чтобы приложение не упало ImGui::StyleColorsDark(); } @@ -31,7 +31,7 @@ static ImVec4 HexToImVec4(const std::string& hex_str) { return ImVec4(r / 255.0f, g / 255.0f, b / 255.0f, a / 255.0f); } -bool SerialApp::LoadTheme(const std::string& filepath) { +bool SerialApp::loadTheme(const std::string& filepath) { std::ifstream file(filepath); if (!file.is_open()) { std::cerr << "[THEME ERROR] Файл темы не найден: " << filepath << std::endl; @@ -100,33 +100,33 @@ bool SerialApp::LoadTheme(const std::string& filepath) { return true; } -void SerialApp::RenderUI() { - RenderMainMenuBar(); +void SerialApp::renderUI() { + renderMainMenuBar(); - if (show_connection_window) { - connection_window.Render(&show_connection_window); + if (showConnectionWindow) { + connectionWindow.render(&showConnectionWindow); } - if (show_payload_window) { - payload_window.Render(&show_payload_window, connection_window); + if (showPayloadWindow) { + payloadWindow.render(&showPayloadWindow, connectionWindow); } - if (show_log_window) { - log_window.Render(&show_log_window, connection_window); + if (showLogWindow) { + logWindow.render(&showLogWindow, connectionWindow); } } -void SerialApp::RenderMainMenuBar() { +void SerialApp::renderMainMenuBar() { if (ImGui::BeginMainMenuBar()) { if (ImGui::BeginMenu("File")) { if (ImGui::MenuItem("Exit", "Alt+F4")) { - should_close = true; + shouldClose = true; } ImGui::EndMenu(); } if (ImGui::BeginMenu("Windows")) { - ImGui::MenuItem("1. Connection Settings", nullptr, &show_connection_window); - ImGui::MenuItem("2. Raw Payload Terminal", nullptr, &show_payload_window); - ImGui::MenuItem("3. Transaction Log", nullptr, &show_log_window); + ImGui::MenuItem("1. Connection Settings", nullptr, &showConnectionWindow); + ImGui::MenuItem("2. Raw Payload Terminal", nullptr, &showPayloadWindow); + ImGui::MenuItem("3. Transaction Log", nullptr, &showLogWindow); ImGui::EndMenu(); } ImGui::EndMainMenuBar();