VOID_Orbital, VOID_Tools: Added some guards to prevent NREs when various vessel references are null.
[VOID.git] / VOID_Orbital.cs
blob:a/VOID_Orbital.cs -> blob:b/VOID_Orbital.cs
--- a/VOID_Orbital.cs
+++ b/VOID_Orbital.cs
@@ -44,7 +44,7 @@
 
 		public VOID_Orbital()
 		{
-			this._Name = "Orbital Information";
+			this.Name = "Orbital Information";
 
 			this.WindowPos.x = Screen.width - 520f;
 			this.WindowPos.y = 250f;
@@ -52,8 +52,6 @@
 
 		public override void ModuleWindow(int _)
 		{
-			base.ModuleWindow (_);
-
 			int idx = 0;
 
             GUILayout.BeginVertical();
@@ -81,7 +79,7 @@
 			this.precisionValues [idx]= (ushort)VOID_Data.gravityAccel.DoGUIHorizontal (this.precisionValues [idx]);
 			idx++;
 
-			this.toggleExtended.value = GUILayout.Toggle(this.toggleExtended, "Extended info");
+			this.toggleExtended.value = GUITools.Toggle(this.toggleExtended, "Extended info");
 
 			if (this.toggleExtended)
             {
@@ -123,128 +121,6 @@
 			base._SaveToConfig (config);
 		}
 	}
-
-
-	public static partial class VOID_Data
-	{
-		public static readonly VOID_StrValue primaryName = new VOID_StrValue (
-			VOID_Localization.void_primary,
-			delegate()
-		{
-			if (VOID_Core.Instance.vessel == null)
-			{
-				return string.Empty;
-			}
-			return VOID_Core.Instance.vessel.mainBody.name;
-		}
-		);
-
-		public static readonly VOID_DoubleValue orbitAltitude = new VOID_DoubleValue (
-			"Altitude (ASL)",
-			new Func<double> (() => VOID_Core.Instance.vessel.orbit.altitude),
-			"m"
-		);
-
-		public static readonly VOID_DoubleValue orbitVelocity = new VOID_DoubleValue (
-			VOID_Localization.void_velocity,
-			new Func<double> (() => VOID_Core.Instance.vessel.orbit.vel.magnitude),
-			"m/s"
-		);
-
-		public static readonly VOID_DoubleValue orbitApoAlt = new VOID_DoubleValue(
-			VOID_Localization.void_apoapsis,
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.ApA),
-			"m"
-		);
-
-		public static readonly VOID_DoubleValue oribtPeriAlt = new VOID_DoubleValue(
-			VOID_Localization.void_periapsis,
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.PeA),
-			"m"
-		);
-
-		public static readonly VOID_StrValue timeToApo = new VOID_StrValue(
-			"Time to Apoapsis",
-			new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp))
-		);
-
-		public static readonly VOID_StrValue timeToPeri = new VOID_StrValue(
-			"Time to Periapsis",
-			new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe))
-		);
-
-		public static readonly VOID_DoubleValue orbitInclination = new VOID_DoubleValue(
-			"Inclination",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.inclination),
-			"°"
-		);
-
-		public static readonly VOID_DoubleValue gravityAccel = new VOID_DoubleValue(
-			"Gravity",
-			delegate()
-		{
-			double orbitRadius = VOID_Core.Instance.vessel.mainBody.Radius +
-				VOID_Core.Instance.vessel.mainBody.GetAltitude(VOID_Core.Instance.vessel.findWorldCenterOfMass());
-			return (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
-				Math.Pow(orbitRadius, 2);
-		},
-			"m/s²"
-		);
-
-		public static readonly VOID_StrValue orbitPeriod = new VOID_StrValue(
-			"Period",
-			new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
-		);
-
-		public static readonly VOID_DoubleValue semiMajorAxis = new VOID_DoubleValue(
-			"Semi-Major Axis",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.semiMajorAxis),
-			"m"
-		);
-
-		public static readonly VOID_DoubleValue eccentricity = new VOID_DoubleValue(
-			"Eccentricity",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricity),
-			""
-		);
-
-		public static readonly VOID_DoubleValue meanAnomaly = new VOID_DoubleValue(
-			"Mean Anomaly",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.meanAnomaly * 180d / Math.PI),
-			"°"
-		);
-
-		public static readonly VOID_DoubleValue trueAnomaly = new VOID_DoubleValue(
-			"True Anomaly",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.trueAnomaly),
-			"°"
-		);
-
-		public static readonly VOID_DoubleValue eccAnomaly = new VOID_DoubleValue(
-			"Eccentric Anomaly",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricAnomaly * 180d / Math.PI),
-			"°"
-		);
-
-		public static readonly VOID_DoubleValue longitudeAscNode = new VOID_DoubleValue(
-			"Long. Ascending Node",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.LAN),
-			"°"
-		);
-
-		public static readonly VOID_DoubleValue argumentPeriapsis = new VOID_DoubleValue(
-			"Argument of Periapsis",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.argumentOfPeriapsis),
-			"°"
-		);
-
-		public static readonly VOID_DoubleValue localSiderealLongitude = new VOID_DoubleValue(
-			"Local Sidereal Longitude",
-			new Func<double>(() => VOID_Tools.FixDegreeDomain(
-				VOID_Core.Instance.vessel.longitude + VOID_Core.Instance.vessel.orbit.referenceBody.rotationAngle)),
-			"°"
-		);
-	}
 }