From c470584e36fdab2f15cd6bceb4ae24bed5e89ab9 Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Thu, 17 Nov 2016 15:27:43 +0100 Subject: [PATCH] Script execution --- script/LedDetection.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/script/LedDetection.py b/script/LedDetection.py index 74e5191..0ec31b3 100644 --- a/script/LedDetection.py +++ b/script/LedDetection.py @@ -79,7 +79,7 @@ class MyFilter(Filter): """ def in_roi(x,y): - return math.hypot(x-roi_radius, y-roi_radius) < roi_radius + return math.hypot(x-roi_center[0], y-roi_center[1]) < roi_radius def integrate (ips): @@ -134,17 +134,19 @@ def detect_led(ip): print >> sys.stderr, r.getRowAsString(row) """ points = "" + npoints = 0 for row in range (r.counter): - points = points + " (" + str(int(r.getValue("XM", row))) + ", " + str(int(r.getValue("YM", row))) + ")" + if in_roi(r.getValue("XM",row), r.getValue("YM",row)): + points = points + " (" + str(int(r.getValue("XM", row))) + ", " + str(int(r.getValue("YM", row))) + ")" + npoints = npoints + 1 print str(r.counter) + " - " + points last_ret = (results,output) if not integration_continuous: frames = [] - #if r.counter==10: - # save_image(output, "{images}/" + str(datetime.datetime.now())+".png", "png") - # output. + if npoints!=10: + save_image(output, "{images}/" + str(datetime.datetime.now().strftime("%Y%m%d_%H%M%S"))+".png", "png") #return (results,aux) return (results,output)