From 32c65b0dfd9114e055173d0fd23db9609a226c5e Mon Sep 17 00:00:00 2001 From: LDOUBLEV Date: Wed, 22 Jun 2022 12:26:12 +0800 Subject: [PATCH] opt points order --- tools/infer/predict_det.py | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/tools/infer/predict_det.py b/tools/infer/predict_det.py index 73387aef..b9fab7dd 100755 --- a/tools/infer/predict_det.py +++ b/tools/infer/predict_det.py @@ -24,7 +24,6 @@ import cv2 import numpy as np import time import sys -from scipy.spatial import distance as dist import tools.infer.utility as utility from ppocr.utils.logging import get_logger @@ -151,22 +150,15 @@ class TextDetector(object): logger=logger) def order_points_clockwise(self, pts): - """ - refer to :https://github.com/PyImageSearch/imutils/blob/9f740a53bcc2ed7eba2558afed8b4c17fd8a1d4c/imutils/perspective.py#L9 - """ - # sort the points based on their x-coordinates - xSorted = pts[np.argsort(pts[:, 0]), :] - - leftMost = xSorted[:2, :] - rightMost = xSorted[2:, :] - - leftMost = leftMost[np.argsort(leftMost[:, 1]), :] - (tl, bl) = leftMost - - D = dist.cdist(tl[np.newaxis], rightMost, "euclidean")[0] - (br, tr) = rightMost[np.argsort(D)[::-1], :] - - return np.array([tl, tr, br, bl], dtype="float32") + rect = np.zeros((4, 2), dtype="int32") + s = pts.sum(axis=1) + rect[0] = pts[np.argmin(s)] + rect[2] = pts[np.argmax(s)] + tmp = np.delete(pts, (np.argmin(s), np.argmax(s)), axis=0) + diff = np.diff(np.array(tmp), axis=1) + rect[1] = tmp[np.argmin(diff)] + rect[3] = tmp[np.argmax(diff)] + return rect def clip_det_res(self, points, img_height, img_width): for pno in range(points.shape[0]): -- GitLab