added Pillow as dependency + re-arranged code for display

Pipfile

@@ -17,5 +17,6 @@ gevent = "==20.6.1"
 TheCodeLabs-BaseUtils = "*"
 TheCodeLabs-FlaskUtils = "*"
 python-jenkins = "==1.5.0"
+Pillow = "==7.2.0"
 
 [dev-packages]

src/logic/Image.py → src/logic/display/Image.py

@@ -2,7 +2,6 @@ from PIL import Image, ImageDraw
 
 
 class AbstractImage:
-
     BLACK = 0
     RED = 1
 
@@ -23,7 +22,6 @@ class AbstractImage:
 
 
 class EPDImage(AbstractImage):
-
     def __init__(self, width, height):
         self.__blackImage = Image.new('1', (width, height), 255)
         self.__redImage = Image.new('1', (width, height), 255)
@@ -57,7 +55,6 @@ class EPDImage(AbstractImage):
 
 
 class DebugImage(AbstractImage):
-
     def __init__(self, width, height):
         self.__image = Image.new('RGB', (width, height), (255, 255, 255))
         self.__draw = ImageDraw.Draw(self.__image)
@@ -85,4 +82,3 @@ class DebugImage(AbstractImage):
 
     def get_red_image(self):
         return self.__image
-

src/logic/Main.py → src/logic/display/Main.py

-#!/usr/bin/python
-# -*- coding:utf-8 -*-
 import logging
 import os
 import sys
@@ -7,7 +5,7 @@ import time
 
 from PIL import Image, ImageDraw, ImageFont
 
-from logic.Image import DebugImage, EPDImage, AbstractImage
+from logic.display.Image import DebugImage, EPDImage, AbstractImage
 from libs.lib.waveshare_epd import epd4in2bc
 
 logging.basicConfig(level=logging.DEBUG)