Mercurial Hosting > traffic-intelligence
diff python/storage.py @ 861:f9c9457b60c2
modification of storage of intrinsic camera and distortion parameters
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Fri, 04 Nov 2016 11:47:42 -0400 |
parents | 33d296984dd8 |
children | 2d6249fe905a |
line wrap: on
line diff
--- a/python/storage.py Sat Oct 29 16:34:05 2016 -0400 +++ b/python/storage.py Fri Nov 04 11:47:42 2016 -0400 @@ -437,8 +437,7 @@ def deleteFromSqlite(filename, dataType): 'Deletes (drops) some tables in the filename depending on type of data' - import os - if os.path.isfile(filename): + if path.isfile(filename): connection = sqlite3.connect(filename) if dataType == 'object': dropTables(connection, ['objects', 'objects_features']) @@ -1258,6 +1257,9 @@ config = ConfigParser() config.readfp(FakeSecHead(openCheck(filename))) + # check if path contains directory names + dirname = path.split(filename)[0] + self.sectionHeader = config.sections()[0] # Tracking/display parameters self.videoFilename = config.get(self.sectionHeader, 'video-filename') @@ -1268,8 +1270,8 @@ else: self.homography = None self.intrinsicCameraFilename = config.get(self.sectionHeader, 'intrinsic-camera-filename') - if (path.exists(self.intrinsicCameraFilename)): - self.intrinsicCameraMatrix = loadtxt(self.intrinsicCameraFilename) + if (path.exists(dirname+path.sep+self.intrinsicCameraFilename)): + self.intrinsicCameraMatrix = loadtxt(dirname+path.sep+self.intrinsicCameraFilename) else: self.intrinsicCameraMatrix = None distortionCoefficients = getValuesFromINIFile(filename, 'distortion-coefficients', '=')