Mercurial Hosting > traffic-intelligence
diff python/metadata.py @ 836:7058a40a4bbc
updated metadata and code to merge features from different cameras
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Wed, 06 Jul 2016 10:18:35 -0400 |
parents | 2a5856961933 |
children | 2918de3d40fc |
line wrap: on
line diff
--- a/python/metadata.py Tue Jul 05 13:56:13 2016 -0400 +++ b/python/metadata.py Wed Jul 06 10:18:35 2016 -0400 @@ -164,17 +164,19 @@ cameraTypeIdx = Column(Integer, ForeignKey('camera_types.idx')) trackingConfigurationFilename = Column(String) # path to configuration .cfg file, relative to site name maskFilename = Column(String) # path to mask file, relative to site name + virtual = Column(Boolean) # indicates it is not a real camera view, eg merged site = relationship("Site", backref=backref('sites', order_by = idx)) cameraType = relationship('CameraType', backref=backref('camera_views', order_by = idx)) - def __init__(self, description, homographyFilename, site, cameraType, trackingConfigurationFilename, maskFilename): + def __init__(self, description, homographyFilename, site, cameraType, trackingConfigurationFilename, maskFilename, virtual = False): self.description = description self.homographyFilename = homographyFilename self.site = site self.cameraType = cameraType self.trackingConfigurationFilename = trackingConfigurationFilename self.maskFilename = maskFilename + self.virtual = virtual def getHomographyFilename(self, relativeToSiteFilename = True): if relativeToSiteFilename: @@ -232,11 +234,12 @@ startTime = Column(DateTime) duration = Column(Interval) # video sequence duration databaseFilename = Column(String) # path relative to the the site name + virtual = Column(Boolean) # indicates it is not a real video sequence (no video file), eg merged cameraViewIdx = Column(Integer, ForeignKey('camera_views.idx')) cameraView = relationship("CameraView", backref=backref('video_sequences', order_by = idx)) - def __init__(self, name, startTime, duration, cameraView, databaseFilename = None): + def __init__(self, name, startTime, duration, cameraView, databaseFilename = None, virtual = False): '''startTime is passed as string in utils.datetimeFormat, eg 2011-06-22 10:00:39 duration is a timedelta object''' self.name = name @@ -248,6 +251,7 @@ self.cameraView = cameraView if databaseFilename is None and len(self.name) > 0: self.databaseFilename = removeExtension(self.name)+'.sqlite' + self.virtual = virtual def getVideoSequenceFilename(self, relativeToSiteFilename = True): if relativeToSiteFilename: