mirror of
https://github.com/Sani7/remote-ui.git
synced 2026-10-26 21:51:13 +01:00
convert selected
move from string to index to reduce data size
This commit is contained in:
+2
-10
@@ -49,20 +49,12 @@ std::string UI_combobox::selected_text() const
|
||||
void UI_combobox::from_json(const json &j)
|
||||
{
|
||||
UI_x_boxes::from_json(j);
|
||||
std::string selected_str = j.at("selected");
|
||||
for (size_t i = 0; i < m_options.size(); i++)
|
||||
{
|
||||
if (m_options[i] == selected_str)
|
||||
{
|
||||
m_selected = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
m_selected = j.at("selected");
|
||||
}
|
||||
|
||||
json UI_combobox::to_json(size_t id) const
|
||||
{
|
||||
json j = UI_x_boxes::to_json(id);
|
||||
j["selected"] = m_options[m_selected];
|
||||
j["selected"] = m_selected;
|
||||
return j;
|
||||
}
|
||||
|
||||
+2
-2
@@ -14,8 +14,8 @@ class UI_combobox : public UI_x_boxes
|
||||
QObject *parent = nullptr);
|
||||
UI_combobox(const json &j, QObject *parent = nullptr);
|
||||
|
||||
void set_selected(size_t selected);
|
||||
void set_selected(std::string selected) override;
|
||||
void set_selected(size_t selected) override;
|
||||
void set_selected(std::string selected);
|
||||
size_t selected() const;
|
||||
std::string selected_text() const;
|
||||
|
||||
|
||||
+1
-1
@@ -158,7 +158,7 @@ json UI_item::to_json(size_t id) const
|
||||
|
||||
void UI_item::click() {};
|
||||
|
||||
void UI_item::set_selected(std::string selected)
|
||||
void UI_item::set_selected(size_t selected)
|
||||
{
|
||||
UNUSED(selected);
|
||||
};
|
||||
|
||||
+1
-1
@@ -47,7 +47,7 @@ class UI_item : public QObject
|
||||
virtual json to_json(size_t id) const;
|
||||
|
||||
virtual void click();
|
||||
virtual void set_selected(std::string selected);
|
||||
virtual void set_selected(size_t selected);
|
||||
virtual void set_value(double value);
|
||||
virtual void can_send(uint32_t id, uint8_t dlc, std::array<uint8_t, 8> payload);
|
||||
virtual void can_clear();
|
||||
|
||||
Reference in New Issue
Block a user