iicd/Inkycal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rendering improvements

Browse Source 
Updated release tag, switched from dithering to self-defined colour-optimisation function 'optimise_colours' for better rendering
This commit is contained in:
Ace
2020-02-12 09:32:20 +01:00
committed by GitHub
parent 5e4d33c4ab
commit 2e9e2b80bb
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/inkycal.py
View File

@@ -1,7 +1,7 @@
#!/usr/bin/python3 #!/usr/bin/python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
v1.7.1 v1.7.2
Main file of Inky-Calendar software. Creates dynamic images for each section, Main file of Inky-Calendar software. Creates dynamic images for each section,
assembles them and sends it to the E-Paper assembles them and sends it to the E-Paper
@@ -74,11 +74,11 @@ while True:
"""----------------------top-section-image-----------------------------""" """----------------------top-section-image-----------------------------"""
try: try:
top_section_module.main() top_section_module.main()
top_section_image = Image.open(image_path + top_section+'.png').convert('1', dither=True) top_section_image = Image.open(image_path + top_section+'.png')
image.paste(top_section_image, (0, 0)) image.paste(top_section_image, (0, 0))
if three_colour_support == True: if three_colour_support == True:
top_section_image_col = Image.open(image_path + top_section+'_col.png').convert('1', dither=True) top_section_image_col = Image.open(image_path + top_section+'_col.png')
image_col.paste(top_section_image_col, (0, 0)) image_col.paste(top_section_image_col, (0, 0))
except Exception as error: except Exception as error:
@@ -88,11 +88,11 @@ while True:
"""----------------------middle-section-image---------------------------""" """----------------------middle-section-image---------------------------"""
try: try:
middle_section_module.main() middle_section_module.main()
middle_section_image = Image.open(image_path + middle_section+'.png').convert('1', dither=True) middle_section_image = Image.open(image_path + middle_section+'.png')
image.paste(middle_section_image, (0, middle_section_offset)) image.paste(middle_section_image, (0, middle_section_offset))
if three_colour_support == True: if three_colour_support == True:
middle_section_image_col = Image.open(image_path + middle_section+'_col.png').convert('1', dither=True) middle_section_image_col = Image.open(image_path + middle_section+'_col.png')
image_col.paste(middle_section_image_col, (0, middle_section_offset)) image_col.paste(middle_section_image_col, (0, middle_section_offset))
except Exception as error: except Exception as error:
@@ -103,11 +103,11 @@ while True:
"""----------------------bottom-section-image---------------------------""" """----------------------bottom-section-image---------------------------"""
try: try:
bottom_section_module.main() bottom_section_module.main()
bottom_section_image = Image.open(image_path + bottom_section+'.png').convert('1', dither=True) bottom_section_image = Image.open(image_path + bottom_section+'.png')
image.paste(bottom_section_image, (0, bottom_section_offset)) image.paste(bottom_section_image, (0, bottom_section_offset))
if three_colour_support == True: if three_colour_support == True:
bottom_section_image_col = Image.open(image_path + bottom_section+'_col.png').convert('1', dither=True) bottom_section_image_col = Image.open(image_path + bottom_section+'_col.png')
image_col.paste(bottom_section_image_col, (0, bottom_section_offset)) image_col.paste(bottom_section_image_col, (0, bottom_section_offset))
except Exception as error: except Exception as error:
@@ -120,8 +120,11 @@ while True:
if three_colour_support == True: if three_colour_support == True:
image_col = image_col.rotate(180, expand=True) image_col = image_col.rotate(180, expand=True)
image = optimise_colours(image)
image.save(image_path + 'canvas.png') image.save(image_path + 'canvas.png')
if three_colour_support == True: if three_colour_support == True:
image_col = optimise_colours(image_col)
image_col.save(image_path+'canvas_col.png') image_col.save(image_path+'canvas_col.png')
"""---------Refreshing E-Paper with newly created image-----------""" """---------Refreshing E-Paper with newly created image-----------"""
@@ -136,7 +139,7 @@ while True:
print('Done') print('Done')
else: else:
print('Sending image data and refreshing display...', end='') print('Sending image data and refreshing display...', end='')
epaper.display(epaper.getbuffer(image.convert('1', dither=True))) epaper.display(epaper.getbuffer(image))
print('Done') print('Done')
print('Sending E-Paper to deep sleep...', end = '') print('Sending E-Paper to deep sleep...', end = '')