Mercurial > hg > nsaunier > traffic-intelligence

comparison python/metadata.py @ 957:5d9899504977

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed unnecessary field undistortedImageMultiplication
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Tue, 15 Aug 2017 16:51:04 -0400
parents a15e843af55a
children 32a34a143c27
comparison
equal deleted inserted replaced
956:196a1fd498ba 957:5d9899504977
111 resY = Column(Integer) 111 resY = Column(Integer)
112 frameRate = Column(Float) 112 frameRate = Column(Float)
113 frameRateTimeUnit = Column(String, default = 's') 113 frameRateTimeUnit = Column(String, default = 's')
114 intrinsicCameraMatrixStr = Column(String) 114 intrinsicCameraMatrixStr = Column(String)
115 distortionCoefficientsStr = Column(String) 115 distortionCoefficientsStr = Column(String)
116 undistortedImageMultiplication = Column(Float) 116
117 117 def __init__(self, name, resX, resY, frameRate, frameRateTimeUnit = 's', trackingConfigurationFilename = None, intrinsicCameraFilename = None, intrinsicCameraMatrix = None, distortionCoefficients = None):
118 def __init__(self, name, resX, resY, frameRate, frameRateTimeUnit = 's', trackingConfigurationFilename = None, intrinsicCameraFilename = None, intrinsicCameraMatrix = None, distortionCoefficients = None, undistortedImageMultiplication = None):
119 self.name = name 118 self.name = name
120 self.resX = resX 119 self.resX = resX
121 self.resY = resY 120 self.resY = resY
122 self.frameRate = frameRate 121 self.frameRate = frameRate
123 self.frameRateTimeUnit = frameRateTimeUnit 122 self.frameRateTimeUnit = frameRateTimeUnit
127 if trackingConfigurationFilename is not None: 126 if trackingConfigurationFilename is not None:
128 from storage import ProcessParameters 127 from storage import ProcessParameters
129 params = ProcessParameters(trackingConfigurationFilename) 128 params = ProcessParameters(trackingConfigurationFilename)
130 self.intrinsicCameraMatrix = params.intrinsicCameraMatrix 129 self.intrinsicCameraMatrix = params.intrinsicCameraMatrix
131 self.distortionCoefficients = params.distortionCoefficients 130 self.distortionCoefficients = params.distortionCoefficients
132 self.undistortedImageMultiplication = params.undistortedImageMultiplication
133 elif intrinsicCameraFilename is not None: 131 elif intrinsicCameraFilename is not None:
134 self.intrinsicCameraMatrix = loadtxt(intrinsicCameraFilename) 132 self.intrinsicCameraMatrix = loadtxt(intrinsicCameraFilename)
135 self.distortionCoefficients = distortionCoefficients 133 self.distortionCoefficients = distortionCoefficients
136 self.undistortedImageMultiplication = undistortedImageMultiplication
137 else: 134 else:
138 self.intrinsicCameraMatrix = intrinsicCameraMatrix 135 self.intrinsicCameraMatrix = intrinsicCameraMatrix
139 self.distortionCoefficients = distortionCoefficients 136 self.distortionCoefficients = distortionCoefficients
140 self.undistortedImageMultiplication = undistortedImageMultiplication
141 137
142 if self.intrinsicCameraMatrix is not None: 138 if self.intrinsicCameraMatrix is not None:
143 self.intrinsicCameraMatrixStr = str(self.intrinsicCameraMatrix.tolist()) 139 self.intrinsicCameraMatrixStr = str(self.intrinsicCameraMatrix.tolist())
144 if self.distortionCoefficients is not None and len(self.distortionCoefficients) == 5: 140 if self.distortionCoefficients is not None and len(self.distortionCoefficients) == 5:
145 self.distortionCoefficientsStr = str(self.distortionCoefficients) 141 self.distortionCoefficientsStr = str(self.distortionCoefficients)
154 if self.distortionCoefficientsStr is not None: 150 if self.distortionCoefficientsStr is not None:
155 self.distortionCoefficients = literal_eval(self.distortionCoefficientsStr) 151 self.distortionCoefficients = literal_eval(self.distortionCoefficientsStr)
156 else: 152 else:
157 self.distortionCoefficients = None 153 self.distortionCoefficients = None
158 154
159 def computeUndistortMaps(self): 155 def computeUndistortMaps(self, undistortedImageMultiplication = None):
160 if self.undistortedImageMultiplication is not None and self.intrinsicCameraMatrix is not None and self.distortionCoefficients is not None: 156 if undistortedImageMultiplication is not None and self.intrinsicCameraMatrix is not None and self.distortionCoefficients is not None:
161 self.map1, self.map2 = computeUndistortMaps(self.resX, self.resY, self.undistortedImageMultiplication, self.intrinsicCameraMatrix, self.distortionCoefficients) 157 [self.map1, self.map2], newCameraMatrix = computeUndistortMaps(self.resX, self.resY, undistortedImageMultiplication, self.intrinsicCameraMatrix, self.distortionCoefficients)
162 else: 158 else:
163 self.map1 = None 159 self.map1 = None
164 self.map2 = None 160 self.map2 = None
165 161
166 @staticmethod 162 @staticmethod