working image compression
This commit is contained in:
		
							
								
								
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -1 +1,2 @@
 | 
				
			|||||||
keys.py
 | 
					keys.py
 | 
				
			||||||
 | 
					*.pyc
 | 
				
			||||||
@@ -1,4 +1,6 @@
 | 
				
			|||||||
from PIL import Image
 | 
					from PIL import Image
 | 
				
			||||||
 | 
					import io
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class ImageShrink:
 | 
					class ImageShrink:
 | 
				
			||||||
    """Shrinks a given image (bytearray) to a given resolution (width, height)"""
 | 
					    """Shrinks a given image (bytearray) to a given resolution (width, height)"""
 | 
				
			||||||
@@ -7,20 +9,23 @@ class ImageShrink:
 | 
				
			|||||||
    def __init__(self) -> None:
 | 
					    def __init__(self) -> None:
 | 
				
			||||||
        pass
 | 
					        pass
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def convert(self, image: bytearray) -> bytearray:
 | 
					    def convert(self, image: bytearray) -> Image:
 | 
				
			||||||
 | 
					        # load image from bytearray
 | 
				
			||||||
 | 
					        image = Image.open(io.BytesIO(image))
 | 
				
			||||||
 | 
					        image.show()
 | 
				
			||||||
        image = self.shrink(image)
 | 
					        image = self.shrink(image)
 | 
				
			||||||
 | 
					        image.show()
 | 
				
			||||||
        image = self.convert_to_black_and_white(image)
 | 
					        image = self.convert_to_black_and_white(image)
 | 
				
			||||||
        image.show()
 | 
					        image.show()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def shrink(self, image: bytearray) -> bytearray:
 | 
					    def shrink(self, image: Image) -> Image:
 | 
				
			||||||
        """"Shrinks a given image (bytearray) to a given resolution (width, height)"""
 | 
					        """"Shrinks a given image (bytearray) to a given resolution (width, height)"""
 | 
				
			||||||
        img = Image.frombytes()
 | 
					        image.thumbnail(self.resolution)
 | 
				
			||||||
        img = Image.open(image)
 | 
					        return image
 | 
				
			||||||
        img.thumbnail(self.resolution)
 | 
					
 | 
				
			||||||
        return img
 | 
					
 | 
				
			||||||
    
 | 
					    def convert_to_black_and_white(self, image: Image) -> Image:
 | 
				
			||||||
    def convert_to_black_and_white(self, image: bytearray) -> bytearray:
 | 
					        # img = Image.open(image)
 | 
				
			||||||
        img = Image.open(image)
 | 
					        image = image.convert("L")
 | 
				
			||||||
        img = img.convert("L")
 | 
					        return image
 | 
				
			||||||
        return img
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,6 +8,7 @@ import keys
 | 
				
			|||||||
