laantungir/seedsigner
1
0
Fork 0
mirror of https://github.com/SeedSigner/seedsigner.git synced 2026-10-06 07:28:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renderer support for max speed

Browse Source
This commit is contained in:
kdmukai
2023-07-24 20:54:42 -05:00
parent 03389bf437
commit b01a4c068a
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/seedsigner/gui/renderer.py
+6 -1
View File
@@ -34,7 +34,12 @@ class Renderer(ConfigurableSingleton):
renderer.draw = ImageDraw.Draw(renderer.canvas)
def show_image(self, image=None, alpha_overlay=None):
def show_image(self, image=None, alpha_overlay=None, show_direct=False):
if show_direct:
# Use the incoming image as the canvas and immediately render
self.disp.ShowImage(image, 0, 0)
return
if alpha_overlay:
if image == None:
image = self.canvas
src/seedsigner/gui/screens/scan_screens.py
+7 -7
View File
@@ -44,7 +44,7 @@ class ScanScreen(BaseScreen):
decoder: DecodeQR = None
instructions_text: str = "< back | Scan a QR code"
resolution: tuple[int,int] = (480, 480)
framerate: int = 5 # TODO: alternate optimization for Pi Zero 2W
framerate: int = 5 # TODO: alternate optimization for Pi Zero 2W?
render_rect: tuple[int,int,int,int] = None
@@ -110,18 +110,20 @@ class ScanScreen(BaseScreen):
if frame.width > self.render_width or frame.height > self.render_height:
frame = frame.resize(
(self.render_width, self.render_height),
resample=Image.NEAREST
resample=Image.NEAREST # Use nearest neighbor for max speed
)
draw = ImageDraw.Draw(frame)
if scan_text:
# Note: shadowed text (adding a 'stroke' outline) can
# significantly slow down the rendering.
# Temp solution: render a slight 1px shadow behind the text
# TODO: Replace the instructions_text with a disappearing
# toast/popup (see: QR Brightness UI)?
draw.text(xy=(
int(self.renderer.canvas_width/2 + 1),
self.renderer.canvas_height - GUIConstants.EDGE_PADDING + 1
int(self.renderer.canvas_width/2 + 2),
self.renderer.canvas_height - GUIConstants.EDGE_PADDING + 2
),
text=scan_text,
fill="black",
@@ -138,7 +140,7 @@ class ScanScreen(BaseScreen):
font=instructions_font,
anchor="ms")
self.renderer.disp.ShowImage(frame, 0, 0)
self.renderer.show_image(frame, show_direct=True)
# print(f" {cur_fps:0.2f} | {self.decoder_fps}")
if self.camera._video_stream is None:
@@ -156,7 +158,6 @@ class ScanScreen(BaseScreen):
while True:
frame = self.camera.read_video_stream()
if frame is not None:
# print("Decoder checking next frame")
status = self.decoder.add_image(frame)
num_frames += 1
@@ -167,7 +168,6 @@ class ScanScreen(BaseScreen):
self.camera.stop_video_stream_mode()
break
# TODO: KEY_UP gives control to NavBar; use its back arrow to cancel
if self.hw_inputs.check_for_low(HardwareButtonsConstants.KEY_RIGHT) or self.hw_inputs.check_for_low(HardwareButtonsConstants.KEY_LEFT):
self.camera.stop_video_stream_mode()
break