From 74a5282227b7aef4c743b91104a98f9eb140658d Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 5 Jul 2020 18:51:58 +0200
Subject: [PATCH] added Pillow as dependency + re-arranged code for display
---
Pipfile | 1 +
src/logic/{ => display}/Image.py | 4 ----
src/logic/{ => display}/Main.py | 4 +---
src/logic/display/__init__.py | 0
4 files changed, 2 insertions(+), 7 deletions(-)
rename src/logic/{ => display}/Image.py (99%)
rename src/logic/{ => display}/Main.py (95%)
create mode 100644 src/logic/display/__init__.py
diff --git a/Pipfile b/Pipfile
index 2b1258f..47e077d 100644
--- a/Pipfile
+++ b/Pipfile
@@ -17,5 +17,6 @@ gevent = "==20.6.1"
TheCodeLabs-BaseUtils = "*"
TheCodeLabs-FlaskUtils = "*"
python-jenkins = "==1.5.0"
+Pillow = "==7.2.0"
[dev-packages]
diff --git a/src/logic/Image.py b/src/logic/display/Image.py
similarity index 99%
rename from src/logic/Image.py
rename to src/logic/display/Image.py
index 495f3bc..ee082a7 100644
--- a/src/logic/Image.py
+++ b/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
-
diff --git a/src/logic/Main.py b/src/logic/display/Main.py
similarity index 95%
rename from src/logic/Main.py
rename to src/logic/display/Main.py
index 3b90539..2afee08 100644
--- a/src/logic/Main.py
+++ b/src/logic/display/Main.py
@@ -1,5 +1,3 @@
-#!/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)
diff --git a/src/logic/display/__init__.py b/src/logic/display/__init__.py
new file mode 100644
index 0000000..e69de29
--
GitLab