class ImageGetException(Exception):
 | 
					class ImageGetException(Exception):
 | 
				
			||||||
    pass
 | 
					    pass
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class ImageGetter:
 | 
					class ImageGetter:
 | 
				
			||||||
    headers = {
 | 
					    headers = {
 | 
				
			||||||
        "x-api-key": keys.immich_api_key
 | 
					        "x-api-key": keys.immich_api_key
 | 
				
			||||||
@@ -40,7 +41,6 @@ class ImageGetter:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def get_image_file(self, image_id: str) -> bytearray:
 | 
					    def get_image_file(self, image_id: str) -> bytearray:
 | 
				
			||||||
 | 
					 | 
				
			||||||
        url = keys.immich_api_root_url + "asset/download/" + image_id
 | 
					        url = keys.immich_api_root_url + "asset/download/" + image_id
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        headers = self.headers | {"Accept": "application/octet-stream"}
 | 
					        headers = self.headers | {"Accept": "application/octet-stream"}
 | 
				
			||||||
@@ -49,8 +49,3 @@ class ImageGetter:
 | 
				
			|||||||
            raise ImageGetException("Error in step get_image_file: " + str(response.status_code))
 | 
					            raise ImageGetException("Error in step get_image_file: " + str(response.status_code))
 | 
				
			||||||
            
 | 
					            
 | 
				
			||||||
        return response.content
 | 
					        return response.content
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
T = ImageGetter()
 | 
					 | 
				
			||||||
# print(T.get_random_image())
 | 
					 | 
				
			||||||
T.get_random_image()
 | 
					 | 
				
			||||||
@@ -0,0 +1,69 @@
 | 
				
			|||||||
 | 
					import time
 | 
				
			||||||
 | 
					from PIL import Image,ImageDraw,ImageFont
 | 
				
			||||||
 | 
					import traceback
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					epd = epd7in5_V2.EPD()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					logging.info("init and Clear")
 | 
				
			||||||
 | 
					epd.init()
 | 
				
			||||||
 | 
					epd.Clear()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					font24 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 24)
 | 
				
			||||||
 | 
					font18 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 18)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Drawing on the Horizontal image
 | 
				
			||||||
 | 
					logging.info("1.Drawing on the Horizontal image...")
 | 
				
			||||||
 | 
					Himage = Image.new('1', (epd.width, epd.height), 255)  # 255: clear the frame
 | 
				
			||||||
 | 
					draw = ImageDraw.Draw(Himage)
 | 
				
			||||||
 | 
					draw.text((10, 0), 'hello world', font = font24, fill = 0)
 | 
				
			||||||
 | 
					draw.text((10, 20), '7.5inch e-Paper', font = font24, fill = 0)
 | 
				
			||||||
 | 
					draw.text((150, 0), u'微雪电子', font = font24, fill = 0)
 | 
				
			||||||
 | 
					draw.line((20, 50, 70, 100), fill = 0)
 | 
				
			||||||
 | 
					draw.line((70, 50, 20, 100), fill = 0)
 | 
				
			||||||
 | 
					draw.rectangle((20, 50, 70, 100), outline = 0)
 | 
				
			||||||
 | 
					draw.line((165, 50, 165, 100), fill = 0)
 | 
				
			||||||
 | 
					draw.line((140, 75, 190, 75), fill = 0)
 | 
				
			||||||
 | 
					draw.arc((140, 50, 190, 100), 0, 360, fill = 0)
 | 
				
			||||||
 | 
					draw.rectangle((80, 50, 130, 100), fill = 0)
 | 
				
			||||||
 | 
					draw.chord((200, 50, 250, 100), 0, 360, fill = 0)
 | 
				
			||||||
 | 
					epd.display(epd.getbuffer(Himage))
 | 
				
			||||||
 | 
					time.sleep(2)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Drawing on the Vertical image
 | 
				
			||||||
 | 
					logging.info("2.Drawing on the Vertical image...")
 | 
				
			||||||
 | 
					Limage = Image.new('1', (epd.height, epd.width), 255)  # 255: clear the frame
 | 
				
			||||||
 | 
					draw = ImageDraw.Draw(Limage)
 | 
				
			||||||
 | 
					draw.text((2, 0), 'hello world', font = font18, fill = 0)
 | 
				
			||||||
 | 
					draw.text((2, 20), '7.5inch epd', font = font18, fill = 0)
 | 
				
			||||||
 | 
					draw.text((20, 50), u'微雪电子', font = font18, fill = 0)
 | 
				
			||||||
 | 
					draw.line((10, 90, 60, 140), fill = 0)
 | 
				
			||||||
 | 
					draw.line((60, 90, 10, 140), fill = 0)
 | 
				
			||||||
 | 
					draw.rectangle((10, 90, 60, 140), outline = 0)
 | 
				
			||||||
 | 
					draw.line((95, 90, 95, 140), fill = 0)
 | 
				
			||||||
 | 
					draw.line((70, 115, 120, 115), fill = 0)
 | 
				
			||||||
 | 
					draw.arc((70, 90, 120, 140), 0, 360, fill = 0)
 | 
				
			||||||
 | 
					draw.rectangle((10, 150, 60, 200), fill = 0)
 | 
				
			||||||
 | 
					draw.chord((70, 150, 120, 200), 0, 360, fill = 0)
 | 
				
			||||||
 | 
					epd.display(epd.getbuffer(Limage))
 | 
				
			||||||
 | 
					time.sleep(2)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					logging.info("3.read bmp file")
 | 
				
			||||||
 | 
					Himage = Image.open(os.path.join(picdir, '7in5_V2.bmp'))
 | 
				
			||||||
 | 
					epd.display(epd.getbuffer(Himage))
 | 
				
			||||||
 | 
					time.sleep(2)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					logging.info("4.read bmp file on window")
 | 
				
			||||||
 | 
					Himage2 = Image.new('1', (epd.width, epd.height), 255)  # 255: clear the frame
 | 
				
			||||||
 | 
					bmp = Image.open(os.path.join(picdir, '100x100.bmp'))
 | 
				
			||||||
 | 
					Himage2.paste(bmp, (50,10))
 | 
				
			||||||
 | 
					epd.display(epd.getbuffer(Himage2))
 | 
				
			||||||
 | 
					time.sleep(2)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					logging.info("Clear...")
 | 
				
			||||||
 | 
					epd.init()
 | 
				
			||||||
 | 
					epd.Clear()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					logging.info("Goto Sleep...")
 | 
				
			||||||
 | 
					epd.sleep()
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
		Reference in New Issue
	
	Block a user