From f974d1d3e4c89cf1d89f86e50170ebfb93a6445a Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期三, 23 三月 2022 15:56:01 +0800
Subject: [PATCH] default return -1 not 0
---
debug/3_using_template.py | 2 +-
extract_voltage_task.py | 6 +++---
debug/2_check_video_digits.py | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/debug/2_check_video_digits.py b/debug/2_check_video_digits.py
index 36c074c..c86fa74 100644
--- a/debug/2_check_video_digits.py
+++ b/debug/2_check_video_digits.py
@@ -86,7 +86,7 @@
if one_number != '@':
return_numbers.append([x, one_number])
else:
- return return_numbers, False
+ return -1, False
cv2.rectangle(image, (x, y), (x+w, y+h), (0, 255, 0), 2)
contours_count += 1
cv2.imshow('frame', image)
@@ -98,7 +98,7 @@
def check_one_frame(frame):
return_numbers, staus_check = get_digit(frame)
print(return_numbers)
- digit = 0
+ digit = -1
global fail_count
if staus_check:
if len(return_numbers) == 3:
diff --git a/debug/3_using_template.py b/debug/3_using_template.py
index f3313c3..8ff4770 100644
--- a/debug/3_using_template.py
+++ b/debug/3_using_template.py
@@ -58,7 +58,7 @@
max_val = cv2.minMaxLoc(res)[1]
source.append(max_val)
#print(max(source))
- if max(source) > 0.5 :
+ if max(source) > 0.3 :
return str(digits[source.index(max(source))][1])
else:
return "@"
diff --git a/extract_voltage_task.py b/extract_voltage_task.py
index 094235e..e3d58e1 100644
--- a/extract_voltage_task.py
+++ b/extract_voltage_task.py
@@ -73,6 +73,7 @@
return_numbers = []
contours_count = 0
image_h = image.shape[0]
+ digit = -1
for c in contours:
x, y, w, h = cv2.boundingRect(c)
#if image_h*0.98 > h > image_h * 0.3:
@@ -84,10 +85,9 @@
if one_number != '@':
return_numbers.append([x, one_number])
else:
- return return_numbers, False
+ return digit, False
if len(return_numbers)==0:
- return 0,False
- digit = 0
+ return digit,False
return_numbers = np.array(sorted(return_numbers))
return_numbers = return_numbers[:, -1]
if len(return_numbers) < 3:
--
Gitblit v1.9.1