Mercurial Hosting > traffic-intelligence
diff python/metadata.py @ 830:2a5856961933
first working version of feature merging (works with feature grouping)
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Wed, 29 Jun 2016 17:56:19 -0400 |
parents | 14e4ad7c7420 |
children | 7058a40a4bbc |
line wrap: on
line diff
--- a/python/metadata.py Wed Jun 29 13:50:21 2016 -0400 +++ b/python/metadata.py Wed Jun 29 17:56:19 2016 -0400 @@ -232,13 +232,11 @@ startTime = Column(DateTime) duration = Column(Interval) # video sequence duration databaseFilename = Column(String) # path relative to the the site name - siteIdx = Column(Integer, ForeignKey('sites.idx')) cameraViewIdx = Column(Integer, ForeignKey('camera_views.idx')) - site = relationship("Site", backref=backref('video_sequences', order_by = idx)) cameraView = relationship("CameraView", backref=backref('video_sequences', order_by = idx)) - def __init__(self, name, startTime, duration, site, cameraView, databaseFilename = None): + def __init__(self, name, startTime, duration, cameraView, databaseFilename = None): '''startTime is passed as string in utils.datetimeFormat, eg 2011-06-22 10:00:39 duration is a timedelta object''' self.name = name @@ -247,17 +245,22 @@ else: self.startTime = startTime self.duration = duration - self.site = site self.cameraView = cameraView if databaseFilename is None and len(self.name) > 0: self.databaseFilename = removeExtension(self.name)+'.sqlite' def getVideoSequenceFilename(self, relativeToSiteFilename = True): if relativeToSiteFilename: - return self.site.getFilename()+path.sep+self.name + return self.cameraView.site.getFilename()+path.sep+self.name else: return self.name + def getDatabaseFilename(self, relativeToSiteFilename = True): + if relativeToSiteFilename: + return self.cameraView.site.getFilename()+path.sep+self.databaseFilename + else: + return self.databaseFilename + def getTimeInterval(self): return TimeInterval(self.startTime, self.startTime+self.duration)