diff --git a/client/simulator_base.cpp b/client/simulator_base.cpp index f19f397..46d2147 100644 --- a/client/simulator_base.cpp +++ b/client/simulator_base.cpp @@ -239,7 +239,7 @@ void Simulator_base::process_ui_label(json &ui_item, QWidget *widget) void Simulator_base::process_ui_slider(json &ui_item, QWidget *widget) { - QLabel *label = id_to_label(ui_item.at("id")); + QLabel *label = id_to_label(id_to_ui(ui_item.at("id"))); auto slider = qobject_cast(widget); if (slider == nullptr) @@ -278,7 +278,7 @@ void Simulator_base::process_ui_slider(json &ui_item, QWidget *widget) void Simulator_base::process_ui_dial(json &ui_item, QWidget *widget) { - QLabel *label = id_to_label(ui_item.at("id")); + QLabel *label = id_to_label(id_to_ui(ui_item.at("id"))); auto dial = qobject_cast(widget); if (dial == nullptr) @@ -310,7 +310,7 @@ void Simulator_base::process_ui_dial(json &ui_item, QWidget *widget) void Simulator_base::process_ui_thermo(json &ui_item, QWidget *widget) { - QLabel *label = id_to_label(ui_item.at("id")); + QLabel *label = id_to_label(id_to_ui(ui_item.at("id"))); auto thermo = qobject_cast(widget); if (thermo == nullptr) diff --git a/client/simulator_base.hpp b/client/simulator_base.hpp index 368ceb5..f34ac0f 100644 --- a/client/simulator_base.hpp +++ b/client/simulator_base.hpp @@ -26,8 +26,9 @@ class Simulator_base : public QMainWindow void sim_update(void); QString name() const; QWidget *id_to_ui(size_t id); - virtual QLabel *id_to_label(size_t name) + virtual QLabel *id_to_label(QWidget *widget) { + Q_UNUSED(widget); return nullptr; } diff --git a/client/simulators/test.cpp b/client/simulators/test.cpp index dbafb55..e2c185d 100644 --- a/client/simulators/test.cpp +++ b/client/simulators/test.cpp @@ -31,9 +31,8 @@ Test_Sim::~Test_Sim() delete ui; } -QLabel *Test_Sim::id_to_label(size_t id) +QLabel *Test_Sim::id_to_label(QWidget *widget) { - QWidget *widget = id_to_ui(id); if (widget == ui->slider) return ui->slider_label; if (widget == ui->thermo) diff --git a/client/simulators/test.hpp b/client/simulators/test.hpp index 5d3d6cb..40ebbb4 100644 --- a/client/simulators/test.hpp +++ b/client/simulators/test.hpp @@ -16,7 +16,7 @@ class Test_Sim : public Simulator_base explicit Test_Sim(Web_socket_wrapper *web_socket = nullptr, QWidget *parent = nullptr); ~Test_Sim(); - QLabel *id_to_label(size_t name) override; + QLabel *id_to_label(QWidget *widget) override; private: Ui::Test_Sim *ui;