From 53a70aefa5a4c43c0a65256c4242d6b8eaa1c259 Mon Sep 17 00:00:00 2001 From: Pcornat Date: Mon, 16 Mar 2026 16:23:26 +0100 Subject: [PATCH] Updating hab labels --- app_win_2_back.cpp | 43 +++++++++++++++++++++++++++++++++---------- app_win_2_back.hpp | 17 +++++++++++------ 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/app_win_2_back.cpp b/app_win_2_back.cpp index 0ad2952..ef6bf75 100644 --- a/app_win_2_back.cpp +++ b/app_win_2_back.cpp @@ -50,6 +50,8 @@ namespace gui_to_app { if (!app.insert_obj(obj)) { on_stack = true; switch_->set_active(false); + } else { + app.update_hab_labels(); } } else { if (!app.erase_obj(obj)) { @@ -59,6 +61,8 @@ namespace gui_to_app { "Erasing object {} was not successful", character::BillyObjects::billy_object_to_string(obj).data() ); + } else { + app.update_hab_labels(); } } } @@ -165,10 +169,10 @@ namespace gui_to_app { return; } debug_button = app_builder->get_widget("debug_button"); - hab_base = app_builder->get_widget("habilete_label_base"); - hab_carac = app_builder->get_widget("habilete_label_carac"); - hab_mat = app_builder->get_widget("habilete_label_materiel"); - hab_total = app_builder->get_widget("habilete_label_total"); + hab_labels.base = app_builder->get_widget("habilete_label_base"); + hab_labels.carac = app_builder->get_widget("habilete_label_carac"); + hab_labels.mat = app_builder->get_widget("habilete_label_materiel"); + hab_labels.total = app_builder->get_widget("habilete_label_total"); debug_button->signal_clicked().connect(sigc::mem_fun(*this, &AppWin2Back::debug_button_clicked), false); } @@ -182,17 +186,36 @@ namespace gui_to_app { quit(); } - bool AppWin2Back::switch_signal_handler(const bool flag, const character::billyEnums &obj) noexcept { - return flag ? gestionnaire.insert_object(sheet, obj) : !gestionnaire.erase_object(sheet, obj); + void AppWin2Back::debug_button_clicked() const noexcept { + const json j{ { "character_sheet", sheet } }; + spdlog::info("Character sheet in json: \n{}", j.dump(4, ' ', true)); } - void AppWin2Back::debug_button_clicked() const noexcept { - spdlog::info("Display objects"); - for (const auto &obj: sheet.get_objects() | views::values) { - spdlog::info("Object: {}", obj->to_string()); + static void convert_to_label(std::array &convert, + const char *err_msg, + const uint32_t data, + Gtk::Label *const __restrict label) noexcept { + if (const auto [ptr, ec] = std::to_chars(convert.data(), convert.data() + convert.size(), data); + ec != std::errc()) { + spdlog::error("An error occurred while converting {} value: {}", + err_msg, + std::make_error_code(ec).message()); + } else { + const Glib::ustring converted{ + convert.data(), static_cast(ptr - convert.data()) + }; + label->set_label(converted); } } + void AppWin2Back::update_hab_labels() const noexcept { + std::array convert{}; + convert_to_label(convert, "base hab", sheet.get_habilete().get_base(), hab_labels.base); + convert_to_label(convert, "carac hab", sheet.get_habilete().get_carac(), hab_labels.carac); + convert_to_label(convert, "materiel hab", sheet.get_habilete().get_materiel(), hab_labels.mat); + convert_to_label(convert, "total hab", sheet.get_habilete().get_total(), hab_labels.total); + } + bool AppWin2Back::insert_obj(const character::billyEnums &obj) noexcept { return gestionnaire.insert_object(sheet, obj); } diff --git a/app_win_2_back.hpp b/app_win_2_back.hpp index b0f30d5..249d9bb 100644 --- a/app_win_2_back.hpp +++ b/app_win_2_back.hpp @@ -21,6 +21,14 @@ namespace Gtk { } namespace gui_to_app { + template + struct CaracInterface { + T *base{ nullptr }; + T *carac{ nullptr }; + T *mat{ nullptr }; + T *total{ nullptr }; + }; + class AppWin2Back final : public Gtk::Application { public: ~AppWin2Back() noexcept final = default; @@ -58,10 +66,10 @@ namespace gui_to_app { void on_quit() noexcept; - bool switch_signal_handler(bool flag, const character::billyEnums &obj) noexcept; - void debug_button_clicked() const noexcept; + void update_hab_labels() const noexcept; + bool insert_obj(const character::billyEnums &obj) noexcept; bool erase_obj(const character::billyEnums &obj) noexcept; @@ -83,10 +91,7 @@ namespace gui_to_app { selection_button *rock_kit_switch{ nullptr }; selection_button *sack_switch{ nullptr }; - Gtk::Label *hab_base{ nullptr }; - Gtk::Label *hab_carac{ nullptr }; - Gtk::Label *hab_mat{ nullptr }; - Gtk::Label *hab_total{ nullptr }; + CaracInterface hab_labels; Gtk::Button *debug_button{ nullptr };