From f1362484ef746cdc007fae290a4eb97f9745e8da Mon Sep 17 00:00:00 2001 From: mfranz Date: Wed, 15 Mar 2006 15:50:35 +0000 Subject: [PATCH] swap ufo and cursor dump --- Aircraft/ufo/ufo.nas | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/Aircraft/ufo/ufo.nas b/Aircraft/ufo/ufo.nas index 183533b17..2ffc067d6 100644 --- a/Aircraft/ufo/ufo.nas +++ b/Aircraft/ufo/ufo.nas @@ -287,20 +287,6 @@ showDialog = func { dumpCoords = func { - print("\n\n--------------------------- Cursor ---------------------------"); - - var alt = cursor.values["alt"].get(); - print(sprintf("Longitude: %.6f deg", var clon = cursor.values["lon"].get())); - print(sprintf("Latitude: %.6f deg", var clat = cursor.values["lat"].get())); - print(sprintf("Altitude: %.4f m (%.4f ft)", var celev = ft2m(alt), alt)); - print(sprintf("Heading: %.1f deg", var chdg = normdeg(cursor.values["hdg"].get()))); - print(sprintf("Pitch: %.1f deg", normdeg(cursor.values["pitch"].get()))); - print(sprintf("Roll: %.1f deg", normdeg(cursor.values["roll"].get()))); - print(""); - print(tile_path(clon, clat)); - print(sprintf("OBJECT_STATIC %.6f %.6f %.4f %.1f", clon, clat, celev, normdeg(360 - chdg))); - - print("\n---------------------------- UFO -----------------------------"); var lon = getprop("/position/longitude-deg"); @@ -319,7 +305,22 @@ dumpCoords = func { print(""); print(tile_path(lon, lat)); print(sprintf("OBJECT_STATIC %.6f %.6f %.4f %.1f", lon, lat, elev_m, normdeg(360 - heading))); + + + print("\n\n--------------------------- Cursor ---------------------------"); + + var alt = cursor.values["alt"].get(); + print(sprintf("Longitude: %.6f deg", var clon = cursor.values["lon"].get())); + print(sprintf("Latitude: %.6f deg", var clat = cursor.values["lat"].get())); + print(sprintf("Altitude: %.4f m (%.4f ft)", var celev = ft2m(alt), alt)); + print(sprintf("Heading: %.1f deg", var chdg = normdeg(cursor.values["hdg"].get()))); + print(sprintf("Pitch: %.1f deg", normdeg(cursor.values["pitch"].get()))); + print(sprintf("Roll: %.1f deg", normdeg(cursor.values["roll"].get()))); + print(""); + print(tile_path(clon, clat)); + print(sprintf("OBJECT_STATIC %.6f %.6f %.4f %.1f", clon, clat, celev, normdeg(360 - chdg))); print("--------------------------------------------------------------"); + }