X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fc_image.py;h=f26cfcf1c5a471cc33300f9dcf2b84677a22de7f;hp=0959150bd3d300fb6b2a1f07cf18e02bd40a4989;hb=99aa4140505613e38f4337d87f74524fb4ef9f23;hpb=0b176bc3c51336bbd44b1cd095bf84c0fe0ef74d diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py index 0959150..f26cfcf 100644 --- a/rainbowstream/c_image.py +++ b/rainbowstream/c_image.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from PIL import Image from os.path import join, dirname, getmtime, exists, expanduser from .config import * @@ -70,27 +71,25 @@ def image_to_display(path, start=None, length=None): i.load() width = min(w, length) height = int(float(h) * (float(width) / float(w))) - if c['HIGHER_RESOLUTION'] is False: - height //= 2 i = i.resize((width, height), Image.ANTIALIAS) height = min(height, c['IMAGE_MAX_HEIGHT']) - if c['HIGHER_RESOLUTION'] is True: - for real_y in xrange(height // 2): - sys.stdout.write(' ' * start) - for x in xrange(width): - y = real_y * 2 - p0 = i.getpixel((x, y)) - p1 = i.getpixel((x, y+1)) - block_print(p1, p0) - sys.stdout.write('\n') - else: - for y in xrange(height): - sys.stdout.write(' ' * start) - for x in xrange(width): - p = i.getpixel((x, y)) - pixel_print(p) - sys.stdout.write('\n') + for real_y in xrange(height // 2): + sys.stdout.write(' ' * start) + for x in xrange(width): + y = real_y * 2 + p0 = i.getpixel((x, y)) + p1 = i.getpixel((x, y+1)) + block_print(p1, p0) + sys.stdout.write('\n') + + # Old code for display one pixel on one terminal block + # for y in xrange(height): + # sys.stdout.write(' ' * start) + # for x in xrange(width): + # p = i.getpixel((x, y)) + # pixel_print(p) + # sys.stdout.write('\n') """