Mercurial Hosting > traffic-intelligence

diff python/moving.py @ 664:455f9b93819c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added capability to set a videofilename to movingobject and interaction, renames interactiontype to collision in interaction
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Wed, 20 May 2015 12:04:22 +0200
parents 65a867942eee
children 15e244d2a1b5
line wrap: on
line diff
--- a/python/moving.py	Tue May 19 16:58:26 2015 +0200
+++ b/python/moving.py	Wed May 20 12:04:22 2015 +0200
@@ -1,8 +1,8 @@
 #! /usr/bin/env python
 '''Libraries for moving objects, trajectories...'''
 
-import utils
-import cvutils
+import utils, cvutils
+from storage import VideoFilenameAddable
 
 from math import sqrt
 from numpy import median
@@ -974,7 +974,7 @@
 
 userType2Num = utils.inverseEnumeration(userTypeNames)
 
-class MovingObject(STObject):
+class MovingObject(STObject, VideoFilenameAddable):
     '''Class for moving objects: a spatio-temporal object 
     with a trajectory and a geometry (constant volume over time) 
     and a usertype (e.g. road user) coded as a number (see userTypeNames)