Mercurial Hosting > traffic-intelligence
comparison python/storage.py @ 1026:73b124160911 v0.2
more plumbing
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Wed, 13 Jun 2018 14:55:22 -0400 |
parents | b7689372c0ec |
children |
comparison
equal
deleted
inserted
replaced
1025:6ba30b259525 | 1026:73b124160911 |
---|---|
1425 firstFrameNum = 0 | 1425 firstFrameNum = 0 |
1426 | 1426 |
1427 # override video and database filenames if present on command line | 1427 # override video and database filenames if present on command line |
1428 # if not absolute, make all filenames relative to the location of the configuration filename | 1428 # if not absolute, make all filenames relative to the location of the configuration filename |
1429 if args.videoFilename is not None: | 1429 if args.videoFilename is not None: |
1430 videoFilename = utils.getRelativeFilename(parentPath, args.videoFilename) | 1430 videoFilename = args.videoFilename |
1431 else: | 1431 else: |
1432 videoFilename = params.videoFilename | 1432 videoFilename = params.videoFilename |
1433 if args.databaseFilename is not None: | 1433 if args.databaseFilename is not None: |
1434 databaseFilename = utils.getRelativeFilename(parentPath, args.databaseFilename) | 1434 databaseFilename = args.databaseFilename |
1435 else: | 1435 else: |
1436 databaseFilename = params.databaseFilename | 1436 databaseFilename = params.databaseFilename |
1437 | 1437 |
1438 return params, videoFilename, databaseFilename, invHomography, intrinsicCameraMatrix, distortionCoefficients, undistortedImageMultiplication, undistort, firstFrameNum | 1438 return params, videoFilename, databaseFilename, invHomography, intrinsicCameraMatrix, distortionCoefficients, undistortedImageMultiplication, undistort, firstFrameNum |
1439 | 1439 |