From 28bb23a2d09a60f19120eb8b407e51d7d107b1c7 Mon Sep 17 00:00:00 2001 From: jomjol <30766535+jomjol@users.noreply.github.com> Date: Fri, 29 Nov 2019 20:26:53 +0100 Subject: [PATCH] Update to V4.1.1 - Error Correction Correction in ReadDigitalDigitClass.py --- README.md | 2 ++ code/lib/ReadDigitalDigitClass.py | 3 ++- .../lib/__pycache__/CutImageClass.cpython-37.pyc | Bin 5984 -> 0 bytes .../LoadFileFromHTTPClass.cpython-37.pyc | Bin 3080 -> 0 bytes .../ReadAnalogNeedleClass.cpython-37.pyc | Bin 2856 -> 0 bytes .../ReadDigitalDigitClass.cpython-37.pyc | Bin 3015 -> 0 bytes .../__pycache__/ZaehlerstandClass.cpython-37.pyc | Bin 6457 -> 0 bytes code/lib/__pycache__/__init__.cpython-37.pyc | Bin 159 -> 0 bytes 8 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 code/lib/__pycache__/CutImageClass.cpython-37.pyc delete mode 100644 code/lib/__pycache__/LoadFileFromHTTPClass.cpython-37.pyc delete mode 100644 code/lib/__pycache__/ReadAnalogNeedleClass.cpython-37.pyc delete mode 100644 code/lib/__pycache__/ReadDigitalDigitClass.cpython-37.pyc delete mode 100644 code/lib/__pycache__/ZaehlerstandClass.cpython-37.pyc delete mode 100644 code/lib/__pycache__/__init__.cpython-37.pyc diff --git a/README.md b/README.md index 5cb25a1..82953ac 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ This repository is the sum of different projects to read out an analog water met The result is a HTTP-server, that takes an image as input, processes it and gives as an output the water meter number, including the subdigits. ## Changelog - lastest version +##### 4.1.1 (2019-11-29) +* Error correction in ReadDigitalDigitClass.py ##### 4.1.0 (2019-11-25) * Upgrade to Tensorflow 2.0 * Changed image processing within CNN to Pillow (instead of OpenCV) diff --git a/code/lib/ReadDigitalDigitClass.py b/code/lib/ReadDigitalDigitClass.py index 2c210a0..77b6a67 100644 --- a/code/lib/ReadDigitalDigitClass.py +++ b/code/lib/ReadDigitalDigitClass.py @@ -98,4 +98,5 @@ def saveLogImage(self, image, value, logtime): return speichername = image[0] + '_' + logtime + '.jpg' speichername = self.log_Image + '/' + str(value) + '/' + speichername - cv2.imwrite(speichername, image[1]) + image[1].save(speichername, "JPEG") +# cv2.imwrite(speichername, image[1]) diff --git a/code/lib/__pycache__/CutImageClass.cpython-37.pyc b/code/lib/__pycache__/CutImageClass.cpython-37.pyc deleted file mode 100644 index d9ab41d6663fc7ac4b794648ceaec2d53805b11f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5984 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 diff --git a/code/lib/__pycache__/ZaehlerstandClass.cpython-37.pyc b/code/lib/__pycache__/ZaehlerstandClass.cpython-37.pyc deleted file mode 100644 index 7ea53e38dd59d6f038f832211589d63d34ae36e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6457 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