From 7c65f7ef11770b782e018b175bc0dd0612e82e19 Mon Sep 17 00:00:00 2001 From: tribta Date: Tue, 11 Jul 2017 11:59:22 +0100 Subject: [PATCH] Fixing Bad identations (line 18 to 96) Adding _ to the unused variables for clarity (line 77) --- .../imgProc/match_template/match_template.py | 148 +++++++++--------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/samples/python/tutorial_code/imgProc/match_template/match_template.py b/samples/python/tutorial_code/imgProc/match_template/match_template.py index 5c649a0429..b90b83a4bf 100644 --- a/samples/python/tutorial_code/imgProc/match_template/match_template.py +++ b/samples/python/tutorial_code/imgProc/match_template/match_template.py @@ -15,82 +15,82 @@ max_Trackbar = 5 def main(argv): - if (len(sys.argv) < 3): - print 'Not enough parameters' - print 'Usage:\nmatch_template_demo.py []' - return -1 - - ## [load_image] - global img - global templ - img = cv2.imread(sys.argv[1], cv2.IMREAD_COLOR) - templ = cv2.imread(sys.argv[2], cv2.IMREAD_COLOR) - - if (len(sys.argv) > 3): - global use_mask - use_mask = True - global mask - mask = cv2.imread( sys.argv[3], cv2.IMREAD_COLOR ) - - if ((img is None) or (templ is None) or (use_mask and (mask is None))): - print 'Can\'t read one of the images' - return -1 - ## [load_image] - - ## [create_windows] - cv2.namedWindow( image_window, cv2.WINDOW_AUTOSIZE ) - cv2.namedWindow( result_window, cv2.WINDOW_AUTOSIZE ) - ## [create_windows] - - ## [create_trackbar] - trackbar_label = 'Method: \n 0: SQDIFF \n 1: SQDIFF NORMED \n 2: TM CCORR \n 3: TM CCORR NORMED \n 4: TM COEFF \n 5: TM COEFF NORMED' - cv2.createTrackbar( trackbar_label, image_window, match_method, max_Trackbar, MatchingMethod ) - ## [create_trackbar] - - MatchingMethod(match_method) - - ## [wait_key] - cv2.waitKey(0) - return 0 - ## [wait_key] + if (len(sys.argv) < 3): + print 'Not enough parameters' + print 'Usage:\nmatch_template_demo.py []' + return -1 + + ## [load_image] + global img + global templ + img = cv2.imread(sys.argv[1], cv2.IMREAD_COLOR) + templ = cv2.imread(sys.argv[2], cv2.IMREAD_COLOR) + + if (len(sys.argv) > 3): + global use_mask + use_mask = True + global mask + mask = cv2.imread( sys.argv[3], cv2.IMREAD_COLOR ) + + if ((img is None) or (templ is None) or (use_mask and (mask is None))): + print 'Can\'t read one of the images' + return -1 + ## [load_image] + + ## [create_windows] + cv2.namedWindow( image_window, cv2.WINDOW_AUTOSIZE ) + cv2.namedWindow( result_window, cv2.WINDOW_AUTOSIZE ) + ## [create_windows] + + ## [create_trackbar] + trackbar_label = 'Method: \n 0: SQDIFF \n 1: SQDIFF NORMED \n 2: TM CCORR \n 3: TM CCORR NORMED \n 4: TM COEFF \n 5: TM COEFF NORMED' + cv2.createTrackbar( trackbar_label, image_window, match_method, max_Trackbar, MatchingMethod ) + ## [create_trackbar] + + MatchingMethod(match_method) + + ## [wait_key] + cv2.waitKey(0) + return 0 + ## [wait_key] def MatchingMethod(param): - global match_method - match_method = param - - ## [copy_source] - img_display = img.copy() - ## [copy_source] - ## [match_template] - method_accepts_mask = (cv2.TM_SQDIFF == match_method or match_method == cv2.TM_CCORR_NORMED) - if (use_mask and method_accepts_mask): - result = cv2.matchTemplate(img, templ, match_method, None, mask) - else: - result = cv2.matchTemplate(img, templ, match_method) - ## [match_template] - - ## [normalize] - cv2.normalize( result, result, 0, 1, cv2.NORM_MINMAX, -1 ) - ## [normalize] - ## [best_match] - minVal, maxVal, minLoc, maxLoc = cv2.minMaxLoc(result, None) - ## [best_match] - - ## [match_loc] - if (match_method == cv2.TM_SQDIFF or match_method == cv2.TM_SQDIFF_NORMED): - matchLoc = minLoc - else: - matchLoc = maxLoc - ## [match_loc] - - ## [imshow] - cv2.rectangle(img_display, matchLoc, (matchLoc[0] + templ.shape[0], matchLoc[1] + templ.shape[1]), (0,0,0), 2, 8, 0 ) - cv2.rectangle(result, matchLoc, (matchLoc[0] + templ.shape[0], matchLoc[1] + templ.shape[1]), (0,0,0), 2, 8, 0 ) - cv2.imshow(image_window, img_display) - cv2.imshow(result_window, result) - ## [imshow] - pass + global match_method + match_method = param + + ## [copy_source] + img_display = img.copy() + ## [copy_source] + ## [match_template] + method_accepts_mask = (cv2.TM_SQDIFF == match_method or match_method == cv2.TM_CCORR_NORMED) + if (use_mask and method_accepts_mask): + result = cv2.matchTemplate(img, templ, match_method, None, mask) + else: + result = cv2.matchTemplate(img, templ, match_method) + ## [match_template] + + ## [normalize] + cv2.normalize( result, result, 0, 1, cv2.NORM_MINMAX, -1 ) + ## [normalize] + ## [best_match] + _minVal, _maxVal, minLoc, maxLoc = cv2.minMaxLoc(result, None) + ## [best_match] + + ## [match_loc] + if (match_method == cv2.TM_SQDIFF or match_method == cv2.TM_SQDIFF_NORMED): + matchLoc = minLoc + else: + matchLoc = maxLoc + ## [match_loc] + + ## [imshow] + cv2.rectangle(img_display, matchLoc, (matchLoc[0] + templ.shape[0], matchLoc[1] + templ.shape[1]), (0,0,0), 2, 8, 0 ) + cv2.rectangle(result, matchLoc, (matchLoc[0] + templ.shape[0], matchLoc[1] + templ.shape[1]), (0,0,0), 2, 8, 0 ) + cv2.imshow(image_window, img_display) + cv2.imshow(result_window, result) + ## [imshow] + pass if __name__ == "__main__": - main(sys.argv[1:]) + main(sys.argv[1:])