From ec87e40c56035068d7bea63e74d9581c1abb5710 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 22 May 2021 16:59:34 +0200 Subject: [PATCH] Added line clipping unit tests & updated libopenui with Liang-Barsky line clipping --- radio/src/tests/lcd_480x272.cpp | 17 +++++++++++++++++ radio/src/tests/lines_480x272.png | Bin 0 -> 4962 bytes radio/src/thirdparty/libopenui | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 radio/src/tests/lines_480x272.png diff --git a/radio/src/tests/lcd_480x272.cpp b/radio/src/tests/lcd_480x272.cpp index bd617eab1..867828f1c 100644 --- a/radio/src/tests/lcd_480x272.cpp +++ b/radio/src/tests/lcd_480x272.cpp @@ -90,6 +90,23 @@ bool checkScreenshot_colorlcd(const BitmapBuffer* dc, const char* test) return true; } +TEST(Lcd_colorlcd, lines) +{ + BitmapBuffer dc(BMP_RGB565, LCD_W, LCD_H); + dc.clear(DEFAULT_BGCOLOR); + dc.setClippingRect(50, 400, 50, 230); + + for (int x = 10; x <= 100; x += 10) { + dc.drawLine(x, x, x + 200, x + 50, 0xF0, DEFAULT_COLOR); + } + + for (int x = 200; x >= 100; x -= 10) { + dc.drawLine(x, x, x - 50, x + 100, 0xF0, DEFAULT_COLOR); + } + + dc.clearClippingRect(); + EXPECT_TRUE(checkScreenshot_colorlcd(&dc, "lines")); +} TEST(Lcd_colorlcd, vline) { diff --git a/radio/src/tests/lines_480x272.png b/radio/src/tests/lines_480x272.png new file mode 100644 index 0000000000000000000000000000000000000000..86c6ceb11dbe0e82b0f6949e6ad8dbe58e8316f8 GIT binary patch literal 4962 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 OSjh_(CN(E!ZT%Mm8iQK^ literal 0 HcmV?d00001 diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 9067eaad5..fdf289100 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 9067eaad591456503ff977435bf2a9dc1b5a9201 +Subproject commit fdf289100013928330c08be5c74a05419e836ec5