mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
cleanup qr code rendering
This commit is contained in:
parent
4f9584ec9e
commit
13cdb9d64b
1 changed files with 7 additions and 12 deletions
|
|
@ -424,28 +424,23 @@ pub fn render_qr<T: FrameBuffer>(
|
||||||
let total_width = qr_render.width as isize + QUIET_MODULES * 2;
|
let total_width = qr_render.width as isize + QUIET_MODULES * 2;
|
||||||
let module_width = (window_width / total_width).max(1) as isize;
|
let module_width = (window_width / total_width).max(1) as isize;
|
||||||
let left_edge = if module_width * total_width < window_width {
|
let left_edge = if module_width * total_width < window_width {
|
||||||
(window_width - (module_width * total_width)) as isize / 2
|
(window_width - module_width * total_width) as isize / 2
|
||||||
} else {
|
} else {
|
||||||
0
|
0
|
||||||
};
|
};
|
||||||
|
|
||||||
const USE_TOP_LEFT: bool = false;
|
let tl = qr_render.top_left;
|
||||||
let tl = if USE_TOP_LEFT { qr_render.top_left } else { Point::new(0, 0) };
|
|
||||||
|
|
||||||
// draw a white background over the rendering area
|
// draw a white background over the rendering area
|
||||||
let r = Rectangle::new_with_style(
|
let mut r = screensize.clone();
|
||||||
Point::from((left_edge, tl.y)),
|
r.style = DrawStyle::new(PixelColor::Light, PixelColor::Light, 1);
|
||||||
screen_clip.unwrap_or(screensize).br,
|
|
||||||
DrawStyle::new(PixelColor::Light, PixelColor::Light, 1),
|
|
||||||
);
|
|
||||||
op::rectangle(display, r, screen_clip.into(), false);
|
op::rectangle(display, r, screen_clip.into(), false);
|
||||||
|
|
||||||
// now raster in the modules
|
// now raster in the modules
|
||||||
// TODO: on dense codes, the dark colors are over-sized by a pixel. Figure this out.
|
|
||||||
// TODO: on smaller than optimal codes, align the QR code into the center of the screen.
|
|
||||||
let mut line_top_left =
|
let mut line_top_left =
|
||||||
Point::new(left_edge + module_width * QUIET_MODULES, tl.y + module_width * QUIET_MODULES);
|
Point::new(left_edge + tl.x + module_width * QUIET_MODULES, tl.y + module_width * QUIET_MODULES);
|
||||||
let dark = DrawStyle::new(PixelColor::Dark, PixelColor::Dark, 0);
|
let dark = DrawStyle { fill_color: Some(PixelColor::Dark), stroke_color: None, stroke_width: 0 };
|
||||||
|
// log::info!("left edge: {} module width: {}", left_edge, module_width);
|
||||||
for line in qr_render.modules.chunks(qr_render.width) {
|
for line in qr_render.modules.chunks(qr_render.width) {
|
||||||
for (i, &module) in line.iter().enumerate() {
|
for (i, &module) in line.iter().enumerate() {
|
||||||
if module {
|
if module {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue