m.giller/E-Paper-Calendar
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

Develop fast render #2

Merged
mgfcf merged 4 commits from develop_fast-render into master 2019-04-17 16:52:57 +02:00
Conversation 0 Commits 4 Files changed 4 +14 -27
1 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e997c440d7 - Show all commits

41
Calendar/Epd7in5bAdapter.py
View file

@ -2,6 +2,7 @@ from EpdAdapter import EpdAdapter, DISPLAY_REFRESH, DATA_START_TRANSMISSION_1
from settings import display_colours from settings import display_colours
from PIL import Image, ImageDraw from PIL import Image, ImageDraw
from math import sqrt, pow from math import sqrt, pow
import numpy as np
class Epd7in5bAdapter (EpdAdapter): class Epd7in5bAdapter (EpdAdapter):
def __init__ (self): def __init__ (self):
@ -40,46 +41,32 @@ class Epd7in5bAdapter (EpdAdapter):
def get_frame_buffer (self, image): def get_frame_buffer (self, image):
buf = [ 0x00 ] * int(self.height * self.width / 4) buf = [ 0x00 ] * int(self.height * self.width / 4)
image_rgb = image imwidth, imheight = image.size
imwidth, imheight = image_rgb.size
if imwidth != self.height or imheight != self.width: if imwidth != self.height or imheight != self.width:
raise ValueError('Image must be same dimensions as display \ raise ValueError('Image must be same dimensions as display \
({0}x{1}).' .format(self.height, self.width)) ({0}x{1}).' .format(self.height, self.width))
image_buf = self.__prepare_image__(image)
for x in range(self.width): for x in range(self.width):
for y in range(self.height): for y in range(self.height):
# Set the bits for the column of pixels at the current # Set the bits for the column of pixels at the current
# position. # position.
pixel = image_rgb.getpixel((y, x)) if image_buf[x, y, 1] == 255: #White
color = self.__get_color__(pixel)
if color is 'white':
buf[int((y + x * self.height) / 4)] |= 0xC0 >> (y % 4 * 2) buf[int((y + x * self.height) / 4)] |= 0xC0 >> (y % 4 * 2)
elif color is 'black': elif image_buf[x, y, 0] == 0: #Black
buf[int((y + x * self.height) / 4)] &= ~(0xC0 >> (y % 4 * 2)) buf[int((y + x * self.height) / 4)] &= ~(0xC0 >> (y % 4 * 2))
if color is 'red': else: #Red
buf[int((y + x * self.height) / 4)] &= ~(0xC0 >> (y % 4 * 2)) buf[int((y + x * self.height) / 4)] &= ~(0xC0 >> (y % 4 * 2))
buf[int((y + x * self.height) / 4)] |= 0x40 >> (y % 4 * 2) buf[int((y + x * self.height) / 4)] |= 0x40 >> (y % 4 * 2)
return buf #due to python2 -> python3, int had to be added in 'get_frame return buf
#_buffer
def __get_color__ (self, pixel): def __prepare_image__(self, image):
color_percent = self.__get_color_percentage__(pixel) buffer = np.array(image)
brightness = self.__brightness__(pixel) r,g = buffer[:,:,0], buffer[:,:,1]
if brightness > 240: buffer[np.logical_and(r > 240, g > 240)] = [255,255,255]
return 'white' buffer[r > g] = [255,0,0]
elif color_percent[0] > 35: buffer[r != 255] = [0,0,0]
return 'red' return buffer
else:
return 'black'
def __get_color_percentage__ (self, pixel):
sum = pixel[0] + pixel[1] + pixel[2]
if sum is 0:
return (0,0,0)
return (pixel[0] / sum * 100, pixel[1] / sum * 100, pixel[2] / sum * 100)
def __brightness__ (self, pixel):
return (pixel[0] + pixel[1] + pixel[2]) / 3
def calibrate (self): def calibrate (self):
for _ in range(2): for _ in range(2):