mirror of
https://github.com/Sani7/remote-ui.git
synced 2026-10-26 21:51:13 +01:00
Lint
This commit is contained in:
@@ -1,19 +1,18 @@
|
||||
#include "UI_button.hpp"
|
||||
|
||||
UI_button::UI_button(std::string id, std::string text, Color fg_color, Color bg_color, std::function<void(std::string)> on_click)
|
||||
UI_button::UI_button(std::string id, std::string text, Color fg_color, Color bg_color,
|
||||
std::function<void(std::string)> on_click)
|
||||
: UI_item(id, UI_BUTTON_TYPE, text, 12, fg_color, bg_color)
|
||||
{
|
||||
this->m_on_click = on_click;
|
||||
}
|
||||
|
||||
UI_button::UI_button(const json& j)
|
||||
: UI_item(UI_BUTTON_TYPE),
|
||||
m_on_click(nullptr)
|
||||
UI_button::UI_button(const json &j) : UI_item(UI_BUTTON_TYPE), m_on_click(nullptr)
|
||||
{
|
||||
from_json(j);
|
||||
}
|
||||
|
||||
void UI_button::from_json(const json& j)
|
||||
void UI_button::from_json(const json &j)
|
||||
{
|
||||
UI_item::from_json(j);
|
||||
}
|
||||
|
||||
@@ -7,13 +7,15 @@
|
||||
class UI_button : public UI_item
|
||||
{
|
||||
public:
|
||||
UI_button(std::string id, std::string text, Color fg_color, Color bg_color, std::function<void(std::string)> on_click = nullptr);
|
||||
UI_button(const json& j);
|
||||
UI_button(std::string id, std::string text, Color fg_color, Color bg_color,
|
||||
std::function<void(std::string)> on_click = nullptr);
|
||||
UI_button(const json &j);
|
||||
|
||||
void from_json(const json& j) override;
|
||||
void from_json(const json &j) override;
|
||||
json to_json() const override;
|
||||
|
||||
void click() const override;
|
||||
|
||||
private:
|
||||
std::function<void(std::string)> m_on_click = nullptr;
|
||||
};
|
||||
@@ -1,11 +1,12 @@
|
||||
#include "UI_checkbox.hpp"
|
||||
|
||||
UI_checkbox::UI_checkbox()
|
||||
: UI_x_boxes(UI_CHECKBOX_TYPE), m_selected(), m_on_change(nullptr)
|
||||
UI_checkbox::UI_checkbox() : UI_x_boxes(UI_CHECKBOX_TYPE), m_selected(), m_on_change(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
UI_checkbox::UI_checkbox(std::string id, std::string text, Color fg_color, Color bg_color, std::vector<std::string> options, std::function<void(std::string, std::vector<std::string>)> on_change)
|
||||
UI_checkbox::UI_checkbox(std::string id, std::string text, Color fg_color, Color bg_color,
|
||||
std::vector<std::string> options,
|
||||
std::function<void(std::string, std::vector<std::string>)> on_change)
|
||||
: UI_x_boxes(id, UI_CHECKBOX_TYPE, text, fg_color, bg_color, options), m_selected(), m_on_change(on_change)
|
||||
{
|
||||
for (size_t i = 0; i < m_options.size(); i++)
|
||||
@@ -14,8 +15,7 @@ UI_checkbox::UI_checkbox(std::string id, std::string text, Color fg_color, Color
|
||||
}
|
||||
}
|
||||
|
||||
UI_checkbox::UI_checkbox(const json& j) :
|
||||
UI_x_boxes(UI_CHECKBOX_TYPE), m_selected(), m_on_change(nullptr)
|
||||
UI_checkbox::UI_checkbox(const json &j) : UI_x_boxes(UI_CHECKBOX_TYPE), m_selected(), m_on_change(nullptr)
|
||||
{
|
||||
from_json(j);
|
||||
}
|
||||
@@ -61,7 +61,7 @@ std::vector<std::string> UI_checkbox::selected_text() const
|
||||
return selected_text;
|
||||
}
|
||||
|
||||
void UI_checkbox::from_json(const json& j)
|
||||
void UI_checkbox::from_json(const json &j)
|
||||
{
|
||||
UI_x_boxes::from_json(j);
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
#include <cstdint>
|
||||
#include "UI_item.hpp"
|
||||
#include "UI_x_boxes.hpp"
|
||||
#include <cstdint>
|
||||
|
||||
#define UI_CHECKBOX_TYPE std::string("UI_checkbox")
|
||||
|
||||
@@ -9,16 +9,18 @@ class UI_checkbox : public UI_x_boxes
|
||||
{
|
||||
public:
|
||||
UI_checkbox();
|
||||
UI_checkbox(std::string id, std::string text, Color fg_color, Color bg_color, std::vector<std::string> options, std::function<void(std::string, std::vector<std::string>)> on_change = nullptr);
|
||||
UI_checkbox(const json& j);
|
||||
UI_checkbox(std::string id, std::string text, Color fg_color, Color bg_color, std::vector<std::string> options,
|
||||
std::function<void(std::string, std::vector<std::string>)> on_change = nullptr);
|
||||
UI_checkbox(const json &j);
|
||||
|
||||
void toggle_selected(size_t selected);
|
||||
void toggle_selected(std::string selected);
|
||||
std::vector<bool> selected() const;
|
||||
std::vector<std::string> selected_text() const;
|
||||
|
||||
void from_json(const json& j) override;
|
||||
void from_json(const json &j) override;
|
||||
json to_json() const override;
|
||||
|
||||
private:
|
||||
std::vector<bool> m_selected;
|
||||
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
#include "UI_combobox.hpp"
|
||||
|
||||
UI_combobox::UI_combobox()
|
||||
: UI_x_boxes(UI_COMBOBOX_TYPE)
|
||||
UI_combobox::UI_combobox() : UI_x_boxes(UI_COMBOBOX_TYPE)
|
||||
{
|
||||
}
|
||||
|
||||
UI_combobox::UI_combobox(std::string id, std::string text, Color fg_color, Color bg_color, std::vector<std::string> options, size_t selected, std::function<void(std::string, std::string)> on_change)
|
||||
UI_combobox::UI_combobox(std::string id, std::string text, Color fg_color, Color bg_color,
|
||||
std::vector<std::string> options, size_t selected,
|
||||
std::function<void(std::string, std::string)> on_change)
|
||||
: UI_x_boxes(id, UI_COMBOBOX_TYPE, text, fg_color, bg_color, options), m_selected(selected), m_on_change(on_change)
|
||||
{
|
||||
}
|
||||
|
||||
UI_combobox::UI_combobox(const json& j)
|
||||
: UI_x_boxes(UI_COMBOBOX_TYPE), m_on_change(nullptr)
|
||||
UI_combobox::UI_combobox(const json &j) : UI_x_boxes(UI_COMBOBOX_TYPE), m_on_change(nullptr)
|
||||
{
|
||||
from_json(j);
|
||||
}
|
||||
@@ -49,7 +49,7 @@ std::string UI_combobox::selected_text() const
|
||||
return m_options[m_selected];
|
||||
}
|
||||
|
||||
void UI_combobox::from_json(const json& j)
|
||||
void UI_combobox::from_json(const json &j)
|
||||
{
|
||||
UI_x_boxes::from_json(j);
|
||||
std::string selected_str = j.at("selected");
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <functional>
|
||||
#include "UI_item.hpp"
|
||||
#include "UI_x_boxes.hpp"
|
||||
#include <functional>
|
||||
|
||||
#define UI_COMBOBOX_TYPE std::string("UI_combobox")
|
||||
|
||||
@@ -10,16 +10,18 @@ class UI_combobox : public UI_x_boxes
|
||||
{
|
||||
public:
|
||||
UI_combobox();
|
||||
UI_combobox(std::string id, std::string text, Color fg_color, Color bg_color, std::vector<std::string> options, size_t selected = 0, std::function<void(std::string, std::string)> on_change = nullptr);
|
||||
UI_combobox(const json& j);
|
||||
UI_combobox(std::string id, std::string text, Color fg_color, Color bg_color, std::vector<std::string> options,
|
||||
size_t selected = 0, std::function<void(std::string, std::string)> on_change = nullptr);
|
||||
UI_combobox(const json &j);
|
||||
|
||||
void set_selected(size_t selected);
|
||||
void set_selected(std::string selected) override;
|
||||
size_t selected() const;
|
||||
std::string selected_text() const;
|
||||
|
||||
void from_json(const json& j) override;
|
||||
void from_json(const json &j) override;
|
||||
json to_json() const override;
|
||||
|
||||
private:
|
||||
size_t m_selected;
|
||||
|
||||
|
||||
+2
-3
@@ -5,8 +5,7 @@ UI_dial::UI_dial(std::string id, std::string text, Color fg_color, Color bg_colo
|
||||
{
|
||||
}
|
||||
|
||||
UI_dial::UI_dial(const json& j)
|
||||
: UI_item(UI_DIAL_TYPE)
|
||||
UI_dial::UI_dial(const json &j) : UI_item(UI_DIAL_TYPE)
|
||||
{
|
||||
from_json(j);
|
||||
}
|
||||
@@ -36,7 +35,7 @@ double UI_dial::max() const
|
||||
return m_max;
|
||||
}
|
||||
|
||||
void UI_dial::from_json(const json& j)
|
||||
void UI_dial::from_json(const json &j)
|
||||
{
|
||||
UI_item::from_json(j);
|
||||
|
||||
|
||||
+3
-2
@@ -7,7 +7,7 @@ class UI_dial : public UI_item
|
||||
{
|
||||
public:
|
||||
UI_dial(std::string id, std::string text, Color fg_color, Color bg_color, double min, double max, double value);
|
||||
UI_dial(const json& j);
|
||||
UI_dial(const json &j);
|
||||
|
||||
void set_value(double value) override;
|
||||
double value() const;
|
||||
@@ -15,8 +15,9 @@ class UI_dial : public UI_item
|
||||
double min() const;
|
||||
double max() const;
|
||||
|
||||
void from_json(const json& j) override;
|
||||
void from_json(const json &j) override;
|
||||
json to_json() const override;
|
||||
|
||||
private:
|
||||
double m_min;
|
||||
double m_max;
|
||||
|
||||
+6
-4
@@ -1,16 +1,18 @@
|
||||
#include "UI_item.hpp"
|
||||
|
||||
UI_item::UI_item(std::string id, std::string type, std::string text, uint8_t text_size, Color fg_color, Color bg_color)
|
||||
: m_id(id), m_type(type), m_text(text), m_text_size(text_size), m_fg_color(fg_color), m_bg_color(bg_color), enabled(true), visible(true)
|
||||
: m_id(id), m_type(type), m_text(text), m_text_size(text_size), m_fg_color(fg_color), m_bg_color(bg_color),
|
||||
enabled(true), visible(true)
|
||||
{
|
||||
}
|
||||
|
||||
UI_item::UI_item(std::string type)
|
||||
: m_id(""), m_type(type), m_text(""), m_text_size(12), m_fg_color(Color::Black), m_bg_color(Color::White), enabled(true), visible(true)
|
||||
: m_id(""), m_type(type), m_text(""), m_text_size(12), m_fg_color(Color::Black), m_bg_color(Color::White),
|
||||
enabled(true), visible(true)
|
||||
{
|
||||
}
|
||||
|
||||
UI_item::UI_item(const json& j)
|
||||
UI_item::UI_item(const json &j)
|
||||
{
|
||||
from_json(j);
|
||||
}
|
||||
@@ -106,7 +108,7 @@ bool UI_item::is_visible() const
|
||||
return visible;
|
||||
}
|
||||
|
||||
void UI_item::from_json(const json& j)
|
||||
void UI_item::from_json(const json &j)
|
||||
{
|
||||
if (!is_type(j))
|
||||
return;
|
||||
|
||||
+15
-8
@@ -1,19 +1,20 @@
|
||||
#pragma once
|
||||
#include <functional>
|
||||
#include <thread>
|
||||
#include "color.hpp"
|
||||
#include <cstdint>
|
||||
#include <functional>
|
||||
#include <nlohmann/json.hpp>
|
||||
#include <string>
|
||||
#include "color.hpp"
|
||||
#include <thread>
|
||||
using json = nlohmann::json;
|
||||
|
||||
#define UNUSED(x) (void)(x)
|
||||
|
||||
class UI_item {
|
||||
class UI_item
|
||||
{
|
||||
public:
|
||||
UI_item(std::string type);
|
||||
UI_item(std::string id, std::string type, std::string text, uint8_t text_size, Color fg_color, Color bg_color);
|
||||
UI_item(const json& j);
|
||||
UI_item(const json &j);
|
||||
|
||||
std::string id() const;
|
||||
std::string type() const;
|
||||
@@ -37,13 +38,19 @@ class UI_item {
|
||||
void set_visible(bool visible);
|
||||
bool is_visible() const;
|
||||
|
||||
virtual void from_json(const json& j);
|
||||
virtual void from_json(const json &j);
|
||||
|
||||
virtual json to_json() const;
|
||||
|
||||
virtual void click() const {};
|
||||
virtual void set_selected(std::string selected) {UNUSED(selected);};
|
||||
virtual void set_value(double value) {UNUSED(value);};
|
||||
virtual void set_selected(std::string selected)
|
||||
{
|
||||
UNUSED(selected);
|
||||
};
|
||||
virtual void set_value(double value)
|
||||
{
|
||||
UNUSED(value);
|
||||
};
|
||||
|
||||
protected:
|
||||
std::string m_id;
|
||||
|
||||
+2
-3
@@ -5,13 +5,12 @@ UI_label::UI_label(std::string id, std::string text, Color fg_color, Color bg_co
|
||||
{
|
||||
}
|
||||
|
||||
UI_label::UI_label(const json& j)
|
||||
: UI_item(UI_LABEL_TYPE)
|
||||
UI_label::UI_label(const json &j) : UI_item(UI_LABEL_TYPE)
|
||||
{
|
||||
from_json(j);
|
||||
}
|
||||
|
||||
void UI_label::from_json(const json& j)
|
||||
void UI_label::from_json(const json &j)
|
||||
{
|
||||
UI_item::from_json(j);
|
||||
}
|
||||
|
||||
+4
-4
@@ -1,15 +1,15 @@
|
||||
#pragma once
|
||||
#include <string>
|
||||
#include "UI_item.hpp"
|
||||
#include <string>
|
||||
|
||||
#define UI_LABEL_TYPE std::string("UI_label")
|
||||
|
||||
class UI_label : public UI_item
|
||||
{
|
||||
public:
|
||||
public:
|
||||
UI_label(std::string id, std::string text, Color fg_color, Color bg_color);
|
||||
UI_label(const json& j);
|
||||
UI_label(const json &j);
|
||||
|
||||
void from_json(const json& j) override;
|
||||
void from_json(const json &j) override;
|
||||
json to_json() const override;
|
||||
};
|
||||
+4
-7
@@ -1,14 +1,11 @@
|
||||
#include "UI_led.hpp"
|
||||
|
||||
UI_led::UI_led(std::string id, std::string text, Color fg_color, Color bg_color, Color led_color) :
|
||||
UI_item(id, UI_LED_TYPE, text, 12, fg_color, bg_color),
|
||||
m_led_color(led_color)
|
||||
UI_led::UI_led(std::string id, std::string text, Color fg_color, Color bg_color, Color led_color)
|
||||
: UI_item(id, UI_LED_TYPE, text, 12, fg_color, bg_color), m_led_color(led_color)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
UI_led::UI_led(const json& j) :
|
||||
UI_item(UI_LED_TYPE)
|
||||
UI_led::UI_led(const json &j) : UI_item(UI_LED_TYPE)
|
||||
{
|
||||
from_json(j);
|
||||
}
|
||||
@@ -23,7 +20,7 @@ void UI_led::set_led_color(Color led_color)
|
||||
m_led_color = led_color;
|
||||
}
|
||||
|
||||
void UI_led::from_json(const json& j)
|
||||
void UI_led::from_json(const json &j)
|
||||
{
|
||||
UI_item::from_json(j);
|
||||
std::string color;
|
||||
|
||||
+6
-5
@@ -1,20 +1,21 @@
|
||||
#pragma once
|
||||
#include <string>
|
||||
#include "UI_item.hpp"
|
||||
#include <string>
|
||||
|
||||
#define UI_LED_TYPE std::string("UI_led")
|
||||
|
||||
class UI_led : public UI_item
|
||||
{
|
||||
public:
|
||||
public:
|
||||
UI_led(std::string id, std::string text, Color fg_color, Color bg_color, Color led_color);
|
||||
UI_led(const json& j);
|
||||
UI_led(const json &j);
|
||||
|
||||
Color led_color() const;
|
||||
void set_led_color(Color led_color);
|
||||
|
||||
void from_json(const json& j) override;
|
||||
void from_json(const json &j) override;
|
||||
json to_json() const override;
|
||||
private:
|
||||
|
||||
private:
|
||||
Color m_led_color;
|
||||
};
|
||||
@@ -1,14 +1,13 @@
|
||||
#include "UI_slider.hpp"
|
||||
|
||||
UI_slider::UI_slider(std::string id, std::string text, Color fg_color, Color bg_color, double min, double max, double value, std::function<void(std::string, double)> on_change)
|
||||
UI_slider::UI_slider(std::string id, std::string text, Color fg_color, Color bg_color, double min, double max,
|
||||
double value, std::function<void(std::string, double)> on_change)
|
||||
: UI_item(id, UI_SLIDER_TYPE, text, 12, fg_color, bg_color), m_min(min), m_max(max), m_value(value)
|
||||
{
|
||||
this->m_on_change = on_change;
|
||||
}
|
||||
|
||||
UI_slider::UI_slider(const json& j)
|
||||
: UI_item(UI_SLIDER_TYPE),
|
||||
m_on_change(nullptr)
|
||||
UI_slider::UI_slider(const json &j) : UI_item(UI_SLIDER_TYPE), m_on_change(nullptr)
|
||||
{
|
||||
from_json(j);
|
||||
}
|
||||
@@ -42,7 +41,7 @@ double UI_slider::max() const
|
||||
return m_max;
|
||||
}
|
||||
|
||||
void UI_slider::from_json(const json& j)
|
||||
void UI_slider::from_json(const json &j)
|
||||
{
|
||||
UI_item::from_json(j);
|
||||
|
||||
|
||||
@@ -6,8 +6,9 @@
|
||||
class UI_slider : public UI_item
|
||||
{
|
||||
public:
|
||||
UI_slider(std::string id, std::string text, Color fg_color, Color bg_color, double min, double max, double value, std::function<void(std::string, double)> on_change = nullptr);
|
||||
UI_slider(const json& j);
|
||||
UI_slider(std::string id, std::string text, Color fg_color, Color bg_color, double min, double max, double value,
|
||||
std::function<void(std::string, double)> on_change = nullptr);
|
||||
UI_slider(const json &j);
|
||||
|
||||
void set_value(double value) override;
|
||||
double value() const;
|
||||
@@ -15,8 +16,9 @@ class UI_slider : public UI_item
|
||||
double min() const;
|
||||
double max() const;
|
||||
|
||||
void from_json(const json& j) override;
|
||||
void from_json(const json &j) override;
|
||||
json to_json() const override;
|
||||
|
||||
private:
|
||||
double m_min;
|
||||
double m_max;
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
#include "UI_textbox.hpp"
|
||||
|
||||
UI_textbox::UI_textbox(std::string id, std::string hint, Color fg_color, Color bg_color, std::function<void(std::string, std::string)> on_change)
|
||||
UI_textbox::UI_textbox(std::string id, std::string hint, Color fg_color, Color bg_color,
|
||||
std::function<void(std::string, std::string)> on_change)
|
||||
: UI_item(id, UI_TEXTBOX_TYPE, "", 0, fg_color, bg_color), m_hint(hint), m_on_change(on_change)
|
||||
{
|
||||
}
|
||||
|
||||
UI_textbox::UI_textbox(const json& j)
|
||||
: UI_item(UI_TEXTBOX_TYPE),
|
||||
m_on_change(nullptr)
|
||||
UI_textbox::UI_textbox(const json &j) : UI_item(UI_TEXTBOX_TYPE), m_on_change(nullptr)
|
||||
{
|
||||
from_json(j);
|
||||
}
|
||||
@@ -33,7 +32,7 @@ std::string UI_textbox::hint() const
|
||||
return m_hint;
|
||||
}
|
||||
|
||||
void UI_textbox::from_json(const json& j)
|
||||
void UI_textbox::from_json(const json &j)
|
||||
{
|
||||
UI_item::from_json(j);
|
||||
m_hint = j.at("hint");
|
||||
|
||||
@@ -1,23 +1,25 @@
|
||||
#pragma once
|
||||
#include <string>
|
||||
#include "UI_item.hpp"
|
||||
#include <string>
|
||||
|
||||
#define UI_TEXTBOX_TYPE std::string("UI_textbox")
|
||||
|
||||
class UI_textbox : public UI_item
|
||||
{
|
||||
public:
|
||||
UI_textbox(std::string id, std::string hint, Color fg_color, Color bg_color, std::function<void(std::string, std::string)> on_change = nullptr);
|
||||
UI_textbox(const json& j);
|
||||
public:
|
||||
UI_textbox(std::string id, std::string hint, Color fg_color, Color bg_color,
|
||||
std::function<void(std::string, std::string)> on_change = nullptr);
|
||||
UI_textbox(const json &j);
|
||||
|
||||
void set_text(std::string text) override;
|
||||
|
||||
void set_hint(std::string hint);
|
||||
std::string hint() const;
|
||||
|
||||
void from_json(const json& j) override;
|
||||
void from_json(const json &j) override;
|
||||
json to_json() const override;
|
||||
private:
|
||||
|
||||
private:
|
||||
std::string m_hint;
|
||||
std::function<void(std::string, std::string)> m_on_change;
|
||||
};
|
||||
@@ -1,12 +1,12 @@
|
||||
#include "UI_thermo.hpp"
|
||||
|
||||
UI_thermo::UI_thermo(std::string id, std::string text, Color fg_color, Color bg_color, double min, double max, double value)
|
||||
UI_thermo::UI_thermo(std::string id, std::string text, Color fg_color, Color bg_color, double min, double max,
|
||||
double value)
|
||||
: UI_item(id, UI_THERMO_TYPE, text, 12, fg_color, bg_color), m_min(min), m_max(max), m_value(value)
|
||||
{
|
||||
}
|
||||
|
||||
UI_thermo::UI_thermo(const json& j)
|
||||
: UI_item(UI_THERMO_TYPE)
|
||||
UI_thermo::UI_thermo(const json &j) : UI_item(UI_THERMO_TYPE)
|
||||
{
|
||||
from_json(j);
|
||||
}
|
||||
@@ -80,7 +80,7 @@ void UI_thermo::remove_color_stop_normalized(double value)
|
||||
this->m_color_map.erase(normalized);
|
||||
}
|
||||
|
||||
void UI_thermo::from_json(const json& j)
|
||||
void UI_thermo::from_json(const json &j)
|
||||
{
|
||||
UI_item::from_json(j);
|
||||
|
||||
@@ -88,7 +88,7 @@ void UI_thermo::from_json(const json& j)
|
||||
this->m_max = j.at("max");
|
||||
this->m_value = j.at("value");
|
||||
this->m_color_map.clear();
|
||||
for (auto& i : j["color_map"])
|
||||
for (auto &i : j["color_map"])
|
||||
{
|
||||
double k = i.at("key");
|
||||
std::string c = i.at("value");
|
||||
@@ -103,7 +103,7 @@ json UI_thermo::to_json() const
|
||||
j["max"] = this->m_max;
|
||||
j["value"] = this->m_value;
|
||||
j["color_map"] = json::array();
|
||||
for (auto& [key, value] : this->m_color_map)
|
||||
for (auto &[key, value] : this->m_color_map)
|
||||
{
|
||||
json item = json::object();
|
||||
item["key"] = key;
|
||||
|
||||
@@ -8,7 +8,7 @@ class UI_thermo : public UI_item
|
||||
{
|
||||
public:
|
||||
UI_thermo(std::string id, std::string text, Color fg_color, Color bg_color, double min, double max, double value);
|
||||
UI_thermo(const json& j);
|
||||
UI_thermo(const json &j);
|
||||
|
||||
void set_value(double value) override;
|
||||
double value() const;
|
||||
@@ -23,8 +23,9 @@ class UI_thermo : public UI_item
|
||||
void remove_color_stop(double value);
|
||||
void remove_color_stop_normalized(double value);
|
||||
|
||||
void from_json(const json& j) override;
|
||||
void from_json(const json &j) override;
|
||||
json to_json() const override;
|
||||
|
||||
private:
|
||||
double m_min;
|
||||
double m_max;
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
#include "UI_x_boxes.hpp"
|
||||
|
||||
UI_x_boxes::UI_x_boxes(std::string type)
|
||||
: UI_item(type), m_options()
|
||||
UI_x_boxes::UI_x_boxes(std::string type) : UI_item(type), m_options()
|
||||
{
|
||||
}
|
||||
|
||||
UI_x_boxes::UI_x_boxes(std::string id, std::string type, std::string text, Color fg_color, Color bg_color, std::vector<std::string> options)
|
||||
UI_x_boxes::UI_x_boxes(std::string id, std::string type, std::string text, Color fg_color, Color bg_color,
|
||||
std::vector<std::string> options)
|
||||
: UI_item(id, type, text, 12, fg_color, bg_color), m_options(options)
|
||||
{
|
||||
}
|
||||
|
||||
void UI_x_boxes::from_json(const json& j)
|
||||
void UI_x_boxes::from_json(const json &j)
|
||||
{
|
||||
UI_item::from_json(j);
|
||||
if (j.contains("options"))
|
||||
|
||||
@@ -6,10 +6,12 @@ class UI_x_boxes : public UI_item
|
||||
{
|
||||
public:
|
||||
UI_x_boxes(std::string type);
|
||||
UI_x_boxes(std::string id, std::string type, std::string text, Color fg_color, Color bg_color, std::vector<std::string> options);
|
||||
UI_x_boxes(std::string id, std::string type, std::string text, Color fg_color, Color bg_color,
|
||||
std::vector<std::string> options);
|
||||
|
||||
void from_json(const json& j) override;
|
||||
void from_json(const json &j) override;
|
||||
json to_json() const override;
|
||||
|
||||
protected:
|
||||
std::vector<std::string> m_options;
|
||||
};
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
#include "gtest/gtest.h"
|
||||
#include "UI.hpp"
|
||||
#include "gtest/gtest.h"
|
||||
#include <iostream>
|
||||
|
||||
#define UNUSED(x) (void)(x)
|
||||
+22
-15
@@ -3,32 +3,36 @@
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "spdlog/spdlog.h"
|
||||
#include "spdlog/async.h"
|
||||
#include "spdlog/sinks/stdout_color_sinks.h"
|
||||
#include "spdlog/sinks/rotating_file_sink.h"
|
||||
#include "spdlog/sinks/stdout_color_sinks.h"
|
||||
#include "spdlog/spdlog.h"
|
||||
|
||||
#include "message_parser.hpp"
|
||||
#include "simulators.hpp"
|
||||
#include "websocket.hpp"
|
||||
#include "message_parser.hpp"
|
||||
|
||||
class Spdlog_buffer : public std::stringbuf
|
||||
{
|
||||
public:
|
||||
Spdlog_buffer(std::function <void(std::string)> log_function) : log_function(log_function) {}
|
||||
int sync() {
|
||||
public:
|
||||
Spdlog_buffer(std::function<void(std::string)> log_function) : log_function(log_function)
|
||||
{
|
||||
}
|
||||
int sync()
|
||||
{
|
||||
std::string str = this->str();
|
||||
str.pop_back();
|
||||
log_function(str);
|
||||
this->str("");
|
||||
return 0;
|
||||
}
|
||||
private:
|
||||
std::function <void(std::string)> log_function;
|
||||
|
||||
private:
|
||||
std::function<void(std::string)> log_function;
|
||||
};
|
||||
|
||||
Simulators* g_simulators;
|
||||
Websocket* g_web_socket;
|
||||
Simulators *g_simulators;
|
||||
Websocket *g_web_socket;
|
||||
Spdlog_buffer g_info_buffer([](std::string message) { spdlog::info(message); });
|
||||
Spdlog_buffer g_error_buffer([](std::string message) { spdlog::error(message); });
|
||||
std::ostream g_out(&g_info_buffer);
|
||||
@@ -52,10 +56,11 @@ void int_handler(int s)
|
||||
void init_logger()
|
||||
{
|
||||
spdlog::init_thread_pool(8192, 1);
|
||||
auto stdout_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt >();
|
||||
auto rotating_sink = std::make_shared<spdlog::sinks::rotating_file_sink_mt>("log-sim_us.txt", 1024*1024*10, 3);
|
||||
std::vector<spdlog::sink_ptr> sinks {stdout_sink, rotating_sink};
|
||||
auto logger = std::make_shared<spdlog::async_logger>("sim_us", sinks.begin(), sinks.end(), spdlog::thread_pool(), spdlog::async_overflow_policy::block);
|
||||
auto stdout_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
|
||||
auto rotating_sink = std::make_shared<spdlog::sinks::rotating_file_sink_mt>("log-sim_us.txt", 1024 * 1024 * 10, 3);
|
||||
std::vector<spdlog::sink_ptr> sinks{stdout_sink, rotating_sink};
|
||||
auto logger = std::make_shared<spdlog::async_logger>("sim_us", sinks.begin(), sinks.end(), spdlog::thread_pool(),
|
||||
spdlog::async_overflow_policy::block);
|
||||
spdlog::set_default_logger(logger);
|
||||
spdlog::set_pattern("[%H:%M:%S %z] [%n] [%^---%L---%$] [thread %t] %v");
|
||||
spdlog::flush_every(std::chrono::seconds(3));
|
||||
@@ -81,7 +86,9 @@ int main(void)
|
||||
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(); });
|
||||
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;
|
||||
|
||||
// Start the message processor and broadcast processor in separate threads
|
||||
|
||||
+21
-19
@@ -1,8 +1,8 @@
|
||||
#include "message_parser.hpp"
|
||||
#include <magic_enum.hpp>
|
||||
#include <iostream>
|
||||
#include <magic_enum.hpp>
|
||||
|
||||
extern Simulators* g_simulators;
|
||||
extern Simulators *g_simulators;
|
||||
|
||||
std::string message_parser(std::string message)
|
||||
{
|
||||
@@ -34,7 +34,8 @@ json command_parser(json command)
|
||||
case Command::get_UI_element:
|
||||
spdlog::info("Command {}: {}", type, std::string(command.at("id")));
|
||||
j["response"]["type"] = type;
|
||||
j["response"]["UI_item"] = g_simulators->invoke_active_simulator()->get_UI_item(command.at("id"))->to_json();
|
||||
j["response"]["UI_item"] =
|
||||
g_simulators->invoke_active_simulator()->get_UI_item(command.at("id"))->to_json();
|
||||
break;
|
||||
case Command::get_UI_elements:
|
||||
spdlog::info("Command {}", type);
|
||||
@@ -60,7 +61,7 @@ json command_parser(json command)
|
||||
break;
|
||||
}
|
||||
}
|
||||
catch(const json::exception& e)
|
||||
catch (const json::exception &e)
|
||||
{
|
||||
spdlog::error(e.what());
|
||||
}
|
||||
@@ -80,39 +81,40 @@ void event_handler(json event)
|
||||
return;
|
||||
}
|
||||
|
||||
switch(e)
|
||||
{
|
||||
case Event::clicked:
|
||||
switch (e)
|
||||
{
|
||||
case Event::clicked: {
|
||||
spdlog::debug("Event {}: {}", type, std::string(event.at("id")));
|
||||
g_simulators->invoke_active_simulator()->get_UI_item(std::string(event.at("id")))->click();
|
||||
break;
|
||||
}
|
||||
case Event::value_changed:
|
||||
{
|
||||
case Event::value_changed: {
|
||||
spdlog::debug("Event {}: {} {}", type, std::string(event.at("id")), (double)(event["value"]));
|
||||
g_simulators->invoke_active_simulator()->get_UI_item(std::string(event.at("id")))->set_value((double)event.at("value"));
|
||||
g_simulators->invoke_active_simulator()
|
||||
->get_UI_item(std::string(event.at("id")))
|
||||
->set_value((double)event.at("value"));
|
||||
break;
|
||||
}
|
||||
case Event::text_changed:
|
||||
{
|
||||
case Event::text_changed: {
|
||||
spdlog::debug("Event {}: {} {}", type, std::string(event.at("id")), std::string(event.at("text")));
|
||||
g_simulators->invoke_active_simulator()->get_UI_item(std::string(event.at("id")))->set_text(std::string(event.at("text")));
|
||||
g_simulators->invoke_active_simulator()
|
||||
->get_UI_item(std::string(event.at("id")))
|
||||
->set_text(std::string(event.at("text")));
|
||||
break;
|
||||
}
|
||||
case Event::selected:
|
||||
{
|
||||
case Event::selected: {
|
||||
spdlog::debug("Event {}: {} {}", type, std::string(event.at("id")), std::string(event.at("selected")));
|
||||
g_simulators->invoke_active_simulator()->get_UI_item(std::string(event.at("id")))->set_selected(std::string(event.at("selected")));
|
||||
g_simulators->invoke_active_simulator()
|
||||
->get_UI_item(std::string(event.at("id")))
|
||||
->set_selected(std::string(event.at("selected")));
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
default: {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
catch(const json::exception& e)
|
||||
catch (const json::exception &e)
|
||||
{
|
||||
spdlog::error(e.what());
|
||||
}
|
||||
|
||||
+27
-15
@@ -1,20 +1,23 @@
|
||||
#include "simulator_base.hpp"
|
||||
|
||||
Simulator_base::Simulator_base(std::string name, std::chrono::milliseconds interval)
|
||||
: m_name(name), m_timer([this]{ timer(); }), m_interval(interval)
|
||||
: m_name(name), m_timer([this] { timer(); }), m_interval(interval)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
std::string Simulator_base::name() const {
|
||||
std::string Simulator_base::name() const
|
||||
{
|
||||
// Get the name of the simulator
|
||||
return m_name;
|
||||
}
|
||||
|
||||
bool Simulator_base::is_ui_id_unique(std::string id) const {
|
||||
bool Simulator_base::is_ui_id_unique(std::string id) const
|
||||
{
|
||||
// Check if the UI name is unique
|
||||
for (UI_item* item : m_UI_items) {
|
||||
if (item->id() == id) {
|
||||
for (UI_item *item : m_UI_items)
|
||||
{
|
||||
if (item->id() == id)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -22,48 +25,57 @@ bool Simulator_base::is_ui_id_unique(std::string id) const {
|
||||
return true;
|
||||
}
|
||||
|
||||
void Simulator_base::add_UI_item(UI_item* item) {
|
||||
void Simulator_base::add_UI_item(UI_item *item)
|
||||
{
|
||||
// Add a UI item to the simulator
|
||||
if (is_ui_id_unique(item->id()) == false) {
|
||||
if (is_ui_id_unique(item->id()) == false)
|
||||
{
|
||||
throw std::runtime_error("UI item id " + item->id() + " is not unique");
|
||||
}
|
||||
m_UI_items_map[item->id()] = item;
|
||||
m_UI_items.push_back(item);
|
||||
}
|
||||
|
||||
json Simulator_base::get_UI_items() const {
|
||||
json Simulator_base::get_UI_items() const
|
||||
{
|
||||
// Get the UI items
|
||||
json items;
|
||||
items["name"] = m_name;
|
||||
for (UI_item* item : m_UI_items) {
|
||||
for (UI_item *item : m_UI_items)
|
||||
{
|
||||
items["UI_items"].push_back(item->to_json());
|
||||
}
|
||||
|
||||
return items;
|
||||
}
|
||||
|
||||
UI_item* Simulator_base::get_UI_item(std::string id) const {
|
||||
UI_item *Simulator_base::get_UI_item(std::string id) const
|
||||
{
|
||||
// Get a UI item by id
|
||||
return m_UI_items_map.at(id);
|
||||
}
|
||||
|
||||
void Simulator_base::run() {
|
||||
void Simulator_base::run()
|
||||
{
|
||||
// Start the timer
|
||||
m_timer.setInterval(m_interval);
|
||||
run_at_startup();
|
||||
}
|
||||
|
||||
void Simulator_base::stop() {
|
||||
void Simulator_base::stop()
|
||||
{
|
||||
// Stop the simulator
|
||||
m_timer.stop();
|
||||
}
|
||||
|
||||
void Simulator_base::shutdown() {
|
||||
void Simulator_base::shutdown()
|
||||
{
|
||||
// Shutdown the simulator
|
||||
system("shutdown -h now");
|
||||
}
|
||||
|
||||
void Simulator_base::reboot() {
|
||||
void Simulator_base::reboot()
|
||||
{
|
||||
// Reboot the simulator
|
||||
system("reboot");
|
||||
}
|
||||
@@ -1,10 +1,11 @@
|
||||
#pragma once
|
||||
|
||||
#include "UI.hpp"
|
||||
#include "timer.hpp"
|
||||
#include "spdlog/spdlog.h"
|
||||
#include "timer.hpp"
|
||||
|
||||
class Simulator_base {
|
||||
class Simulator_base
|
||||
{
|
||||
|
||||
public:
|
||||
/**
|
||||
@@ -39,7 +40,7 @@ class Simulator_base {
|
||||
*
|
||||
* @param item The UI item to add
|
||||
*/
|
||||
void add_UI_item(UI_item* item);
|
||||
void add_UI_item(UI_item *item);
|
||||
/**
|
||||
* @brief Get the UI items object
|
||||
*
|
||||
@@ -53,7 +54,7 @@ class Simulator_base {
|
||||
* @param id The id of the UI item
|
||||
* @return UI_item* A pointer to the UI item object
|
||||
*/
|
||||
UI_item* get_UI_item(std::string id) const;
|
||||
UI_item *get_UI_item(std::string id) const;
|
||||
|
||||
/**
|
||||
* @brief Run the simulator
|
||||
@@ -81,10 +82,11 @@ class Simulator_base {
|
||||
|
||||
void shutdown();
|
||||
void reboot();
|
||||
|
||||
protected:
|
||||
std::string m_name;
|
||||
std::vector<UI_item*> m_UI_items;
|
||||
std::map<std::string, UI_item*> m_UI_items_map;
|
||||
std::vector<UI_item *> m_UI_items;
|
||||
std::map<std::string, UI_item *> m_UI_items_map;
|
||||
Timer m_timer;
|
||||
std::chrono::milliseconds m_interval;
|
||||
};
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "simulators.hpp"
|
||||
#include <unordered_set>
|
||||
#include "test_sim.hpp"
|
||||
#include "can_debugger.hpp"
|
||||
#include "test_sim.hpp"
|
||||
#include <unordered_set>
|
||||
|
||||
Simulators::Simulators()
|
||||
{
|
||||
@@ -66,14 +66,14 @@ void Simulators::switch_simulator(std::string name)
|
||||
std::vector<std::string> Simulators::list_simulators() const
|
||||
{
|
||||
std::vector<std::string> names;
|
||||
for (const auto& simulator : this->m_simulators)
|
||||
for (const auto &simulator : this->m_simulators)
|
||||
{
|
||||
names.push_back(simulator.first);
|
||||
}
|
||||
return names;
|
||||
}
|
||||
|
||||
Simulator_base* Simulators::invoke_active_simulator()
|
||||
Simulator_base *Simulators::invoke_active_simulator()
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(m_mutex);
|
||||
if (this->m_simulators.empty())
|
||||
@@ -121,7 +121,7 @@ json Simulators::changed_UI_items()
|
||||
|
||||
try
|
||||
{
|
||||
for (auto& item : diff)
|
||||
for (auto &item : diff)
|
||||
{
|
||||
std::string path = item["path"];
|
||||
size_t index = std::stoul(path.substr(10, path.find("/", 10) - 10));
|
||||
@@ -132,7 +132,7 @@ json Simulators::changed_UI_items()
|
||||
addedIndices.insert(index);
|
||||
}
|
||||
}
|
||||
catch(const std::exception& e)
|
||||
catch (const std::exception &e)
|
||||
{
|
||||
spdlog::error(e.what());
|
||||
}
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
#pragma once
|
||||
#include <memory>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <mutex>
|
||||
|
||||
#include "simulator_base.hpp"
|
||||
|
||||
#define INSERT_SIMULATOR(type) m_simulators.insert(std::make_pair(type().name(), std::make_unique<type>()));
|
||||
|
||||
class Simulators {
|
||||
class Simulators
|
||||
{
|
||||
public:
|
||||
Simulators();
|
||||
std::string active_simulator_name() const;
|
||||
@@ -15,8 +16,9 @@ class Simulators {
|
||||
void stop();
|
||||
void switch_simulator(std::string name);
|
||||
std::vector<std::string> list_simulators() const;
|
||||
Simulator_base* invoke_active_simulator();
|
||||
Simulator_base *invoke_active_simulator();
|
||||
json changed_UI_items();
|
||||
|
||||
private:
|
||||
std::map<std::string, std::unique_ptr<Simulator_base>> m_simulators;
|
||||
std::string m_current_simulator = "";
|
||||
|
||||
+14
-15
@@ -1,9 +1,8 @@
|
||||
#include "websocket.hpp"
|
||||
#include "spdlog/spdlog.h"
|
||||
|
||||
Websocket::Websocket(uint16_t port, std::ostream* out, std::ostream* err,
|
||||
std::function<std::string(std::string)> on_message,
|
||||
std::function<std::string()> on_update)
|
||||
Websocket::Websocket(uint16_t port, std::ostream *out, std::ostream *err,
|
||||
std::function<std::string(std::string)> on_message, std::function<std::string()> on_update)
|
||||
: m_on_message(on_message), m_on_update(on_update), m_port(port)
|
||||
{
|
||||
// Set logging settings
|
||||
@@ -11,10 +10,8 @@ Websocket::Websocket(uint16_t port, std::ostream* out, std::ostream* err,
|
||||
m_server.get_elog().set_custom(err != &std::cerr);
|
||||
m_server.get_alog().set_ostream(out);
|
||||
m_server.get_elog().set_ostream(err);
|
||||
m_server.set_access_channels(websocketpp::log::alevel::connect +
|
||||
websocketpp::log::alevel::disconnect);
|
||||
m_server.clear_access_channels(websocketpp::log::alevel::frame_payload +
|
||||
websocketpp::log::alevel::frame_header);
|
||||
m_server.set_access_channels(websocketpp::log::alevel::connect + websocketpp::log::alevel::disconnect);
|
||||
m_server.clear_access_channels(websocketpp::log::alevel::frame_payload + websocketpp::log::alevel::frame_header);
|
||||
|
||||
// Initialize Asio
|
||||
m_server.init_asio();
|
||||
@@ -35,10 +32,14 @@ void Websocket::run()
|
||||
m_server.start_accept();
|
||||
// Start the ASIO io_service run loop
|
||||
m_server.run();
|
||||
} catch (websocketpp::exception const& e) {
|
||||
}
|
||||
catch (websocketpp::exception const &e)
|
||||
{
|
||||
spdlog::critical("{}", e.what());
|
||||
exit(1);
|
||||
} catch (...) {
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
spdlog::critical("other exception");
|
||||
exit(1);
|
||||
}
|
||||
@@ -94,21 +95,19 @@ void Websocket::process_messages()
|
||||
|
||||
lock.unlock();
|
||||
|
||||
switch (a.type) {
|
||||
case SUBSCRIBE:
|
||||
switch (a.type)
|
||||
{
|
||||
case SUBSCRIBE: {
|
||||
std::lock_guard<std::mutex> guard(m_connection_lock);
|
||||
m_connections.insert(a.hdl);
|
||||
}
|
||||
break;
|
||||
case UNSUBSCRIBE:
|
||||
{
|
||||
case UNSUBSCRIBE: {
|
||||
std::lock_guard<std::mutex> guard(m_connection_lock);
|
||||
m_connections.erase(a.hdl);
|
||||
}
|
||||
break;
|
||||
case MESSAGE:
|
||||
{
|
||||
case MESSAGE: {
|
||||
std::string response = m_on_message(a.msg->get_payload());
|
||||
if (response.empty() || response == "{}")
|
||||
{
|
||||
|
||||
+18
-10
@@ -16,17 +16,22 @@ using websocketpp::lib::placeholders::_2;
|
||||
* on_message queue send to all channels
|
||||
*/
|
||||
|
||||
enum action_type {
|
||||
enum action_type
|
||||
{
|
||||
SUBSCRIBE,
|
||||
UNSUBSCRIBE,
|
||||
MESSAGE,
|
||||
BROADCAST
|
||||
};
|
||||
|
||||
struct action {
|
||||
action(action_type t, websocketpp::connection_hdl h) : type(t), hdl(h) {}
|
||||
action(action_type t, websocketpp::connection_hdl h, Server::message_ptr m)
|
||||
: type(t), hdl(h), msg(m) {}
|
||||
struct action
|
||||
{
|
||||
action(action_type t, websocketpp::connection_hdl h) : type(t), hdl(h)
|
||||
{
|
||||
}
|
||||
action(action_type t, websocketpp::connection_hdl h, Server::message_ptr m) : type(t), hdl(h), msg(m)
|
||||
{
|
||||
}
|
||||
|
||||
action_type type;
|
||||
websocketpp::connection_hdl hdl;
|
||||
@@ -35,22 +40,25 @@ struct action {
|
||||
|
||||
class Websocket
|
||||
{
|
||||
public:
|
||||
Websocket(uint16_t port, std::ostream* out, std::ostream* err, std::function<std::string(std::string)> on_message, std::function<std::string()> on_update);
|
||||
public:
|
||||
Websocket(uint16_t port, std::ostream *out, std::ostream *err, std::function<std::string(std::string)> on_message,
|
||||
std::function<std::string()> on_update);
|
||||
void run();
|
||||
void stop();
|
||||
void process_messages();
|
||||
void process_broadcast();
|
||||
private:
|
||||
|
||||
private:
|
||||
void on_open(websocketpp::connection_hdl hdl);
|
||||
void on_close(websocketpp::connection_hdl hdl);
|
||||
void on_message(websocketpp::connection_hdl hdl, Server::message_ptr msg);
|
||||
private:
|
||||
|
||||
private:
|
||||
std::function<std::string(std::string)> m_on_message;
|
||||
std::function<std::string()> m_on_update;
|
||||
Server m_server;
|
||||
uint16_t m_port;
|
||||
typedef std::set<websocketpp::connection_hdl,std::owner_less<websocketpp::connection_hdl>> con_list;
|
||||
typedef std::set<websocketpp::connection_hdl, std::owner_less<websocketpp::connection_hdl>> con_list;
|
||||
con_list m_connections;
|
||||
|
||||
std::queue<action> m_actions;
|
||||
|
||||
Reference in New Issue
Block a user