administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-19 01:17:06 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix point ordering

Browse Source
This commit is contained in:
Josh Hawkins 2024-12-22 18:42:48 -06:00
parent 17861b814d
commit ed572b7c2b
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
frigate/util/velocity.py
View File

@ -10,24 +10,22 @@ def order_points_clockwise(points):
:param points: Array of zone corner points in pixel coordinates :param points: Array of zone corner points in pixel coordinates
:return: Ordered list of points :return: Ordered list of points
""" """
if not isinstance(points, np.ndarray): center = np.mean(points, axis=0)
points = np.array(points)
centroid = np.mean(points, axis=0) top_left = points[
np.logical_and(points[:, 0] < center[0], points[:, 1] < center[1])
][0]
top_right = points[
np.logical_and(points[:, 0] > center[0], points[:, 1] < center[1])
][0]
bottom_right = points[
np.logical_and(points[:, 0] > center[0], points[:, 1] > center[1])
][0]
bottom_left = points[
np.logical_and(points[:, 0] < center[0], points[:, 1] > center[1])
][0]
angles = np.arctan2(points[:, 1] - centroid[1], points[:, 0] - centroid[0]) return np.array([top_left, top_right, bottom_right, bottom_left])
# Sort points by angle
sorted_indices = np.argsort(angles)
sorted_points = points[sorted_indices]
# Find the top-left point (minimum sum of x and y coordinates)
top_left_idx = np.argmin(np.sum(sorted_points, axis=1))
# Rotate the points so that the top-left point is first
sorted_points = np.roll(sorted_points, -top_left_idx, axis=0)
return sorted_points.tolist()
def create_ground_plane(zone_points, distances): def create_ground_plane(zone_points, distances):
@ -94,17 +92,18 @@ def calculate_real_world_speed(
:param camera_fps: Frames per second of the camera :param camera_fps: Frames per second of the camera
:return: speed and velocity angle direction :return: speed and velocity angle direction
""" """
if not isinstance(zone_contour, np.ndarray): # order the zone_contour points clockwise starting at top left
zone_contour = np.array(zone_contour) ordered_zone_contour = order_points_clockwise(zone_contour)
# Find the top-left point (minimum sum of x and y coordinates) # find the indices that would sort the original zone_contour to match ordered_zone_contour
top_left_idx = np.argmin(np.sum(zone_contour, axis=1)) sort_indices = [
np.where((zone_contour == point).all(axis=1))[0][0]
# Rotate the points so that the top-left point is first for point in ordered_zone_contour
ordered_zone_contour = np.roll(zone_contour, -top_left_idx, axis=0) ]
# Reorder distances to match the new order of zone_contour # Reorder distances to match the new order of zone_contour
ordered_distances = np.roll(distances, -top_left_idx) distances = np.array(distances)
ordered_distances = distances[sort_indices]
ground_plane = create_ground_plane(ordered_zone_contour, ordered_distances) ground_plane = create_ground_plane(ordered_zone_contour, ordered_distances)