Merge pull request #31 from FoamyGuy/resample_methods
add a way to specify resample method for xdisplay_mirror
This commit is contained in:
commit
b19b6c7cb0
1 changed files with 13 additions and 3 deletions
|
|
@ -20,12 +20,19 @@ This example command will mirror a 128x128 pixel square from the top left of the
|
||||||
|
|
||||||
import click
|
import click
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from PIL import ImageEnhance, ImageGrab
|
from PIL import Image, ImageEnhance, ImageGrab
|
||||||
|
|
||||||
import adafruit_blinka_raspberry_pi5_piomatter as piomatter
|
import adafruit_blinka_raspberry_pi5_piomatter as piomatter
|
||||||
import adafruit_blinka_raspberry_pi5_piomatter.click as piomatter_click
|
import adafruit_blinka_raspberry_pi5_piomatter.click as piomatter_click
|
||||||
from adafruit_blinka_raspberry_pi5_piomatter.pixelmappers import simple_multilane_mapper
|
from adafruit_blinka_raspberry_pi5_piomatter.pixelmappers import simple_multilane_mapper
|
||||||
|
|
||||||
|
RESAMPLE_MAP = {
|
||||||
|
"nearest": Image.NEAREST,
|
||||||
|
"bilinear": Image.BILINEAR,
|
||||||
|
"lanczos": Image.LANCZOS,
|
||||||
|
"bicubic": Image.BICUBIC
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@click.command
|
@click.command
|
||||||
@click.option("--mirror-region", help="Region of X display to mirror. Comma seperated x,y,w,h. "
|
@click.option("--mirror-region", help="Region of X display to mirror. Comma seperated x,y,w,h. "
|
||||||
|
|
@ -33,9 +40,12 @@ from adafruit_blinka_raspberry_pi5_piomatter.pixelmappers import simple_multilan
|
||||||
@click.option("--x-display", help="The X display to mirror. Default is :0", default=":0")
|
@click.option("--x-display", help="The X display to mirror. Default is :0", default=":0")
|
||||||
@click.option("--brightness", help="The brightness factor of the image output to the matrix",
|
@click.option("--brightness", help="The brightness factor of the image output to the matrix",
|
||||||
default=1.0, type=click.FloatRange(min=0.1, max=1.0))
|
default=1.0, type=click.FloatRange(min=0.1, max=1.0))
|
||||||
|
@click.option("--resample-method", type=click.Choice(RESAMPLE_MAP), default="nearest",
|
||||||
|
help="The resample method for PIL to use when resizing the screen image. Default is nearest")
|
||||||
@piomatter_click.standard_options(n_lanes=2, n_temporal_planes=0)
|
@piomatter_click.standard_options(n_lanes=2, n_temporal_planes=0)
|
||||||
def main(width, height, serpentine, rotation, pinout, n_planes,
|
def main(width, height, serpentine, rotation, pinout, n_planes,
|
||||||
n_temporal_planes, n_addr_lines, n_lanes, mirror_region, x_display, brightness):
|
n_temporal_planes, n_addr_lines, n_lanes, mirror_region, x_display, resample_method, brightness):
|
||||||
|
|
||||||
if n_lanes != 2:
|
if n_lanes != 2:
|
||||||
pixelmap = simple_multilane_mapper(width, height, n_addr_lines, n_lanes)
|
pixelmap = simple_multilane_mapper(width, height, n_addr_lines, n_lanes)
|
||||||
geometry = piomatter.Geometry(width=width, height=height, n_planes=n_planes, n_addr_lines=n_addr_lines,
|
geometry = piomatter.Geometry(width=width, height=height, n_planes=n_planes, n_addr_lines=n_addr_lines,
|
||||||
|
|
@ -64,7 +74,7 @@ def main(width, height, serpentine, rotation, pinout, n_planes,
|
||||||
if brightness != 1.0:
|
if brightness != 1.0:
|
||||||
darkener = ImageEnhance.Brightness(img)
|
darkener = ImageEnhance.Brightness(img)
|
||||||
img = darkener.enhance(brightness)
|
img = darkener.enhance(brightness)
|
||||||
img = img.resize((width, height))
|
img = img.resize((width, height), RESAMPLE_MAP[resample_method])
|
||||||
|
|
||||||
framebuffer[:, :] = np.array(img)
|
framebuffer[:, :] = np.array(img)
|
||||||
matrix.show()
|
matrix.show()
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue