Anshorei
/
epd-waveshare
mirror of https://github.com/Anshorei/epd-waveshare
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix remaining PrimitiveStyleBuilder conversions

main
Reinier Balt 5 years ago
parent
dd9a09aff4
commit
5622627c1f
8 changed files with 25 additions and 98 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Cargo.toml
  2. 30
      src/epd2in13_v2/graphics.rs
  3. 8
      src/epd2in9/mod.rs
  4. 30
      src/epd4in2/graphics.rs
  5. 8
      src/epd4in2/mod.rs
  6. 25
      src/graphics.rs
  7. 9
      src/lib.rs
  8. 11
      src/traits.rs

2
Cargo.toml
Unescape View File

@ -16,7 +16,7 @@ edition = "2018"
# travis-ci = { repository = "caemor/epd-waveshare" }
[dependencies]
embedded-graphics = { version = "0.7.0", optional = true}
embedded-graphics = { version = "0.7.1", optional = true}
embedded-graphics-core = { version = "0.3.2", optional = true}
embedded-hal = {version = "0.2.4", features = ["unproven"]}
bit_field = "0.10.1"

30
src/epd2in13_v2/graphics.rs
Unescape View File

@ -70,7 +70,7 @@ mod tests {
use crate::graphics::{Display, DisplayRotation};
use embedded_graphics::{
prelude::*,
primitives::{Line, PrimitiveStyleBuilder},
primitives::{Line, PrimitiveStyle},
};
// test buffer length
@ -94,12 +94,7 @@ mod tests {
let mut display = Display2in13::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();
@ -120,12 +115,7 @@ mod tests {
Point::new(0, (WIDTH - 8) as i32),
Point::new(0, (WIDTH - 1) as i32),
)
.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();
@ -146,12 +136,7 @@ mod tests {
Point::new((WIDTH - 8) as i32, (HEIGHT - 1) as i32),
Point::new((WIDTH - 1) as i32, (HEIGHT - 1) as i32),
)
.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();
@ -172,12 +157,7 @@ mod tests {
Point::new((HEIGHT - 1) as i32, 0),
Point::new((HEIGHT - 1) as i32, 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();

8
src/epd2in9/mod.rs
Unescape View File

@ -7,7 +7,7 @@
//!# use embedded_hal_mock::*;
//!# fn main() -> Result<(), MockError> {
//!use embedded_graphics::{
//! pixelcolor::BinaryColor::On as Black, prelude::*, primitives::{Line, PrimitiveStyleBuilder},
//! pixelcolor::BinaryColor::On as Black, prelude::*, primitives::{Line, PrimitiveStyle},
//!};
//!use epd_waveshare::{epd2in9::*, prelude::*};
//!#
@ -27,12 +27,8 @@
//!let mut display = Display2in9::default();
//!
//!// Use embedded graphics for drawing a line
//!let style = PrimitiveStyleBuilder::new()
//! .stroke_color(Black)
//! .stroke_width(1)
//! .build();
//!let _ = Line::new(Point::new(0, 120), Point::new(0, 295))
//! .into_styled(style)
//! .into_styled(PrimitiveStyle::with_stroke(Black, 1))
//! .draw(&mut display);
//!
//! // Display updated frame

30
src/epd4in2/graphics.rs
Unescape View File

@ -69,7 +69,7 @@ mod tests {
use crate::graphics::{Display, DisplayRotation};
use embedded_graphics::{
prelude::*,
primitives::{Line, PrimitiveStyleBuilder},
primitives::{Line, PrimitiveStyle},
};
// test buffer length
@ -92,12 +92,7 @@ mod tests {
fn graphics_rotation_0() {
let mut display = Display4in2::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();
@ -114,12 +109,7 @@ mod tests {
let mut display = Display4in2::default();
display.set_rotation(DisplayRotation::Rotate90);
let _ = Line::new(Point::new(0, 392), Point::new(0, 399))
.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();
@ -137,12 +127,7 @@ mod tests {
display.set_rotation(DisplayRotation::Rotate180);
let _ = Line::new(Point::new(392, 299), Point::new(399, 299))
.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();
@ -162,12 +147,7 @@ mod tests {
let mut display = Display4in2::default();
display.set_rotation(DisplayRotation::Rotate270);
let _ = Line::new(Point::new(299, 0), Point::new(299, 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();

8
src/epd4in2/mod.rs
Unescape View File

@ -11,7 +11,7 @@
//!# use embedded_hal_mock::*;
//!# fn main() -> Result<(), MockError> {
//!use embedded_graphics::{
//! pixelcolor::BinaryColor::On as Black, prelude::*, primitives::{Line, PrimitiveStyleBuilder},
//! pixelcolor::BinaryColor::On as Black, prelude::*, primitives::{Line, PrimitiveStyle},
//!};
//!use epd_waveshare::{epd4in2::*, prelude::*};
//!#
@ -31,12 +31,8 @@
//!let mut display = Display4in2::default();
//!
//!// Use embedded graphics for drawing a line
//!let style = PrimitiveStyleBuilder::new()
//! .stroke_color(Black)
//! .stroke_width(1)
//! .build();
//!let _ = Line::new(Point::new(0, 120), Point::new(0, 295))
//! .into_styled(style)
//! .into_styled(PrimitiveStyle::with_stroke(Black, 1))
//! .draw(&mut display);
//!
//! // Display updated frame

25
src/graphics.rs
Unescape View File

@ -241,7 +241,7 @@ pub trait OctDisplay: DrawTarget<Color = OctColor> {
/// # use epd_waveshare::graphics::VarDisplay;
/// # use epd_waveshare::color::Black;
/// # use embedded_graphics::prelude::*;
/// # use embedded_graphics::primitives::{Circle, Line, PrimitiveStyleBuilder};
/// # use embedded_graphics::primitives::{Circle, Line, PrimitiveStyle};
/// let width = 128;
/// let height = 296;
///
@ -250,13 +250,8 @@ pub trait OctDisplay: DrawTarget<Color = OctColor> {
///
/// display.set_rotation(DisplayRotation::Rotate90);
///
///let style = PrimitiveStyleBuilder::new()
/// .stroke_color(Black)
/// .stroke_width(1)
/// .build();
///
/// let _ = Line::new(Point::new(0, 120), Point::new(0, 295))
/// .into_styled(style)
/// .into_styled(PrimitiveStyle::with_stroke(Black, 1))
/// .draw(&mut display);
/// ```
pub struct VarDisplay<'a> {
@ -395,7 +390,7 @@ mod tests {
use crate::color::Color;
use embedded_graphics::{
prelude::*,
primitives::{Line, PrimitiveStyleBuilder},
primitives::{Line, PrimitiveStyle},
};
#[test]
@ -453,12 +448,7 @@ mod tests {
let mut display = VarDisplay::new(width, height, &mut buffer);
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();
@ -482,12 +472,7 @@ mod tests {
display.set_rotation(DisplayRotation::Rotate90);
let _ = Line::new(Point::new(0, 120), Point::new(0, 295))
.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();

9
src/lib.rs
Unescape View File

@ -14,7 +14,7 @@
//!# use embedded_hal_mock::*;
//!# fn main() -> Result<(), MockError> {
//!use embedded_graphics::{
//! pixelcolor::BinaryColor::On as Black, prelude::*, primitives::{Line, PrimitiveStyleBuilder},
//! pixelcolor::BinaryColor::On as Black, prelude::*, primitives::{Line, PrimitiveStyle},
//!};
//!use epd_waveshare::{epd1in54::*, prelude::*};
//!#
@ -35,13 +35,8 @@
//!
//!// Use embedded graphics for drawing a line
//!
//!let style = PrimitiveStyleBuilder::new()
//! .stroke_color(Black)
//! .stroke_width(1)
//! .build();
//!
//!let _ = Line::new(Point::new(0, 120), Point::new(0, 295))
//! .into_styled(style)
//! .into_styled(PrimitiveStyle::with_stroke(Black, 1))
//! .draw(&mut display);
//!
//! // Display updated frame

11
src/traits.rs
Unescape View File

@ -92,7 +92,7 @@ where
///# use embedded_hal_mock::*;
///# fn main() -> Result<(), MockError> {
///use embedded_graphics::{
/// pixelcolor::BinaryColor::On as Black, prelude::*, primitives::{Line, PrimitiveStyleBuilder},
/// pixelcolor::BinaryColor::On as Black, prelude::*, primitives::{Line, PrimitiveStyle},
///};
///use epd_waveshare::{epd4in2::*, prelude::*};
///#
@ -113,13 +113,8 @@ where
///
///// Use embedded graphics for drawing a line
///
///let style = PrimitiveStyleBuilder::new()
/// .stroke_color(Black)
/// .stroke_width(1)
/// .build();
///
///let _ = Line::new(Point::new(0, 120), Point::new(0, 295))
/// .into_styled(style)
/// .into_styled(PrimitiveStyle::with_stroke(Black, 1))
/// .draw(&mut display);
///
/// // Display updated frame
@ -254,7 +249,7 @@ where
///# use embedded_hal_mock::*;
///# fn main() -> Result<(), MockError> {
///# use embedded_graphics::{
///# pixelcolor::BinaryColor::On as Black, prelude::*, primitives::{Line, PrimitiveStyleBuilder},
///# pixelcolor::BinaryColor::On as Black, prelude::*, primitives::{Line, PrimitiveStyle},
///# };
///# use epd_waveshare::{epd4in2::*, prelude::*};
///# use epd_waveshare::graphics::VarDisplay;

Write Preview
Loading…
Cancel
Save