From 671c30449d0675b0f401aac1001f56e379c71203 Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Sun, 16 Apr 2006 10:39:07 +0000
Subject: [PATCH] - empty legend input field when no object is
 selected/available - tweaks & cleanup

---
 Aircraft/ufo/ufo-set.xml |  2 +-
 Aircraft/ufo/ufo.nas     | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Aircraft/ufo/ufo-set.xml b/Aircraft/ufo/ufo-set.xml
index e48707843..f65005f75 100644
--- a/Aircraft/ufo/ufo-set.xml
+++ b/Aircraft/ufo/ufo-set.xml
@@ -39,7 +39,7 @@
    </key>
    <key>
     <name>space bar + mouse click</name>
-    <desc>select nearest model (blinks twice)</desc>
+    <desc>select nearest model (flashes)</desc>
    </key>
    <key>
     <name>space bar + cursor up/down</name>
diff --git a/Aircraft/ufo/ufo.nas b/Aircraft/ufo/ufo.nas
index d10acdfc5..3e4e27aa3 100644
--- a/Aircraft/ufo/ufo.nas
+++ b/Aircraft/ufo/ufo.nas
@@ -59,8 +59,7 @@ xyz2lonlat = func(xyz) {
 	var x = xyz[0];
 	var y = xyz[1];
 	var z = xyz[2];
-	var aux = x * x + y * y;
-	var lat = math.atan2(z, math.sqrt(aux)) * R2D;
+	var lat = math.atan2(z, math.sqrt(x * x + y * y)) * R2D;
 	var lon = math.atan2(y, x) * R2D;
 	return [lon, lat];
 }
@@ -623,8 +622,11 @@ ModelMgr = {
 				me.static = left;
 			}
 		}
-		if (me.dynamic != nil) {
-			me.dynamic.flash(4);
+		# last object removed?
+		if (me.dynamic == nil) {
+			adjust.legendN.setValue("");
+		} else {
+			me.dynamic.flash(6);
 		}
 		me.display_status(me.modelpath);
 	},
@@ -643,7 +645,7 @@ ModelMgr = {
 		me.display_status(path);
 	},
 	display_status : func(p) {
-		var count = (me.dynamic == nil ? 0 : 1) + size(me.static);
+		var count = (me.dynamic != nil) + size(me.static);
 		setprop("/sim/model/ufo/status", "(" ~ count ~ ")  " ~ p);
 	},
 	get_data : func {