Mercurial Hosting > traffic-intelligence
changeset 862:2d6249fe905a
correcting bug
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Mon, 07 Nov 2016 11:11:10 -0500 |
parents | f9c9457b60c2 |
children | a8ca72dc1564 |
files | python/metadata.py python/storage.py |
diffstat | 2 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/python/metadata.py Fri Nov 04 11:47:42 2016 -0400 +++ b/python/metadata.py Mon Nov 07 11:11:10 2016 -0500 @@ -133,12 +133,15 @@ self.map2 = None @staticmethod - def getCameraType(session, cameraTypeId): + def getCameraType(session, cameraTypeId, resX = None): 'Returns the site(s) matching the index or the name' if str.isdigit(cameraTypeId): return session.query(CameraType).filter(CameraType.idx == int(cameraTypeId)).all() else: - return session.query(CameraType).filter(CameraType.name.like('%'+cameraTypeId+'%')).all() + if resX is not None: + return session.query(CameraType).filter(CameraType.name.like('%'+cameraTypeId+'%')).filter(CameraType.resX == resX).all() + else: + return session.query(CameraType).filter(CameraType.name.like('%'+cameraTypeId+'%')).all() class CameraView(Base): __tablename__ = 'camera_views'
--- a/python/storage.py Fri Nov 04 11:47:42 2016 -0400 +++ b/python/storage.py Mon Nov 07 11:11:10 2016 -0500 @@ -1258,20 +1258,23 @@ config = ConfigParser() config.readfp(FakeSecHead(openCheck(filename))) # check if path contains directory names - dirname = path.split(filename)[0] + if len(path.split(filename)[0]) == 0: + dirname = '.'+path.sep + else: + dirname = path.split(filename)[0]+path.sep self.sectionHeader = config.sections()[0] # Tracking/display parameters self.videoFilename = config.get(self.sectionHeader, 'video-filename') self.databaseFilename = config.get(self.sectionHeader, 'database-filename') self.homographyFilename = config.get(self.sectionHeader, 'homography-filename') - if (path.exists(self.homographyFilename)): - self.homography = loadtxt(self.homographyFilename) + if path.exists(dirname+self.homographyFilename): + self.homography = loadtxt(dirname+self.homographyFilename) else: self.homography = None self.intrinsicCameraFilename = config.get(self.sectionHeader, 'intrinsic-camera-filename') - if (path.exists(dirname+path.sep+self.intrinsicCameraFilename)): - self.intrinsicCameraMatrix = loadtxt(dirname+path.sep+self.intrinsicCameraFilename) + if path.exists(dirname+self.intrinsicCameraFilename): + self.intrinsicCameraMatrix = loadtxt(dirname+self.intrinsicCameraFilename) else: self.intrinsicCameraMatrix = None distortionCoefficients = getValuesFromINIFile(filename, 'distortion-coefficients', '=')