Merge pull request #406 from pliablepixels/master

sync and allow aliases
ZoneMinder · Jul 20, 2021 · bd4513f · bd4513f
2 parents d041b4f + 257ae0d
commit bd4513f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/hook/objectconfig.ini b/hook/objectconfig.ini
@@ -409,7 +409,9 @@ ml_sequence= {
 			'match_past_detections': '{{match_past_detections}}',
 			'past_det_max_diff_area': '5%',
 			'car_past_det_max_diff_area': '10%',
-			#'ignore_past_detection_labels': ['dog', 'cat']
+			#'ignore_past_detection_labels': ['dog', 'cat'],
+			# when matching past detections, names in a group are treated the same
+			'aliases': [['car','bus','truck','boat'], ['broccoli', 'pottedplant']]
 
 		},
 		'object': {

diff --git a/hook/setup.py b/hook/setup.py
@@ -16,7 +16,7 @@
 LICENSE = 'GPL'
 INSTALL_REQUIRES = [
     'numpy', 'requests', 'Shapely', 'imutils', 
-    'pyzm>=0.3.52', 'scikit-learn', 'future', 'imageio',
+    'pyzm>=0.3.53', 'scikit-learn', 'future', 'imageio',
     'imageio-ffmpeg','pygifsicle', 'Pillow', 'configupdater'
 ]
 

diff --git a/hook/zm_detect.py b/hook/zm_detect.py
@@ -31,7 +31,7 @@
 
 auth_header = None
 
-__app_version__ = '6.1.26'
+__app_version__ = '6.1.27'
 
 def remote_detect(stream=None, options=None, api=None, args=None):
     # This uses mlapi (https://github.com/pliablepixels/mlapi) to run inferencing and converts format to what is required by the rest of the code.

diff --git a/hook/zmes_hook_helpers/__init__.py b/hook/zmes_hook_helpers/__init__.py
@@ -1,2 +1,2 @@
-__version__ = "6.1.26"
-VERSION=__version__
+__version__ = "6.1.27"
+VERSION = __version__
diff --git a/zmeventnotification.pl b/zmeventnotification.pl
@@ -54,7 +54,7 @@
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
 ####################################
-my $app_version = '6.1.26';
+my $app_version = '6.1.27';
 ####################################
 
 # do this before any log init etc.