# HG changeset patch # User Nicolas Saunier # Date 1401745609 14400 # Node ID 81ff62a7c39f0e97caa1cdc03b3a4792eb2ce1db # Parent ad518f0c32185e5d6153c792734f414baa8cf6af corrected bug so it can work without undistortion parameters diff -r ad518f0c3218 -r 81ff62a7c39f scripts/display-trajectories.py --- a/scripts/display-trajectories.py Wed May 28 17:46:38 2014 -0400 +++ b/scripts/display-trajectories.py Mon Jun 02 17:46:49 2014 -0400 @@ -38,21 +38,24 @@ else: homography = None undistort = False - + intrinsicCameraMatrix = None + distortionCoefficients = [] + undistortedImageMultiplication = None + firstFrameNum = 0 -if not args.configFilename or args.videoFilename != None: +if not args.configFilename and args.videoFilename != None: videoFilename = args.videoFilename -if not args.configFilename or args.databaseFilename != None: +if not args.configFilename and args.databaseFilename != None: databaseFilename = args.databaseFilename -if not args.configFilename or args.homographyFilename != None: +if not args.configFilename and args.homographyFilename != None: homography = inv(loadtxt(args.homographyFilename)) -if not args.configFilename or args.intrinsicCameraMatrixFilename != None: +if not args.configFilename and args.intrinsicCameraMatrixFilename != None: intrinsicCameraMatrix = loadtxt(args.intrinsicCameraMatrixFilename) -if not args.configFilename or args.distortionCoefficients != None: +if not args.configFilename and args.distortionCoefficients != None: distortionCoefficients = args.distortionCoefficients -if not args.configFilename or args.undistortedImageMultiplication != None: +if not args.configFilename and args.undistortedImageMultiplication != None: undistortedImageMultiplication = args.undistortedImageMultiplication -if not args.configFilename or args.firstFrameNum != None: +if not args.configFilename and args.firstFrameNum != None: firstFrameNum = args.firstFrameNum