Mercurial Hosting > traffic-intelligence
changeset 957:5d9899504977
removed unnecessary field undistortedImageMultiplication
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Tue, 15 Aug 2017 16:51:04 -0400 |
parents | 196a1fd498ba |
children | 747a5c68bd3c |
files | python/metadata.py |
diffstat | 1 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/python/metadata.py Tue Aug 15 16:15:55 2017 -0400 +++ b/python/metadata.py Tue Aug 15 16:51:04 2017 -0400 @@ -113,9 +113,8 @@ frameRateTimeUnit = Column(String, default = 's') intrinsicCameraMatrixStr = Column(String) distortionCoefficientsStr = Column(String) - undistortedImageMultiplication = Column(Float) - def __init__(self, name, resX, resY, frameRate, frameRateTimeUnit = 's', trackingConfigurationFilename = None, intrinsicCameraFilename = None, intrinsicCameraMatrix = None, distortionCoefficients = None, undistortedImageMultiplication = None): + def __init__(self, name, resX, resY, frameRate, frameRateTimeUnit = 's', trackingConfigurationFilename = None, intrinsicCameraFilename = None, intrinsicCameraMatrix = None, distortionCoefficients = None): self.name = name self.resX = resX self.resY = resY @@ -129,15 +128,12 @@ params = ProcessParameters(trackingConfigurationFilename) self.intrinsicCameraMatrix = params.intrinsicCameraMatrix self.distortionCoefficients = params.distortionCoefficients - self.undistortedImageMultiplication = params.undistortedImageMultiplication elif intrinsicCameraFilename is not None: self.intrinsicCameraMatrix = loadtxt(intrinsicCameraFilename) self.distortionCoefficients = distortionCoefficients - self.undistortedImageMultiplication = undistortedImageMultiplication else: self.intrinsicCameraMatrix = intrinsicCameraMatrix self.distortionCoefficients = distortionCoefficients - self.undistortedImageMultiplication = undistortedImageMultiplication if self.intrinsicCameraMatrix is not None: self.intrinsicCameraMatrixStr = str(self.intrinsicCameraMatrix.tolist()) @@ -156,9 +152,9 @@ else: self.distortionCoefficients = None - def computeUndistortMaps(self): - if self.undistortedImageMultiplication is not None and self.intrinsicCameraMatrix is not None and self.distortionCoefficients is not None: - self.map1, self.map2 = computeUndistortMaps(self.resX, self.resY, self.undistortedImageMultiplication, self.intrinsicCameraMatrix, self.distortionCoefficients) + def computeUndistortMaps(self, undistortedImageMultiplication = None): + if undistortedImageMultiplication is not None and self.intrinsicCameraMatrix is not None and self.distortionCoefficients is not None: + [self.map1, self.map2], newCameraMatrix = computeUndistortMaps(self.resX, self.resY, undistortedImageMultiplication, self.intrinsicCameraMatrix, self.distortionCoefficients) else: self.map1 = None self.map2 = None