Re #1926: SMLSIZE last line drawn, gtests expanded with LCD character overlapped test

This commit is contained in:
Damjan Adamic
2014-12-14 09:08:17 +01:00
parent 2d8eacd629
commit 34a2ed0419
10 changed files with 29 additions and 1 deletions
+1 -1
View File
@@ -113,7 +113,7 @@ void lcdPutPattern(coord_t x, coord_t y, const uint8_t * pattern, uint8_t width,
for (int8_t j=-1; j<=height; j++) {
bool plot;
if (j < 0 || j == height) {
if (j < 0 || ((j == height) && !(FONTSIZE(flags) == SMLSIZE))) {
plot = false;
if (height >= 12) continue;
if (j<0 && !inv) continue;
Binary file not shown.

Before

Width:  |  Height:  |  Size: 513 B

After

Width:  |  Height:  |  Size: 706 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 558 B

After

Width:  |  Height:  |  Size: 749 B

+28
View File
@@ -210,6 +210,13 @@ TEST(Lcd, Smlsize)
lcd_putsAtt(10, 22, "TESTgy,", SMLSIZE|INVERS);
lcd_filled_rect(8, 40, 100, 20);
lcd_putsAtt(10, 42, "TESTgy,", SMLSIZE);
bool invert = false;
for(int i=0; i<3; i++) {
lcd_putsAtt(40+(4*i), 0+(4*i), "ABC", SMLSIZE|(invert?INVERS:0));
invert = !invert;
}
EXPECT_TRUE(checkScreenshot("smlsize"));
}
@@ -220,6 +227,13 @@ TEST(Lcd, Stdsize)
lcd_putsAtt(10, 22, "TEST", INVERS);
lcd_filled_rect(8, 40, 100, 20);
lcd_putsAtt(10, 42, "TEST", 0);
bool invert = false;
for(int i=0; i<3; i++) {
lcd_putsAtt(40+(4*i), 0+(4*i), "ABC", (invert?INVERS:0));
invert = !invert;
}
EXPECT_TRUE(checkScreenshot("stdsize"));
}
@@ -230,6 +244,13 @@ TEST(Lcd, Midsize)
lcd_putsAtt(10, 22, "TEST", MIDSIZE|INVERS);
lcd_filled_rect(8, 40, 100, 20);
lcd_putsAtt(10, 42, "TEST", MIDSIZE);
bool invert = false;
for(int i=0; i<3; i++) {
lcd_putsAtt(40+(4*i), 0+(4*i), "ABC", MIDSIZE|(invert?INVERS:0));
invert = !invert;
}
EXPECT_TRUE(checkScreenshot("midsize"));
}
@@ -240,6 +261,13 @@ TEST(Lcd, Dblsize)
lcd_putsAtt(42, 10, "TST", DBLSIZE|INVERS);
lcd_filled_rect(80, 8, 46, 24);
lcd_putsAtt(82, 10, "TST", DBLSIZE);
bool invert = false;
for(int i=0; i<3; i++) {
lcd_putsAtt(10+(4*i), 30+(4*i), "ABC", DBLSIZE|(invert?INVERS:0));
invert = !invert;
}
EXPECT_TRUE(checkScreenshot("dblsize"));
}
#endif
Binary file not shown.

Before

Width:  |  Height:  |  Size: 503 B

After

Width:  |  Height:  |  Size: 694 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 532 B

After

Width:  |  Height:  |  Size: 730 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 527 B

After

Width:  |  Height:  |  Size: 657 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 560 B

After

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 483 B

After

Width:  |  Height:  |  Size: 590 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 507 B

After

Width:  |  Height:  |  Size: 619 B