HongChuang/ultralytics-ascend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Standardize default region points (#17715)

Browse source
This commit is contained in:
Junyang Kong 2024-11-22 19:17:51 +08:00 • committed by GitHub
parent 3e48829cd6
commit 1b74f142a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/test_solutions.py
View file

@ -16,7 +16,7 @@ def test_major_solutions():
safe_download(url=MAJOR_SOLUTIONS_DEMO) safe_download(url=MAJOR_SOLUTIONS_DEMO)
cap = cv2.VideoCapture("solutions_ci_demo.mp4") cap = cv2.VideoCapture("solutions_ci_demo.mp4")
assert cap.isOpened(), "Error reading video file" assert cap.isOpened(), "Error reading video file"
region_points = [(20, 400), (1080, 404), (1080, 360), (20, 360)] region_points = [(20, 400), (1080, 400), (1080, 360), (20, 360)]
counter = solutions.ObjectCounter(region=region_points, model="yolo11n.pt", show=False) # Test object counter counter = solutions.ObjectCounter(region=region_points, model="yolo11n.pt", show=False) # Test object counter
heatmap = solutions.Heatmap(colormap=cv2.COLORMAP_PARULA, model="yolo11n.pt", show=False) # Test heatmaps heatmap = solutions.Heatmap(colormap=cv2.COLORMAP_PARULA, model="yolo11n.pt", show=False) # Test heatmaps
speed = solutions.SpeedEstimator(region=region_points, model="yolo11n.pt", show=False) # Test queue manager speed = solutions.SpeedEstimator(region=region_points, model="yolo11n.pt", show=False) # Test queue manager

2
ultralytics/cfg/solutions/default.yaml
View file

@ -2,7 +2,7 @@
# Configuration for Ultralytics Solutions # Configuration for Ultralytics Solutions
# Object counting settings # Object counting settings
region: # Object counting, queue or speed estimation region points. Default region points are [(20, 400), (1080, 404), (1080, 360), (20, 360)] region: # Object counting, queue or speed estimation region points. Default region points are [(20, 400), (1080, 400), (1080, 360), (20, 360)]
show_in: True # Flag to display objects moving *into* the defined region show_in: True # Flag to display objects moving *into* the defined region
show_out: True # Flag to display objects moving *out of* the defined region show_out: True # Flag to display objects moving *out of* the defined region

2
ultralytics/solutions/solutions.py
View file

@ -135,7 +135,7 @@ class BaseSolution:
def initialize_region(self): def initialize_region(self):
"""Initialize the counting region and line segment based on configuration settings.""" """Initialize the counting region and line segment based on configuration settings."""
if self.region is None: if self.region is None:
self.region = [(20, 400), (1080, 404), (1080, 360), (20, 360)] self.region = [(20, 400), (1080, 400), (1080, 360), (20, 360)]
self.r_s = ( self.r_s = (
self.Polygon(self.region) if len(self.region) >= 3 else self.LineString(self.region) self.Polygon(self.region) if len(self.region) >= 3 else self.LineString(self.region)
) # region or line ) # region or line