mirrors/ili9341-rs
1
0
Fork 0
mirror of https://github.com/yuri91/ili9341-rs.git synced 2024-11-21 14:30:58 +00:00
Code Issues Projects Releases Wiki Activity

Rename draw methods

Browse source 
- Rename `draw_iter` to `draw_raw_iter` to avoid conflict with
`embedded_graphics_core::DrawTarget::draw_iter`

- Rename `draw_raw` to `draw_raw_slice` for consistency
This commit is contained in:
Grant Miller 2021-05-10 18:01:42 -05:00
parent 510d0c9a03
commit c93637abfd
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/graphics.rs
View file

@ -31,7 +31,7 @@ where
return Ok(()); return Ok(());
} }
self.draw_raw( self.draw_raw_slice(
pos.x as u16, pos.x as u16,
pos.y as u16, pos.y as u16,
pos.x as u16, pos.x as u16,
@ -64,7 +64,7 @@ where
let y0 = clamp(y0, h - 1); let y0 = clamp(y0, h - 1);
let x1 = clamp(x1, w - 1); let x1 = clamp(x1, w - 1);
let y1 = clamp(y1, h - 1); let y1 = clamp(y1, h - 1);
self.draw_iter( self.draw_raw_iter(
x0, x0,
y0, y0,
x1, x1,
@ -81,7 +81,7 @@ where
fn clear(&mut self, color: Rgb565) -> Result<(), Self::Error> { fn clear(&mut self, color: Rgb565) -> Result<(), Self::Error> {
let color = RawU16::from(color).into_inner(); let color = RawU16::from(color).into_inner();
self.draw_iter( self.draw_raw_iter(
0, 0,
0, 0,
(self.width - 1) as u16, (self.width - 1) as u16,

10
src/lib.rs
View file

@ -49,8 +49,7 @@ pub enum Orientation {
} }
/// There are two method for drawing to the screen: /// There are two method for drawing to the screen:
/// [draw_raw](struct.Ili9341.html#method.draw_raw) and /// [Ili9341::draw_raw_iter] and [Ili9341::draw_raw_slice]
/// [draw_iter](struct.Ili9341.html#method.draw_iter).
/// ///
/// In both cases the expected pixel format is rgb565. /// In both cases the expected pixel format is rgb565.
/// ///
@ -219,7 +218,7 @@ where
/// ///
/// The iterator is useful to avoid wasting memory by holding a buffer for /// The iterator is useful to avoid wasting memory by holding a buffer for
/// the whole screen when it is not necessary. /// the whole screen when it is not necessary.
pub fn draw_iter<I: IntoIterator<Item = u16>>( pub fn draw_raw_iter<I: IntoIterator<Item = u16>>(
&mut self, &mut self,
x0: u16, x0: u16,
y0: u16, y0: u16,
@ -240,9 +239,8 @@ where
/// video memory. /// video memory.
/// ///
/// The expected format is rgb565. /// The expected format is rgb565.
pub fn draw_raw(&mut self, x0: u16, y0: u16, x1: u16, y1: u16, data: &[u16]) -> Result { pub fn draw_raw_slice(&mut self, x0: u16, y0: u16, x1: u16, y1: u16, data: &[u16]) -> Result {
self.set_window(x0, y0, x1, y1)?; self.draw_raw_iter(x0, y0, x1, y1, data.iter().copied())
self.write_iter(data.iter().cloned())
} }
/// Change the orientation of the screen /// Change the orientation of the screen