Anshorei/epd-waveshare
1
0
Fork 0
mirror of https://github.com/Anshorei/epd-waveshare.git synced 2026-10-03 22:06:43 +00:00
Code Issues Projects Releases Wiki Activity

use PrimitiveStyle::with_stroke, not PrimitiveStyleBuilder

Browse Source
This commit is contained in:
Reinier Balt
2021-06-16 14:17:18 +02:00
parent 21428ff82f
commit dd9a09aff4
4 changed files with 13 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/epd1in54/graphics.rs
+5 -25
View File
@@ -67,7 +67,7 @@ mod tests {
use crate::graphics::{Display, DisplayRotation};
use embedded_graphics::{
prelude::*,
primitives::{Line, PrimitiveStyleBuilder},
primitives::{Line, PrimitiveStyle},
};
// test buffer length
@@ -90,12 +90,7 @@ mod tests {
fn graphics_rotation_0() {
let mut display = Display1in54::default();
let _ = Line::new(Point::new(0, 0), Point::new(7, 0))
.into_styled(
PrimitiveStyleBuilder::new()
.stroke_color(Black)
.stroke_width(1)
.build(),
)
.into_styled(PrimitiveStyle::with_stroke(Black, 1))
.draw(&mut display);
let buffer = display.buffer();
@@ -112,12 +107,7 @@ mod tests {
let mut display = Display1in54::default();
display.set_rotation(DisplayRotation::Rotate90);
let _ = Line::new(Point::new(0, 192), Point::new(0, 199))
.into_styled(
PrimitiveStyleBuilder::new()
.stroke_color(Black)
.stroke_width(1)
.build(),
)
.into_styled(PrimitiveStyle::with_stroke(Black, 1))
.draw(&mut display);
let buffer = display.buffer();
@@ -134,12 +124,7 @@ mod tests {
let mut display = Display1in54::default();
display.set_rotation(DisplayRotation::Rotate180);
let _ = Line::new(Point::new(192, 199), Point::new(199, 199))
.into_styled(
PrimitiveStyleBuilder::new()
.stroke_color(Black)
.stroke_width(1)
.build(),
)
.into_styled(PrimitiveStyle::with_stroke(Black, 1))
.draw(&mut display);
let buffer = display.buffer();
@@ -159,12 +144,7 @@ mod tests {
let mut display = Display1in54::default();
display.set_rotation(DisplayRotation::Rotate270);
let _ = Line::new(Point::new(199, 0), Point::new(199, 7))
.into_styled(
PrimitiveStyleBuilder::new()
.stroke_color(Black)
.stroke_width(1)
.build(),
)
.into_styled(PrimitiveStyle::with_stroke(Black, 1))
.draw(&mut display);
let buffer = display.buffer();
src/epd7in5_v2/graphics.rs
-4
View File
@@ -30,10 +30,6 @@ impl DrawTarget for Display7in5 {
fn draw_pixel(&mut self, pixel: Pixel<BinaryColor>) -> Result<(), Self::Error> {
self.draw_helper(WIDTH, HEIGHT, pixel)
}
// fn size(&self) -> Size {
// Size::new(WIDTH, HEIGHT)
// }
}
impl Display for Display7in5 {