From 9fda3f7316f104f9288f3c1ee5671667951e7519 Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期五, 25 三月 2022 15:49:33 +0800
Subject: [PATCH] 识别宽的情况 人工拆分
---
debug/templates/0-3.jpg | 0
debug/7222.mp4 | 0
debug/3_using_template.py | 3
do_not_use/sample.py | 2
safe.sh | 13 +++
debug/2_check_video_digits.py | 68 +++++++++++------
debug/2_check_frame_digits.py | 4
debug/1_check_video_boundary.py | 7 -
debug/2_split_digit_from_video.py | 26 ++++--
debug/__pycache__/_image_clip_setting.cpython-36.pyc | 0
extract_voltage_task.py | 47 ++++++++---
main.py | 23 +++--
debug/1_check_frame_boundary.py | 2
debug/7422.mp4 | 0
debug/7322.mp4 | 0
DevOps.txt | 0
debug/_image_clip_setting.py | 6 +
debug/templates/0-2.jpg | 0
18 files changed, 136 insertions(+), 65 deletions(-)
diff --git a/DevOps.txt b/DevOps.txt
new file mode 100644
index 0000000..02740e8
--- /dev/null
+++ b/DevOps.txt
Binary files differ
diff --git a/debug/1_check_frame_boundary.py b/debug/1_check_frame_boundary.py
index 1fdfd8a..b958d23 100644
--- a/debug/1_check_frame_boundary.py
+++ b/debug/1_check_frame_boundary.py
@@ -12,7 +12,7 @@
gray = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
thresh = cv2.threshold(gray, 0, 255,
cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1]
- kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (5, 5))
+ kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (6, 6))
counter = cv2.morphologyEx(thresh.copy(), cv2.MORPH_OPEN, kernel)
contours, hierarchy = cv2.findContours(counter,cv2.RETR_TREE,cv2.CHAIN_APPROX_SIMPLE)
contours_count = 0
diff --git a/debug/1_check_video_boundary.py b/debug/1_check_video_boundary.py
index 97f0030..b6a1942 100644
--- a/debug/1_check_video_boundary.py
+++ b/debug/1_check_video_boundary.py
@@ -5,7 +5,7 @@
from cv2 import waitKey
import uuid
from _image_clip_setting import image_clip
-
+import sys
def check_frame(frame):
image = frame[image_clip[0]:image_clip[1], image_clip[2]:image_clip[3]]
@@ -13,7 +13,7 @@
gray = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
thresh = cv2.threshold(gray, 0, 255,
cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1]
- kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (5, 5))
+ kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (6, 6))
counter = cv2.morphologyEx(thresh.copy(), cv2.MORPH_OPEN, kernel)
contours, hierarchy = cv2.findContours(counter,cv2.RETR_TREE,cv2.CHAIN_APPROX_SIMPLE)
contours_count = 0
@@ -21,7 +21,6 @@
for c in contours:
x, y, w, h = cv2.boundingRect(c)
if hierarchy[0][contours_count][3] ==0 and h > image_h * 0.3:
- #if image_h*0.98 > h > image_h * 0.6:
print((x, y, w, h))
cv2.rectangle(image, (x, y), (x+w, y+h), (0, 255, 0), 2)
contours_count += 1
@@ -29,7 +28,7 @@
if cv2.waitKey(100) & 0xFF == ord('q'): #鎸塹閫�鍑�
cv2.waitKey(0)
-cap = cv2.VideoCapture("new.mp4") # for testing
+cap = cv2.VideoCapture(sys.argv[1]) # for testing
while(cap.isOpened()):
ret, frame = cap.read()
if ret==True:
diff --git a/debug/2_check_frame_digits.py b/debug/2_check_frame_digits.py
index 571110e..6f9ab30 100644
--- a/debug/2_check_frame_digits.py
+++ b/debug/2_check_frame_digits.py
@@ -18,6 +18,8 @@
digits.append([cv2.imread(path + "/@-2.jpg", cv2.IMREAD_GRAYSCALE), '@'])
digits.append([cv2.imread(path + "/0-0.jpg", cv2.IMREAD_GRAYSCALE), 0])
digits.append([cv2.imread(path + "/0-1.jpg", cv2.IMREAD_GRAYSCALE), 0])
+ digits.append([cv2.imread(path + "/0-2.jpg", cv2.IMREAD_GRAYSCALE), 0])
+ digits.append([cv2.imread(path + "/0-3.jpg", cv2.IMREAD_GRAYSCALE), 0])
digits.append([cv2.imread(path + "/1-0.jpg", cv2.IMREAD_GRAYSCALE), 1])
digits.append([cv2.imread(path + "/1-1.jpg", cv2.IMREAD_GRAYSCALE), 1])
digits.append([cv2.imread(path + "/2-0.jpg", cv2.IMREAD_GRAYSCALE), 2])
@@ -67,7 +69,7 @@
gray = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
thresh = cv2.threshold(gray, 0, 255,
cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1]
- kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (5, 5))
+ kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (6, 6))
counter = cv2.morphologyEx(thresh.copy(), cv2.MORPH_OPEN, kernel)
image_h = image.shape[0]
contours, hierarchy = cv2.findContours(counter,cv2.RETR_TREE,cv2.CHAIN_APPROX_SIMPLE)
diff --git a/debug/2_check_video_digits.py b/debug/2_check_video_digits.py
index c86fa74..e01e6ef 100644
--- a/debug/2_check_video_digits.py
+++ b/debug/2_check_video_digits.py
@@ -6,6 +6,7 @@
import numpy as np
import uuid
from _image_clip_setting import image_clip
+import sys
def task_init_load_digits():
@@ -18,6 +19,8 @@
digits.append([cv2.imread(path + "/@-2.jpg", cv2.IMREAD_GRAYSCALE), '@'])
digits.append([cv2.imread(path + "/0-0.jpg", cv2.IMREAD_GRAYSCALE), 0])
digits.append([cv2.imread(path + "/0-1.jpg", cv2.IMREAD_GRAYSCALE), 0])
+ digits.append([cv2.imread(path + "/0-2.jpg", cv2.IMREAD_GRAYSCALE), 0])
+ digits.append([cv2.imread(path + "/0-3.jpg", cv2.IMREAD_GRAYSCALE), 0])
digits.append([cv2.imread(path + "/1-0.jpg", cv2.IMREAD_GRAYSCALE), 1])
digits.append([cv2.imread(path + "/1-1.jpg", cv2.IMREAD_GRAYSCALE), 1])
digits.append([cv2.imread(path + "/2-0.jpg", cv2.IMREAD_GRAYSCALE), 2])
@@ -42,7 +45,7 @@
digits = []
-fail_count = 0
+fail_count = 0
def get_most_simmilar_digit(target_img):
@@ -68,27 +71,42 @@
gray = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
thresh = cv2.threshold(gray, 0, 255,
cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1]
- kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (5, 5))
+ kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (6, 6))
counter = cv2.morphologyEx(thresh.copy(), cv2.MORPH_OPEN, kernel)
image_h = image.shape[0]
+ image_w = image.shape[1]
contours, hierarchy = cv2.findContours(
counter, cv2.RETR_TREE, cv2.CHAIN_APPROX_SIMPLE)
contours_count = 0
return_numbers = []
for c in contours:
x, y, w, h = cv2.boundingRect(c)
- if hierarchy[0][contours_count][3] ==0 and h > image_h * 0.3:
- #if image_h*0.98 > h > image_h * 0.3:
- #print((x, y, w, h))
- #cv2.rectangle(image, (x, y), (x+w, y+h), (0, 255, 0), 2)
- one_number = get_most_simmilar_digit(cv2.threshold(cv2.resize(
- gray[y:y+h, x:x+w], (20, 30)), 0, 255, cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1])
- if one_number != '@':
- return_numbers.append([x, one_number])
+ if hierarchy[0][contours_count][3] == 0 and h > image_h * 0.3:
+ if w > image_w/4:
+ half_width = int(w/2)
+ one_number = get_most_simmilar_digit(cv2.threshold(cv2.resize(
+ gray[y:y+h, x:x+half_width], (20, 30)), 0, 255, cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1])
+ if one_number != '@':
+ return_numbers.append([x, one_number])
+ else:
+ return -1, False
+ cv2.rectangle(image, (x, y), (x+half_width, y+h), (0, 255, 0), 2)
+ one_number = get_most_simmilar_digit(cv2.threshold(cv2.resize(
+ gray[y:y+h, x+half_width:x+w], (20, 30)), 0, 255, cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1])
+ if one_number != '@':
+ return_numbers.append([x+half_width, one_number])
+ else:
+ return -1, False
+ cv2.rectangle(image, (x+half_width, y), (x+half_width, y+h), (0, 255, 0), 2)
else:
- return -1, False
- cv2.rectangle(image, (x, y), (x+w, y+h), (0, 255, 0), 2)
- contours_count += 1
+ one_number = get_most_simmilar_digit(cv2.threshold(cv2.resize(
+ gray[y:y+h, x:x+w], (20, 30)), 0, 255, cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1])
+ if one_number != '@':
+ return_numbers.append([x, one_number])
+ else:
+ return -1, False
+ cv2.rectangle(image, (x, y), (x+w, y+h), (0, 255, 0), 2)
+ contours_count += 1
cv2.imshow('frame', image)
return_numbers = np.array(sorted(return_numbers))
return return_numbers[:, -1], True
@@ -109,30 +127,32 @@
return_numbers[2]*0.1+return_numbers[3]*0.1
else:
# do got another image
- print('fails')
+ print('fails')
fail_count += 1
- cv2.rectangle(frame, (image_clip[2], image_clip[0]), (image_clip[3], image_clip[1]), (0, 255, 0), 2)
- cv2.imwrite('./fails/count_fail_'+str(uuid.uuid1())+'.jpg',frame)
+ cv2.rectangle(frame, (image_clip[2], image_clip[0]),
+ (image_clip[3], image_clip[1]), (0, 255, 0), 2)
+ cv2.imwrite('./fails/count_fail_'+str(uuid.uuid1())+'.jpg', frame)
else:
print('fails')
- fail_count +=1
- cv2.rectangle(frame, (image_clip[2], image_clip[0]), (image_clip[3], image_clip[1]), (0, 255, 0), 2)
- cv2.imwrite('./fails/status_fail_'+str(uuid.uuid1())+'.jpg',frame)
- print(round(digit,2))
- cv2.putText(frame, str(round(digit,2)), (image_clip[2], image_clip[0]-50),
+ fail_count += 1
+ cv2.rectangle(frame, (image_clip[2], image_clip[0]),
+ (image_clip[3], image_clip[1]), (0, 255, 0), 2)
+ cv2.imwrite('./fails/status_fail_'+str(uuid.uuid1())+'.jpg', frame)
+ print(round(digit, 2))
+ cv2.putText(frame, str(round(digit, 2)), (image_clip[2], image_clip[0]-50),
cv2.FONT_HERSHEY_COMPLEX, 1.0, (100, 200, 200), 5)
cv2.imshow('add_text', frame)
if cv2.waitKey(5) & 0xFF == ord('q'): # 鎸塹閫�鍑�
cv2.waitKey(0)
-cap = cv2.VideoCapture("video.mp4") # for testing
-total_frame = 0
+cap = cv2.VideoCapture(sys.argv[1]) # for testing
+total_frame = 0
while(cap.isOpened()):
ret, frame = cap.read()
if ret == True:
- total_frame +=1
+ total_frame += 1
check_one_frame(frame)
else:
break
diff --git a/debug/2_split_digit_from_video.py b/debug/2_split_digit_from_video.py
index cbadf7c..653bb59 100644
--- a/debug/2_split_digit_from_video.py
+++ b/debug/2_split_digit_from_video.py
@@ -4,30 +4,36 @@
from cv2 import waitKey
import uuid
from _image_clip_setting import image_clip
-
+import sys
def save_images(frame):
image = frame[image_clip[0]:image_clip[1], image_clip[2]:image_clip[3]]
gray = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
thresh = cv2.threshold(gray, 0, 255,
cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1]
- kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (5, 5))
+ kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (6, 6))
counter = cv2.morphologyEx(thresh.copy(), cv2.MORPH_OPEN, kernel)
+ image_h = image.shape[0]
+ image_w = image.shape[1]
contours, hierarchy = cv2.findContours(
counter, cv2.RETR_TREE, cv2.CHAIN_APPROX_SIMPLE)
contours_count = 0
- #print(contours)
- print(hierarchy)
+ return_numbers = []
for c in contours:
x, y, w, h = cv2.boundingRect(c)
- print((x, y, w, h))
- print(hierarchy[0][contours_count][3])
- if hierarchy[0][contours_count][3] ==0 :
- #cv2.rectangle(image, (x, y), (x+w, y+h), (0, 255, 0), 2)
- cv2.imwrite("./images52/"+str(uuid.uuid4())+".jpg",cv2.threshold(cv2.resize(gray[y:y+h,x:x+w],(20,30)), 0, 255,
+ if hierarchy[0][contours_count][3] == 0 and h > image_h * 0.3:
+ if w > image_w/4:
+ half_width = int(w/2)
+ cv2.imwrite("./images52/"+str(uuid.uuid4())+".jpg",cv2.threshold(cv2.resize(gray[y:y+h,x:x+half_width],(20,30)), 0, 255,
cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1])
+ cv2.imwrite("./images52/"+str(uuid.uuid4())+".jpg",cv2.threshold(cv2.resize(gray[y:y+h,x+half_width:x+w],(20,30)), 0, 255,
+ cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1])
+ else:
+ cv2.imwrite("./images52/"+str(uuid.uuid4())+".jpg",cv2.threshold(cv2.resize(gray[y:y+h,x:x+w],(20,30)), 0, 255,
+ cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1])
+ contours_count += 1
-cap = cv2.VideoCapture("new.mp4") # for testing
+cap = cv2.VideoCapture(sys.argv[1]) # for testing
while(cap.isOpened()):
ret, frame = cap.read()
if ret==True:
diff --git a/debug/3_using_template.py b/debug/3_using_template.py
index 8ff4770..4450d23 100644
--- a/debug/3_using_template.py
+++ b/debug/3_using_template.py
@@ -21,6 +21,8 @@
digits.append([cv2.imread(path + "/@-2.jpg",cv2.IMREAD_GRAYSCALE),'@'])
digits.append([cv2.imread(path + "/0-0.jpg",cv2.IMREAD_GRAYSCALE),0])
digits.append([cv2.imread(path + "/0-1.jpg",cv2.IMREAD_GRAYSCALE),0])
+ digits.append([cv2.imread(path + "/0-2.jpg",cv2.IMREAD_GRAYSCALE),0])
+ digits.append([cv2.imread(path + "/0-3.jpg",cv2.IMREAD_GRAYSCALE),0])
digits.append([cv2.imread(path + "/1-0.jpg",cv2.IMREAD_GRAYSCALE),1])
digits.append([cv2.imread(path + "/1-1.jpg",cv2.IMREAD_GRAYSCALE),1])
digits.append([cv2.imread(path + "/2-0.jpg",cv2.IMREAD_GRAYSCALE),2])
@@ -70,6 +72,7 @@
for file in filename:
image = cv2.imread(input_dir + "/" + file,0) # 璇诲彇鍥剧墖
ret, binary = cv2.threshold(image,0,255,cv2.THRESH_BINARY | cv2.THRESH_OTSU)
+ #ret, binary = cv2.threshold(image, 0, 255, cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1])
num = get_most_simmilar_digit(binary)
cv2.imwrite("images52_infer/" + str(num)+"_" + file,binary) # 璇诲彇鍥剧墖
diff --git a/debug/7222.mp4 b/debug/7222.mp4
new file mode 100644
index 0000000..bc2637f
--- /dev/null
+++ b/debug/7222.mp4
Binary files differ
diff --git a/debug/7322.mp4 b/debug/7322.mp4
new file mode 100644
index 0000000..2b0373f
--- /dev/null
+++ b/debug/7322.mp4
Binary files differ
diff --git a/debug/7422.mp4 b/debug/7422.mp4
new file mode 100644
index 0000000..23f1c60
--- /dev/null
+++ b/debug/7422.mp4
Binary files differ
diff --git a/debug/__pycache__/_image_clip_setting.cpython-36.pyc b/debug/__pycache__/_image_clip_setting.cpython-36.pyc
index 5c87918..7cf340c 100644
--- a/debug/__pycache__/_image_clip_setting.cpython-36.pyc
+++ b/debug/__pycache__/_image_clip_setting.cpython-36.pyc
Binary files differ
diff --git a/debug/_image_clip_setting.py b/debug/_image_clip_setting.py
index 21cfd77..85f32da 100644
--- a/debug/_image_clip_setting.py
+++ b/debug/_image_clip_setting.py
@@ -1,6 +1,10 @@
锘�# -*- coding: utf-8 -*-
__author__ = '涓婃捣鑹插畞'
-image_clip = [176,234,278,422] # for video.mp4
+#image_clip = [176,234,278,422] # for video.mp4
#image_clip = [226,266,200,300] # for new.mp4
#image_clip = [220,275,210,300] # test image
+image_clip = [220,275,210,300] # for 聽7122.mp4
+#image_clip = [255,308,290,412] # for 聽7222.mp4
+#image_clip = [229,274,270,380] # for 聽7322.mp4
+#image_clip = [180,240,154,287] # for 聽7422.mp4
\ No newline at end of file
diff --git a/debug/templates/0-2.jpg b/debug/templates/0-2.jpg
new file mode 100644
index 0000000..163cc8e
--- /dev/null
+++ b/debug/templates/0-2.jpg
Binary files differ
diff --git a/debug/templates/0-3.jpg b/debug/templates/0-3.jpg
new file mode 100644
index 0000000..c44155b
--- /dev/null
+++ b/debug/templates/0-3.jpg
Binary files differ
diff --git a/do_not_use/sample.py b/do_not_use/sample.py
index a0d63bd..2965a13 100644
--- a/do_not_use/sample.py
+++ b/do_not_use/sample.py
@@ -49,7 +49,7 @@
def demo(index):
rectKernel = cv2.getStructuringElement(cv2.MORPH_RECT, (25, 25))
- sqKernel = cv2.getStructuringElement(cv2.MORPH_RECT, (5, 5))
+ sqKernel = cv2.getStructuringElement(cv2.MORPH_RECT, (6, 6))
target_path = now_dir + "\\" + "demo_" + str(index) + ".png"
img_origin = cv2.imread(target_path)
img_origin = resize(img_origin, width=300)
diff --git a/extract_voltage_task.py b/extract_voltage_task.py
index e3d58e1..7785e36 100644
--- a/extract_voltage_task.py
+++ b/extract_voltage_task.py
@@ -18,6 +18,8 @@
digits.append([cv2.imread(path + "/@-2.jpg", cv2.IMREAD_GRAYSCALE), '@'])
digits.append([cv2.imread(path + "/0-0.jpg", cv2.IMREAD_GRAYSCALE), 0])
digits.append([cv2.imread(path + "/0-1.jpg", cv2.IMREAD_GRAYSCALE), 0])
+ digits.append([cv2.imread(path + "/0-2.jpg", cv2.IMREAD_GRAYSCALE), 0])
+ digits.append([cv2.imread(path + "/0-3.jpg", cv2.IMREAD_GRAYSCALE), 0])
digits.append([cv2.imread(path + "/1-0.jpg", cv2.IMREAD_GRAYSCALE), 1])
digits.append([cv2.imread(path + "/1-1.jpg", cv2.IMREAD_GRAYSCALE), 1])
digits.append([cv2.imread(path + "/2-0.jpg", cv2.IMREAD_GRAYSCALE), 2])
@@ -44,50 +46,71 @@
digits = []
-def get_most_simmilar_digit(target_img):
+def get_most_simmilar_digit(target_img,app):
source = []
#img_gray = cv2.cvtColor(target_img, cv2.COLOR_BGR2GRAY)
#ret, binary = cv2.threshold(img_gray,0,255,cv2.THRESH_BINARY | cv2.THRESH_OTSU)
# 寰幆瀵规瘮妯℃澘鐨勫浘鐗�
+ app.logger.info("start identify")
if len(digits) < 5:
+
task_init_load_digits()
for digitROI in digits:
+
res = cv2.matchTemplate(target_img, digitROI[0], cv2.TM_CCOEFF_NORMED)
max_val = cv2.minMaxLoc(res)[1]
source.append(max_val)
- # print(max(source))
+ #print(max(source))
if max(source) > 0.3:
+ app.logger.info(digits[source.index(max(source))][1])
return digits[source.index(max(source))][1]
else:
return "@"
-def extrct_digits_from_frame(frame, col_start, col_end, rows_start, rows_end):
+
+
+def extrct_digits_from_frame(frame, col_start, col_end, rows_start, rows_end,app):
image = frame[col_start:col_end, rows_start:rows_end]
gray = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
thresh = cv2.threshold(gray, 0, 255,
cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1]
- kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (5, 5))
+ kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (6, 6))
counter = cv2.morphologyEx(thresh.copy(), cv2.MORPH_OPEN, kernel)
contours, hierarchy = cv2.findContours(counter, cv2.RETR_TREE, cv2.CHAIN_APPROX_SIMPLE)
return_numbers = []
contours_count = 0
image_h = image.shape[0]
+ image_w = image.shape[1]
digit = -1
for c in contours:
x, y, w, h = cv2.boundingRect(c)
- #if image_h*0.98 > h > image_h * 0.3:
if hierarchy[0][contours_count][3] ==0 and h > image_h * 0.3:
- #print((x, y, w, h))
- #cv2.rectangle(image, (x, y), (x+w, y+h), (0, 255, 0), 2)
- one_number = get_most_simmilar_digit(cv2.threshold(cv2.resize(
- gray[y:y+h, x:x+w], (20, 30)), 0, 255, cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1])
- if one_number != '@':
- return_numbers.append([x, one_number])
+ if w>image_w/4:
+ half_width = int(w/2)
+ one_number = get_most_simmilar_digit(cv2.threshold(cv2.resize(
+ gray[y:y+h, x:x+half_width], (20, 30)), 0, 255, cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1],app)
+ if one_number != '@':
+ return_numbers.append([x, one_number])
+ else:
+ return digit, False
+ one_number = get_most_simmilar_digit(cv2.threshold(cv2.resize(
+ gray[y:y+h, x+half_width:x+w], (20, 30)), 0, 255, cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1],app)
+ if one_number != '@':
+ return_numbers.append([x+half_width, one_number])
+ else:
+ return digit, False
else:
- return digit, False
+ one_number = get_most_simmilar_digit(cv2.threshold(cv2.resize(
+ gray[y:y+h, x:x+w], (20, 30)), 0, 255, cv2.THRESH_BINARY_INV | cv2.THRESH_OTSU)[1],app)
+ if one_number != '@':
+ return_numbers.append([x, one_number])
+ else:
+ return digit, False
+ contours_count +=1
if len(return_numbers)==0:
return digit,False
+ print(return_numbers)
return_numbers = np.array(sorted(return_numbers))
return_numbers = return_numbers[:, -1]
if len(return_numbers) < 3:
diff --git a/main.py b/main.py
index 210c42d..986a490 100644
--- a/main.py
+++ b/main.py
@@ -115,12 +115,7 @@
"JOBS": [{"id": "my_job", # 浠诲姟ID
"func": "__main__:extract_voltage_send",#浠诲姟浣嶇疆
"trigger": "interval", #瑙﹀彂鍣�
- "seconds": 60 # 鏃堕棿闂撮殧
- },
- {"id": "my_job2", # 浠诲姟ID
- "func": "delete_task:delete_old_images",#浠诲姟浣嶇疆
- "trigger": "interval", #瑙﹀彂鍣�
- "seconds": 60 # 鏃堕棿闂撮殧
+ "minutes": 1 # 鏃堕棿闂撮殧
}
]}
)
@@ -129,6 +124,7 @@
def extract_voltage_send():
print('extract_voltage_send job started!')
time_now = datetime.datetime.now().strftime("%Y-%m-%d-%H-%M-%S")
+ time_public=datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
app.logger.info(time_now+' extract_voltage_send job started!')
#camera = cv2.VideoCapture(0) #use 0 for web camera deplyoment
cap = cv2.VideoCapture(0) # for testing
@@ -138,15 +134,20 @@
fails_count = 0
while True:
ret, frame = cap.read()
- return_digital,job_status = extrct_digits_from_frame(frame,app.config['IMAGE_CLIP_COLS_START'],app.config['IMAGE_CLIP_COLS_END'],app.config['IMAGE_CLIP_ROWS_START'],app.config['IMAGE_CLIP_ROWS_END'])
+ return_digital,job_status = extrct_digits_from_frame(frame,app.config['IMAGE_CLIP_COLS_START'],app.config['IMAGE_CLIP_COLS_END'],app.config['IMAGE_CLIP_ROWS_START'],app.config['IMAGE_CLIP_ROWS_END'],app)
if job_status or fails_count > 10:
- mqtt.publish(app.config['REMOTE_MQTT_PUBLISH_TOPIC'], "{'voltage':"+str(return_digital)+"}")
- cv2.imwrite("./imageframe/image_frame_"+time_now+".jpg", cv2.putText(frame, str(return_digital), (app.config['IMAGE_CLIP_ROWS_START'], app.config['IMAGE_CLIP_COLS_START']), cv2.FONT_HERSHEY_COMPLEX, 1.5, (0, 255, 255), 2))
+ #mqtt.publish(app.config['REMOTE_MQTT_PUBLISH_TOPIC'], "{'voltage':"+str(return_digital)+"}")
+ mqtt.publish(app.config['REMOTE_MQTT_PUBLISH_TOPIC'], "{\"sn\":" + "\"" + app.config['MQTT_CLIENT_ID'] +"\"" + " , \"time\":"+ "\"" + time_public +"\""+" , \"value\":"+ str(return_digital) +" }")
+ app.logger.info(" send the digital "+str(return_digital))
+ cv2.imwrite("./image_frame/success_"+time_now+".jpg", cv2.putText(frame, str(return_digital), (app.config['IMAGE_CLIP_ROWS_START'], app.config['IMAGE_CLIP_COLS_START']), cv2.FONT_HERSHEY_COMPLEX, 1.5, (0, 255, 255), 2))
+ app.logger.info("image is identified successful")
cap.release()
break
else:
fails_count +=1
- cv2.imwrite("./fails/image_frame_"+time_now+".jpg", frame)
+ app.logger.info("image is identified fail=======")
+ cv2.imwrite("./fails/fail_"+time_now+".jpg", frame)
+
#if need_send _image :
# send_image
@@ -179,7 +180,7 @@
AddJobConfig() # 閰嶇疆浠诲姟锛屼笉鐒舵棤娉曞惎鍔ㄤ换鍔�
scheduler.init_app(app)
scheduler.start()
-
+ app.logger.info("scheduler is running......")
#app.run()
socketio.run(app, host='0.0.0.0', port=8058, debug=True)
#mqtt.subscribe(app.config['REMOTE_MQTT_SUBSCRIBE_TOPIC']) // need to wait for mqtt client finished connection
\ No newline at end of file
diff --git a/safe.sh b/safe.sh
new file mode 100644
index 0000000..2cad641
--- /dev/null
+++ b/safe.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if test $( pgrep -f main | wc -l ) -eq 0
+
+then
+/home/pi/huaneng/main.sh
+echo "no"
+
+else
+
+echo "yes"
+
+fi
--
Gitblit v1.9.1