eugene/esDashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add network

Browse Source
This commit is contained in:
Eugene Lykov
2026-01-09 21:58:48 +00:00
parent f8e1948059
commit 5b5be7c3c8
24 changed files with 482 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/display/ui/hostblock/HostBlock.cpp
+119 -48
View File
@@ -11,20 +11,21 @@
namespace display::ui::hostblock
{
HostBlock::HostBlock()
: cpuBar(
CPU_BAR_WIDTH,
CPU_BAR_HEIGHT,
HostBlock::HostBlock(config::server::StyleConfig &config)
: config(config),
cpuBar(
config.hostblock.cpu.width,
config.hostblock.cpu.height,
display::ui::bar::Orientation::Vertical,
display::ui::bar::Style{display::graphics::Color{40, 40, 40}, display::graphics::Color{0, 180, 0}, display::graphics::Color{80, 80, 80}, true}),
cpuTempBar(
CPU_BAR_TEMP_WIDTH,
CPU_BAR_HEIGHT,
config.hostblock.cpu.temperature.width,
config.hostblock.cpu.height,
display::ui::bar::Orientation::Vertical,
display::ui::bar::Style{display::graphics::Color{40, 40, 40}, display::graphics::Color{0, 180, 0}, display::graphics::Color{80, 80, 80}, true}),
memBar(
BLOCK_WIDTH - PADDING * 2,
MEM_BAR_HEIGHT,
config.hostblock.width - config.hostblock.padding * 2,
config.hostblock.memory.height,
display::ui::bar::Orientation::Horizontal,
display::ui::bar::Style{display::graphics::Color{40, 40, 40}, display::graphics::Color{0, 120, 200}, display::graphics::Color{80, 80, 80}, true})
@@ -38,60 +39,60 @@ namespace display::ui::hostblock
const std::string &hostname,
const metrics::Host &metrics)
{
// ===== Block background =====
fb.fillRect(x, y, BLOCK_WIDTH, BLOCK_HEIGHT, display::ui::theme::hostblock::BACKGROUND);
fb.drawRect(x, y, BLOCK_WIDTH, BLOCK_HEIGHT, display::ui::theme::hostblock::BORDER);
bool online = std::chrono::high_resolution_clock::now() - metrics.packetTimepoint < std::chrono::seconds(5);
int cursorY = y + PADDING;
// ===== Block background =====
fb.fillRect(x, y, config.hostblock.width, config.hostblock.height, display::ui::theme::hostblock::BACKGROUND);
fb.drawRect(x, y, config.hostblock.width, config.hostblock.height, display::ui::theme::hostblock::BORDER);
int cursorY = y + config.hostblock.padding;
// ===== Header =====
fb.fillRect(
x + PADDING,
x + config.hostblock.padding,
cursorY,
BLOCK_WIDTH - PADDING * 2,
HEADER_HEIGHT,
std::chrono::high_resolution_clock::now() - metrics.packetTimepoint < std::chrono::seconds(5) ? display::ui::theme::hostblock::HEADER : display::graphics::Red());
config.hostblock.width - config.hostblock.padding * 2,
config.hostblock.header.height,
online ? display::ui::theme::hostblock::HEADER : display::graphics::Red());
text.drawTextOutlined(
fb,
x + PADDING + 2,
cursorY + HEADER_HEIGHT - 1,
x + config.hostblock.padding + 2,
cursorY + config.hostblock.header.height - 1,
hostname,
display::ui::theme::text::TEXT,
display::ui::theme::text::OUTLINE,
// display::ui::text::Font{"LiberationSans-Regular", HEADER_FONT_SIZE});
// display::ui::text::Font{"PixelFive-Regular", 5});
display::ui::text::Font{std::string(HEADER_FONT_NAME.begin(), HEADER_FONT_NAME.end()), HEADER_FONT_SIZE});
display::ui::text::Font{config.hostblock.header.font.name, config.hostblock.header.font.size});
cursorY += HEADER_HEIGHT + SECTION_GAP;
cursorY += config.hostblock.header.height + config.hostblock.gap;
// ===== CPU bars =====
int cpuCount = std::min<int>(metrics.cpu.coreLoads.size(),
CPU_MAX_PER_ROW * CPU_ROWS);
config.hostblock.cpu.max_per_row * config.hostblock.cpu.rows);
for (int i = 0; i < cpuCount; ++i)
{
int row = i / CPU_MAX_PER_ROW;
int col = i % CPU_MAX_PER_ROW;
int row = i / config.hostblock.cpu.max_per_row;
int col = i % config.hostblock.cpu.max_per_row;
int bx = x + PADDING +
col * (CPU_BAR_WIDTH + CPU_BAR_TEMP_WIDTH - 1 + CPU_BAR_GAP);
int bx = x + config.hostblock.padding +
col * (config.hostblock.cpu.width + config.hostblock.cpu.temperature.width - 1 + config.hostblock.cpu.gap_h);
int by = cursorY +
row * (CPU_BAR_HEIGHT + CPU_BAR_GAP);
row * (config.hostblock.cpu.height + config.hostblock.cpu.gap_v);
float value = std::clamp(metrics.cpu.coreLoads[i] / 100.0f, 0.0f, 1.0f);
cpuBar.draw(fb, bx, by, value);
cpuBar.draw(fb, bx, by, value, 0, online);
value = std::clamp((metrics.cpu.coreTemps[i].current - CPU_BAR_TEMP_MIN) / ((metrics.cpu.coreTemps[i].max == 0 ? 100.0f : metrics.cpu.coreTemps[i].max) - CPU_BAR_TEMP_MIN), 0.0f, 1.0f);
value = std::clamp((metrics.cpu.coreTemps[i].current - config.hostblock.cpu.temperature.min) / ((metrics.cpu.coreTemps[i].max == 0 ? static_cast<float>(config.hostblock.cpu.temperature.max) : metrics.cpu.coreTemps[i].max) - config.hostblock.cpu.temperature.min), 0.0f, 1.0f);
cpuTempBar.draw(fb, bx + CPU_BAR_WIDTH - 1, by, value);
cpuTempBar.draw(fb, bx + config.hostblock.cpu.width - 1, by, value, 0, online);
}
cursorY += CPU_ROWS * CPU_BAR_HEIGHT +
(CPU_ROWS - 1) * CPU_BAR_GAP +
SECTION_GAP;
cursorY += config.hostblock.cpu.rows * config.hostblock.cpu.height +
(config.hostblock.cpu.rows - 1) * config.hostblock.cpu.gap_v +
config.hostblock.gap;
// ===== Memory bar =====
float memValue, swapValue = 0.0f, hugepagesValue = 0.0f;
@@ -102,18 +103,18 @@ namespace display::ui::hostblock
memBar.draw(
fb,
x + PADDING,
x + config.hostblock.padding,
cursorY,
std::clamp(memValue, 0.0f, 1.0f), std::clamp(hugepagesValue, 0.0f, 1.0f));
std::clamp(memValue, 0.0f, 1.0f), std::clamp(hugepagesValue, 0.0f, 1.0f), online);
text.drawTextOutlined(fb,
x + MEM_BAR_TEXT_PADDING_X,
x + config.hostblock.memory.font.padding,
cursorY + 8,
"MEM: " + display::ui::text::formatFloat(static_cast<float>(metrics.memory.memory.used) / 1073741824) + "/" + display::ui::text::formatFloat(static_cast<float>(metrics.memory.memory.total) / 1073741824),
display::ui::theme::text::TEXT,
display::ui::theme::text::OUTLINE,
display::ui::text::Font{"PixelFive-Regular", 5});
display::ui::text::Font{config.hostblock.memory.font.name, config.hostblock.memory.font.size});
cursorY += MEM_BAR_HEIGHT + SECTION_GAP;
cursorY += config.hostblock.memory.height + config.hostblock.memory.gap;
if (metrics.memory.swap.total > 0)
{
@@ -121,19 +122,19 @@ namespace display::ui::hostblock
memBar.draw(
fb,
x + PADDING,
x + config.hostblock.padding,
cursorY,
std::clamp(swapValue, 0.0f, 1.0f));
std::clamp(swapValue, 0.0f, 1.0f), 0, online);
text.drawTextOutlined(fb,
x + MEM_BAR_TEXT_PADDING_X,
x + config.hostblock.memory.font.padding,
cursorY + 8,
"SWP: " + display::ui::text::formatFloat(static_cast<float>(metrics.memory.swap.used) / 1073741824) + "/" + display::ui::text::formatFloat(static_cast<float>(metrics.memory.swap.total) / 1073741824),
display::ui::theme::text::TEXT,
display::ui::theme::text::OUTLINE,
display::ui::text::Font{"PixelFive-Regular", 5});
display::ui::text::Font{config.hostblock.memory.font.name, config.hostblock.memory.font.size});
cursorY += MEM_BAR_HEIGHT + SECTION_GAP;
cursorY += config.hostblock.memory.height + config.hostblock.gap;
}
// ===== Disk bar =====
@@ -142,18 +143,88 @@ namespace display::ui::hostblock
for (int i = 0; i < diskCount; ++i)
{
int by = cursorY +
i * (MEM_BAR_HEIGHT + SECTION_GAP);
i * (config.hostblock.disks.height + config.hostblock.disks.gap);
float value = std::clamp(static_cast<float>(metrics.disks[i].metrics.used) / metrics.disks[i].metrics.total, 0.0f, 1.0f);
memBar.draw(fb, x + PADDING, by, value);
memBar.draw(fb, x + config.hostblock.padding, by, value, 0, online);
text.drawTextOutlined(fb,
x + MEM_BAR_TEXT_PADDING_X,
x + config.hostblock.disks.font.padding,
by + 8,
"D/" + metrics.disks[i].name + ": " + display::ui::text::formatFloat(static_cast<float>(metrics.disks[i].metrics.used) / 1073741824) + "/" + display::ui::text::formatFloat(static_cast<float>(metrics.disks[i].metrics.total) / 1073741824),
display::ui::theme::text::TEXT,
display::ui::theme::text::OUTLINE,
display::ui::text::Font{"PixelFive-Regular", 5});
display::ui::text::Font{config.hostblock.disks.font.name, config.hostblock.disks.font.size});
}
cursorY += diskCount * (config.hostblock.disks.height + config.hostblock.disks.gap);
// ===== Network bar =====
for (const auto &iface : metrics.networks)
{
int by = cursorY;
float rxNorm = 0.0f;
float txNorm = 0.0f;
if (iface.online)
{
if (iface.rxMaxBps > 0)
rxNorm = std::clamp(static_cast<float>(iface.rxBps / iface.rxMaxBps), 0.0f, 1.0f);
if (iface.txMaxBps > 0)
txNorm = std::clamp(static_cast<float>(iface.txBps / iface.txMaxBps), 0.0f, 1.0f);
}
// background bar
memBar.draw(
fb,
x + config.hostblock.padding,
by,
0.0f,
0.0f,
iface.online && online);
int barX = x + config.hostblock.padding;
int barW = config.hostblock.width - config.hostblock.padding * 2;
int barH = config.hostblock.networks.height;
// RX overlay
fb.fillRect(
barX,
by,
static_cast<int>(barW * rxNorm),
barH,
{0, 180, 0});
// TX overlay
fb.fillRect(
barX,
by,
static_cast<int>(barW * txNorm),
barH,
{200, 200, 0});
// border
fb.drawRect(barX, by, barW, barH, display::ui::theme::hostblock::BORDER);
// interface name + speeds
std::string label =
iface.name + " " +
display::ui::text::formatSpeed(iface.rxBps) + " ↓ " +
display::ui::text::formatSpeed(iface.txBps) + " ↑";
text.drawTextOutlined(
fb,
barX + config.hostblock.networks.font.padding,
by + barH - 1,
label,
display::ui::theme::text::TEXT,
display::ui::theme::text::OUTLINE,
display::ui::text::Font{
config.hostblock.networks.font.name,
config.hostblock.networks.font.size});
cursorY += config.hostblock.networks.height + config.hostblock.networks.gap;
}
}
}