Added flag to enable higher resolution printing
[rainbowstream.git] / rainbowstream / c_image.py
index e1bdae4..a1395f3 100644 (file)
@@ -24,10 +24,12 @@ def call_c():
 rgb2short = call_c()
 
 
-def pixel_print(ansicolor):
+def pixel_print(pixel):
     """
     Print a pixel with given Ansi color
     """
+    r, g, b = pixel[:3]
+    ansicolor = rgb2short(r, g, b)
     sys.stdout.write('\033[48;5;%sm \033[0m' % (ansicolor))
 
 
@@ -63,17 +65,27 @@ 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'])
 
-    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')
+    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')
 
 
 """