Skip to content

Added possibility to show radial graphs on themes #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 26, 2023
Merged

Added possibility to show radial graphs on themes #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e64859
Makes it easy to define a full circle radial meter.
arthurferrai Jun 7, 2023
d241a25
Implemented reading radial values from theme.
arthurferrai Jun 7, 2023
b6dc57f
Added radial on default.yaml
arthurferrai Jun 7, 2023
73cfb5e
Added new 5inchTheme2Radial, with some radial graph examples.
arthurferrai Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions library/lcd/lcd_comm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,16 @@ def DisplayRadialProgressBar(self, xc: int, yc: int, radius: int, bar_width: int
if isinstance(font_color, str):
font_color = tuple(map(int, font_color.split(', ')))

if angle_start % 361 == angle_end % 361:
if clockwise:
angle_start += 0.1
else:
angle_end += 0.1

assert xc - radius >= 0 and xc + radius <= self.get_width(), 'Progress bar width exceeds display width'
assert yc - radius >= 0 and yc + radius <= self.get_height(), 'Progress bar height exceeds display height'
assert 0 < bar_width <= radius, 'Progress bar linewidth must be > 0 and <= radius'
assert angle_end % 361 != angle_start % 361, 'Change your angles values'
assert 0 < bar_width <= radius, f'Progress bar linewidth is {bar_width}, must be > 0 and <= radius'
assert angle_end % 361 != angle_start % 361, f'Invalid angles values, start = {angle_start}, end = {angle_end}'
assert isinstance(angle_steps, int), 'angle_steps value must be an integer'
assert angle_sep >= 0, 'Provide an angle_sep value >= 0'
assert angle_steps > 0, 'Provide an angle_step value > 0'
Expand Down
916 changes: 265 additions & 651 deletions library/stats.py
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added res/themes/5inchTheme2Radial/background.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/themes/5inchTheme2Radial/preview.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
242 changes: 242 additions & 0 deletions res/themes/5inchTheme2Radial/theme.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,242 @@
---
display:
DISPLAY_SIZE: 5"
DISPLAY_ORIENTATION: portrait
DISPLAY_RGB_LED: 0, 0, 255

static_images:
BACKGROUND:
PATH: background.png
X: 0
Y: 0
WIDTH: 480
HEIGHT: 800
static_text:
DISK_USED_LABEL:
TEXT: "Used:"
X: 124
Y: 625
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
FONT_SIZE: 23
FONT_COLOR: 255, 255, 255
BACKGROUND_COLOR: 132, 154, 165
DISK_FREE_LABEL:
TEXT: "Free:"
X: 124
Y: 679
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
FONT_SIZE: 23
FONT_COLOR: 255, 255, 255
BACKGROUND_COLOR: 132, 154, 165
DISK_TOTAL_LABEL:
TEXT: "Total:"
X: 124
Y: 652
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
FONT_SIZE: 23
FONT_COLOR: 255, 255, 255
BACKGROUND_COLOR: 132, 154, 165
STATS:
CPU:
PERCENTAGE:
INTERVAL: 1
TEXT:
SHOW: True
SHOW_UNIT: True
X: 280
Y: 40
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
FONT_SIZE: 23
FONT_COLOR: 255, 255, 255
BACKGROUND_COLOR: 132, 154, 165
RADIAL:
SHOW: True
X: 100
Y: 110
RADIUS: 40
WIDTH: 10
MIN_VALUE: 0
MAX_VALUE: 100
ANGLE_START: 120
ANGLE_END: 60
ANGLE_STEPS: 20
ANGLE_SEP: 5
CLOCKWISE: True
BAR_COLOR: 0, 255, 0
BACKGROUND_IMAGE: background.png
FREQUENCY:
INTERVAL: 5
TEXT:
SHOW: True
SHOW_UNIT: True
X: 300
Y: 100
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
FONT_SIZE: 30
FONT_COLOR: 255, 255, 255
BACKGROUND_COLOR: 132, 154, 165
TEMPERATURE:
INTERVAL: 5
TEXT:
SHOW: True
SHOW_UNIT: True
X: 200
Y: 70
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
FONT_SIZE: 23
FONT_COLOR: 255, 255, 255
BACKGROUND_COLOR: 132, 154, 165
GPU:
INTERVAL: 1
PERCENTAGE:
GRAPH:
SHOW: False
X: 300
Y: 260
WIDTH: 150
HEIGHT: 15
MIN_VALUE: 0
MAX_VALUE: 100
BAR_COLOR: 0, 0, 255
BAR_OUTLINE: False
BACKGROUND_COLOR: 0, 0, 0
RADIAL:
SHOW: True
X: 141
Y: 275
RADIUS: 28
WIDTH: 8
MIN_VALUE: 0
MAX_VALUE: 100
ANGLE_START: 110
ANGLE_END: 70
ANGLE_STEPS: 1
ANGLE_SEP: 25
CLOCKWISE: True
BAR_COLOR: 255, 0, 0
BACKGROUND_IMAGE: background.png
TEXT:
SHOW: TRUE
SHOW_UNIT: True
X: 285
Y: 230
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
FONT_SIZE: 23
FONT_COLOR: 255, 255, 255
BACKGROUND_COLOR: 132, 154, 165
MEMORY:
TEXT:
SHOW: TRUE
SHOW_UNIT: True
X: 300
Y: 290
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
FONT_SIZE: 23
FONT_COLOR: 255, 255, 255
BACKGROUND_COLOR: 132, 154, 165
TEMPERATURE:
TEXT:
SHOW: TRUE
SHOW_UNIT: True
X: 200
Y: 260
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
FONT_SIZE: 23
FONT_COLOR: 255, 255, 255
BACKGROUND_COLOR: 132, 154, 165
MEMORY:
INTERVAL: 5
VIRTUAL:
GRAPH:
SHOW: True
X: 300
Y: 450
WIDTH: 150
HEIGHT: 15
MIN_VALUE: 0
MAX_VALUE: 100
BAR_COLOR: 0, 0, 255
BAR_OUTLINE: True
BACKGROUND_COLOR: 0, 0, 0
USED:
SHOW: TRUE
SHOW_UNIT: True
X: 300
Y: 480
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
FONT_SIZE: 23
FONT_COLOR: 255, 255, 255
BACKGROUND_COLOR: 132, 154, 165
PERCENT_TEXT:
SHOW: TRUE
SHOW_UNIT: True
X: 285
Y: 420
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
FONT_SIZE: 23
FONT_COLOR: 255, 255, 255
BACKGROUND_COLOR: 132, 154, 165
DISK:
INTERVAL: 10
USED:
GRAPH:
SHOW: True
X: 124
Y: 600
WIDTH: 178
HEIGHT: 15
MIN_VALUE: 0
MAX_VALUE: 100
BAR_COLOR: 0, 0, 255
BAR_OUTLINE: False
BACKGROUND_COLOR: 0, 0, 0
TEXT:
SHOW: TRUE
SHOW_UNIT: True
X: 204
Y: 625
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
FONT_SIZE: 23
FONT_COLOR: 255, 255, 255
BACKGROUND_COLOR: 132, 154, 165
TOTAL:
TEXT:
SHOW: TRUE
SHOW_UNIT: True
X: 204
Y: 652
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
FONT_SIZE: 23
FONT_COLOR: 255, 255, 255
BACKGROUND_COLOR: 132, 154, 165
FREE:
TEXT:
SHOW: TRUE
SHOW_UNIT: True
X: 204
Y: 679
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
FONT_SIZE: 23
FONT_COLOR: 255, 255, 255
BACKGROUND_COLOR: 132, 154, 165

DATE:
INTERVAL: 1
DAY:
TEXT:
SHOW: True
X: 15
Y: 740
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
FONT_SIZE: 25
FONT_COLOR: 255, 255, 255
BACKGROUND_COLOR: 132, 154, 165
HOUR:
TEXT:
SHOW: True
X: 15
Y: 768
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
FONT_SIZE: 25
FONT_COLOR: 255, 255, 255
BACKGROUND_COLOR: 132, 154, 165
Binary file added res/themes/5inchTheme2Radial/theme_example.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 12 additions & 1 deletion res/themes/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ STATS:
SHOW: False
GRAPH:
SHOW: False
RADIAL:
SHOW: False
FREQUENCY:
INTERVAL: 5
TEXT:
Expand All @@ -32,11 +34,15 @@ STATS:
PERCENTAGE:
GRAPH:
SHOW: False
RADIAL:
SHOW: False
TEXT:
SHOW: False
MEMORY:
GRAPH:
SHOW: False
RADIAL:
SHOW: False
TEXT:
SHOW: False
SHOW_UNIT: False
Expand All @@ -49,9 +55,13 @@ STATS:
SWAP:
GRAPH:
SHOW: False
RADIAL:
SHOW: False
VIRTUAL:
GRAPH:
SHOW: False
RADIAL:
SHOW: False
USED:
SHOW: False
SHOW_UNIT: False
Expand All @@ -66,6 +76,8 @@ STATS:
USED:
GRAPH:
SHOW: False
RADIAL:
SHOW: False
TEXT:
SHOW: False
SHOW_UNIT: False
Expand Down Expand Up @@ -116,4 +128,3 @@ STATS:
HOUR:
TEXT:
SHOW: False