Mercurial Hosting > traffic-intelligence
changeset 640:fe34c0f79c32
cleaner import that does not rely on StringIO or yaml
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Thu, 09 Apr 2015 13:21:22 +0200 |
| parents | 4e7925cb4f8f |
| children | 9fe254f11743 |
| files | scripts/compute-homography.py |
| diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/compute-homography.py Thu Apr 09 13:11:25 2015 +0200 +++ b/scripts/compute-homography.py Thu Apr 09 13:21:22 2015 +0200 @@ -81,14 +81,13 @@ worldPts, videoPts = cvutils.loadPointCorrespondences(args.pointCorrespondencesFilename) homography, mask = cv2.findHomography(videoPts, worldPts) # method=0, ransacReprojThreshold=3 elif args.tsaiCameraFilename is not None: # hack using PDTV - from StringIO import StringIO from pdtv import TsaiCamera - import yaml f = storage.openCheck(args.tsaiCameraFilename, quitting = True) content = storage.getLines(f) - #out.write('data_class: TsaiCamera\n') - yamlContent = ''.join([l.replace(' f:', 'f:').replace(' k:', 'k:').replace(',','.')+'\n' for l in content]) - cameraData = yaml.load(StringIO(yamlContent)) + cameraData = {} + for l in content: + tmp = l.split(':') + cameraData[tmp[0]] = float(tmp[1].strip().replace(',','.')) camera = TsaiCamera(Cx=cameraData['Cx'], Cy=cameraData['Cy'], Sx=cameraData['Sx'], Tx=cameraData['Tx'], Ty=cameraData['Ty'], Tz=cameraData['Tz'], dx=cameraData['dx'], dy=cameraData['dy'], f=cameraData['f'], k=cameraData['k'], r1=cameraData['r1'], r2=cameraData['r2'], r3=cameraData['r3'], r4=cameraData['r4'], r5=cameraData['r5'], r6=cameraData['r6'], r7=cameraData['r7'], r8=cameraData['r8'], r9=cameraData['r9']) homography = cvutils.computeHomographyFromPDTV(camera) elif args.videoFrameFilename is not None and args.worldFilename is not None: