Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-22 13:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed the issue that graph draws out of the boundary. (#6651)

Browse source
This commit is contained in:
chiahsing 2024-04-29 03:49:27 +08:00 committed by GitHub
parent 5142d294f5
commit 8b6a358452
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
esphome/components/graph/graph.cpp
View file

@ -177,22 +177,26 @@ void Graph::draw(Display *buff, uint16_t x_offset, uint16_t y_offset, Color colo
bool b = (trace->get_line_type() & bit) == bit; bool b = (trace->get_line_type() & bit) == bit;
if (b) { if (b) {
int16_t y = (int16_t) roundf((this->height_ - 1) * (1.0 - v)) - thick / 2 + y_offset; int16_t y = (int16_t) roundf((this->height_ - 1) * (1.0 - v)) - thick / 2 + y_offset;
auto draw_pixel_at = [&buff, c, y_offset, this](int16_t x, int16_t y) {
if (y >= y_offset && y < y_offset + this->height_)
buff->draw_pixel_at(x, y, c);
};
if (!continuous || !has_prev || !prev_b || (abs(y - prev_y) <= thick)) { if (!continuous || !has_prev || !prev_b || (abs(y - prev_y) <= thick)) {
for (int16_t t = 0; t < thick; t++) { for (int16_t t = 0; t < thick; t++) {
buff->draw_pixel_at(x, y + t, c); draw_pixel_at(x, y + t);
} }
} else { } else {
int16_t mid_y = (y + prev_y + thick) / 2; int16_t mid_y = (y + prev_y + thick) / 2;
if (y > prev_y) { if (y > prev_y) {
for (int16_t t = prev_y + thick; t <= mid_y; t++) for (int16_t t = prev_y + thick; t <= mid_y; t++)
buff->draw_pixel_at(x + 1, t, c); draw_pixel_at(x + 1, t);
for (int16_t t = mid_y + 1; t < y + thick; t++) for (int16_t t = mid_y + 1; t < y + thick; t++)
buff->draw_pixel_at(x, t, c); draw_pixel_at(x, t);
} else { } else {
for (int16_t t = prev_y - 1; t >= mid_y; t--) for (int16_t t = prev_y - 1; t >= mid_y; t--)
buff->draw_pixel_at(x + 1, t, c); draw_pixel_at(x + 1, t);
for (int16_t t = mid_y - 1; t >= y; t--) for (int16_t t = mid_y - 1; t >= y; t--)
buff->draw_pixel_at(x, t, c); draw_pixel_at(x, t);
} }
} }
prev_y = y; prev_y = y;