Mercurial Hosting > traffic-intelligence

comparison python/storage.py @ 882:4749b71aa7fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
corrected bugs in storage.py when having configuration files and other files in different directories: everything should be relative to directory of command line when running the program (see FAQ)
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Wed, 15 Mar 2017 12:36:03 -0400
parents 000555430b28
children f766fe0995f4
comparison
equal deleted inserted replaced
881:8ba82b371eea 882:4749b71aa7fb
1289 def loadConfigFile(self, filename): 1289 def loadConfigFile(self, filename):
1290 from ConfigParser import ConfigParser 1290 from ConfigParser import ConfigParser
1291 1291
1292 config = ConfigParser() 1292 config = ConfigParser()
1293 config.readfp(FakeSecHead(openCheck(filename))) 1293 config.readfp(FakeSecHead(openCheck(filename)))
1294 # check if path contains directory names
1295 if len(path.split(filename)[0]) == 0:
1296 dirname = '.'+path.sep
1297 else:
1298 dirname = path.split(filename)[0]+path.sep
1299 1294
1300 self.sectionHeader = config.sections()[0] 1295 self.sectionHeader = config.sections()[0]
1301 # Tracking/display parameters 1296 # Tracking/display parameters
1302 self.videoFilename = config.get(self.sectionHeader, 'video-filename') 1297 self.videoFilename = config.get(self.sectionHeader, 'video-filename')
1303 self.databaseFilename = config.get(self.sectionHeader, 'database-filename') 1298 self.databaseFilename = config.get(self.sectionHeader, 'database-filename')
1304 self.homographyFilename = config.get(self.sectionHeader, 'homography-filename') 1299 self.homographyFilename = config.get(self.sectionHeader, 'homography-filename')
1305 if path.exists(dirname+self.homographyFilename): 1300 if path.exists(self.homographyFilename):
1306 self.homography = loadtxt(dirname+self.homographyFilename) 1301 self.homography = loadtxt(self.homographyFilename)
1307 else: 1302 else:
1308 self.homography = None 1303 self.homography = None
1309 self.intrinsicCameraFilename = config.get(self.sectionHeader, 'intrinsic-camera-filename') 1304 self.intrinsicCameraFilename = config.get(self.sectionHeader, 'intrinsic-camera-filename')
1310 if path.exists(dirname+self.intrinsicCameraFilename): 1305 if path.exists(self.intrinsicCameraFilename):
1311 self.intrinsicCameraMatrix = loadtxt(dirname+self.intrinsicCameraFilename) 1306 self.intrinsicCameraMatrix = loadtxt(self.intrinsicCameraFilename)
1312 else: 1307 else:
1313 self.intrinsicCameraMatrix = None 1308 self.intrinsicCameraMatrix = None
1314 distortionCoefficients = getValuesFromINIFile(filename, 'distortion-coefficients', '=') 1309 distortionCoefficients = getValuesFromINIFile(filename, 'distortion-coefficients', '=')
1315 self.distortionCoefficients = [float(x) for x in distortionCoefficients] 1310 self.distortionCoefficients = [float(x) for x in distortionCoefficients]
1316 self.undistortedImageMultiplication = config.getfloat(self.sectionHeader, 'undistorted-size-multiplication') 1311 self.undistortedImageMultiplication = config.getfloat(self.sectionHeader, 'undistorted-size-multiplication')