Changeset 33
- Timestamp:
- 02/03/12 17:41:56
- Files:
-
- points/trunk/points.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
points/trunk/points.py
r32 r33 95 95 return [latlondict['lat'], latlondict['lon']] 96 96 97 def line( target, origin, steps=steps):97 def line(origin, target, steps=steps): 98 98 vector = {'lat': target['lat'] - origin['lat'], 99 99 'lon': target['lon'] - origin['lon']} … … 119 119 sys.exit(__doc__) 120 120 121 LB1ADCP = map(ddmm2decdeg, LB1ADCP) 122 LB2ADCP = map(ddmm2decdeg, LB2ADCP) 123 LB3ADCP = map(ddmm2decdeg, LB3ADCP) 121 target = LB2ADCP 122 124 123 glider_pos = map(ddmm2decdeg, glider_pos) 124 target = map(ddmm2decdeg, target) 125 125 126 LB1ADCP = latlondict(LB1ADCP)127 LB2ADCP = latlondict(LB2ADCP)128 LB3ADCP = latlondict(LB3ADCP)129 126 glider_pos = latlondict(glider_pos) 127 target = latlondict(target) 130 128 131 points = line( LB2ADCP, glider_pos)129 points = line(glider_pos, target) 132 130 points = [latlonlist(point) for point in points] 133 131 points = [map(decdeg2ddmm, point) for point in points] … … 150 148 "w") 151 149 handle.write(first_template % (file_name, now, __file__, steps)) 152 handle.writelines(["\t%. 4f\t%.4f\n" % tuple(point) for point in points])150 handle.writelines(["\t%.3f\t%.3f\n" % tuple(point) for point in points]) 153 151 handle.write(last_template) 154 152 handle.close()