Mercurial Hosting > traffic-intelligence

comparison scripts/display-trajectories.py @ 512:81ff62a7c39f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
corrected bug so it can work without undistortion parameters
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Mon, 02 Jun 2014 17:46:49 -0400
parents 935430b1d408
children 1ba618fb0f70
comparison
equal deleted inserted replaced
511:ad518f0c3218 512:81ff62a7c39f
36 undistort = params.undistort 36 undistort = params.undistort
37 firstFrameNum = params.firstFrameNum 37 firstFrameNum = params.firstFrameNum
38 else: 38 else:
39 homography = None 39 homography = None
40 undistort = False 40 undistort = False
41 41 intrinsicCameraMatrix = None
42 distortionCoefficients = []
43 undistortedImageMultiplication = None
44 firstFrameNum = 0
42 45
43 if not args.configFilename or args.videoFilename != None: 46 if not args.configFilename and args.videoFilename != None:
44 videoFilename = args.videoFilename 47 videoFilename = args.videoFilename
45 if not args.configFilename or args.databaseFilename != None: 48 if not args.configFilename and args.databaseFilename != None:
46 databaseFilename = args.databaseFilename 49 databaseFilename = args.databaseFilename
47 if not args.configFilename or args.homographyFilename != None: 50 if not args.configFilename and args.homographyFilename != None:
48 homography = inv(loadtxt(args.homographyFilename)) 51 homography = inv(loadtxt(args.homographyFilename))
49 if not args.configFilename or args.intrinsicCameraMatrixFilename != None: 52 if not args.configFilename and args.intrinsicCameraMatrixFilename != None:
50 intrinsicCameraMatrix = loadtxt(args.intrinsicCameraMatrixFilename) 53 intrinsicCameraMatrix = loadtxt(args.intrinsicCameraMatrixFilename)
51 if not args.configFilename or args.distortionCoefficients != None: 54 if not args.configFilename and args.distortionCoefficients != None:
52 distortionCoefficients = args.distortionCoefficients 55 distortionCoefficients = args.distortionCoefficients
53 if not args.configFilename or args.undistortedImageMultiplication != None: 56 if not args.configFilename and args.undistortedImageMultiplication != None:
54 undistortedImageMultiplication = args.undistortedImageMultiplication 57 undistortedImageMultiplication = args.undistortedImageMultiplication
55 if not args.configFilename or args.firstFrameNum != None: 58 if not args.configFilename and args.firstFrameNum != None:
56 firstFrameNum = args.firstFrameNum 59 firstFrameNum = args.firstFrameNum
57 60
58 61
59 objects = storage.loadTrajectoriesFromSqlite(databaseFilename, args.trajectoryType) 62 objects = storage.loadTrajectoriesFromSqlite(databaseFilename, args.trajectoryType)
60 boundingBoxes = storage.loadBoundingBoxTable(databaseFilename) 63 boundingBoxes = storage.loadBoundingBoxTable(databaseFilename)