Index: points/trunk/points.py =================================================================== --- points/trunk/points.py (revision 32) +++ points/trunk/points.py (revision 33) @@ -95,5 +95,5 @@ return [latlondict['lat'], latlondict['lon']] -def line(target, origin, steps=steps): +def line(origin, target, steps=steps): vector = {'lat': target['lat'] - origin['lat'], 'lon': target['lon'] - origin['lon']} @@ -119,15 +119,13 @@ sys.exit(__doc__) - LB1ADCP = map(ddmm2decdeg, LB1ADCP) - LB2ADCP = map(ddmm2decdeg, LB2ADCP) - LB3ADCP = map(ddmm2decdeg, LB3ADCP) + target = LB2ADCP + glider_pos = map(ddmm2decdeg, glider_pos) + target = map(ddmm2decdeg, target) - LB1ADCP = latlondict(LB1ADCP) - LB2ADCP = latlondict(LB2ADCP) - LB3ADCP = latlondict(LB3ADCP) glider_pos = latlondict(glider_pos) + target = latlondict(target) - points = line(LB2ADCP, glider_pos) + points = line(glider_pos, target) points = [latlonlist(point) for point in points] points = [map(decdeg2ddmm, point) for point in points] @@ -150,5 +148,5 @@ "w") handle.write(first_template % (file_name, now, __file__, steps)) - handle.writelines(["\t%.4f\t%.4f\n" % tuple(point) for point in points]) + handle.writelines(["\t%.3f\t%.3f\n" % tuple(point) for point in points]) handle.write(last_template) handle.close()