VOID_DataLogger: Moved initalization into the ctor.
--- a/VOIDFlightMaster.cs
+++ b/VOIDFlightMaster.cs
@@ -69,13 +69,6 @@
}
this.Core.Update ();
-
- if (this.Core.vessel != null)
- {
- SimManager.Instance.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
- Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
- SimManager.Instance.TryStartSimulation();
- }
if (this.Core.factoryReset)
{
--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -21,9 +21,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Reflection;
using KSP;
using UnityEngine;
+using Engineer.VesselSimulator;
namespace VOID
{
@@ -68,7 +68,7 @@
* Fields
* */
protected string VoidName = "VOID";
- protected string VoidVersion = "0.9.13";
+ protected string VoidVersion = "0.9.14";
protected bool _factoryReset = false;
@@ -135,10 +135,12 @@
public float saveTimer = 0;
+ protected string defaultSkin = "KSP window 2";
+
[AVOID_SaveValue("defaultSkin")]
- protected VOID_SaveValue<string> defaultSkin = "KSP window 2";
- protected int _skinIdx = int.MinValue;
- protected List<GUISkin> skin_list;
+ protected VOID_SaveValue<string> _skinName;
+ protected Dictionary<string, GUISkin> skin_list;
+ protected List<string> skinNames;
protected string[] forbiddenSkins =
{
"PlaqueDialogSkin",
@@ -176,11 +178,11 @@
{
get
{
- if (this.skin_list == null || this._skinIdx < 0 || this._skinIdx > this.skin_list.Count)
+ if (!this.skinsLoaded || this._skinName == null)
{
return AssetBase.GetGUISkin(this.defaultSkin);
}
- return this.skin_list[this._skinIdx];
+ return this.skin_list[this._skinName];
}
}
@@ -247,6 +249,8 @@
this.VOIDIconOn = GameDatabase.Instance.GetTexture (this.VOIDIconOnPath, false);
this.VOIDIconOff = GameDatabase.Instance.GetTexture (this.VOIDIconOffPath, false);
+
+ this._skinName = this.defaultSkin;
this.LoadConfig ();
}
@@ -333,6 +337,13 @@
{
this.Preload_BeforeUpdate ();
+ if (this.vessel != null)
+ {
+ SimManager.Instance.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
+ Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
+ SimManager.Instance.TryStartSimulation();
+ }
+
if (!this.guiRunning)
{
this.StartGUI ();
@@ -399,7 +410,7 @@
this.skin_list = AssetBase.FindObjectsOfTypeIncludingAssets(typeof(GUISkin))
.Where(s => !this.forbiddenSkins.Contains(s.name))
.Select(s => s as GUISkin)
- .ToList();
+ .ToDictionary(s => s.name);
Tools.PostDebugMessage(string.Format(
"{0}: loaded {1} GUISkins.",
@@ -407,9 +418,12 @@
this.skin_list.Count
));
- if (this._skinIdx == int.MinValue)
- {
- this._skinIdx = this.skin_list.IndexOf(this.Skin);
+ this.skinNames = this.skin_list.Keys.ToList();
+ this.skinNames.Sort();
+
+ if (this._skinName == null || !this.skinNames.Contains(this._skinName))
+ {
+ this._skinName = this.defaultSkin;
Tools.PostDebugMessage(string.Format(
"{0}: resetting _skinIdx to default.",
this.GetType().Name
@@ -419,7 +433,7 @@
Tools.PostDebugMessage(string.Format(
"{0}: _skinIdx = {1}.",
this.GetType().Name,
- this._skinIdx.ToString()
+ this._skinName.ToString()
));
this.skinsLoaded = true;
@@ -427,6 +441,9 @@
protected void LoadGUIStyles()
{
+ this.LabelStyles["link"] = new GUIStyle(GUI.skin.label);
+ this.LabelStyles["link"].fontStyle = FontStyle.Bold;
+
this.LabelStyles["center"] = new GUIStyle(GUI.skin.label);
this.LabelStyles["center"].normal.textColor = Color.white;
this.LabelStyles["center"].alignment = TextAnchor.UpperCenter;
@@ -439,6 +456,10 @@
this.LabelStyles["right"] = new GUIStyle(GUI.skin.label);
this.LabelStyles["right"].normal.textColor = Color.white;
this.LabelStyles["right"].alignment = TextAnchor.UpperRight;
+
+ this.LabelStyles ["red"] = new GUIStyle(GUI.skin.label);
+ this.LabelStyles ["red"].normal.textColor = Color.red;
+ this.LabelStyles ["red"].alignment = TextAnchor.MiddleCenter;
this.GUIStylesLoaded = true;
}
@@ -501,10 +522,7 @@
}
else
{
- GUIStyle label_txt_red = new GUIStyle(GUI.skin.label);
- label_txt_red.normal.textColor = Color.red;
- label_txt_red.alignment = TextAnchor.MiddleCenter;
- GUILayout.Label("-- POWER LOST --", label_txt_red);
+ GUILayout.Label("-- POWER LOST --", this.LabelStyles["red"]);
}
this.configWindowMinimized = !GUILayout.Toggle (!this.configWindowMinimized, "Configuration");
@@ -525,6 +543,10 @@
public override void DrawConfigurables()
{
+ int skinIdx;
+
+ GUIContent _content;
+
if (HighLogic.LoadedSceneIsFlight)
{
this.consumeResource = GUILayout.Toggle (this.consumeResource, "Consume Resources");
@@ -536,24 +558,36 @@
GUILayout.Label("Skin:", GUILayout.ExpandWidth(false));
- GUIContent _content = new GUIContent();
+ _content = new GUIContent();
+
+ if (skinNames.Contains(this._skinName))
+ {
+ skinIdx = skinNames.IndexOf(this._skinName);
+ }
+ else if (skinNames.Contains(this.defaultSkin))
+ {
+ skinIdx = skinNames.IndexOf(this.defaultSkin);
+ }
+ else
+ {
+ skinIdx = 0;
+ }
_content.text = "◄";
_content.tooltip = "Select previous skin";
if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
{
- this._skinIdx--;
- if (this._skinIdx < 0) this._skinIdx = skin_list.Count - 1;
+ skinIdx--;
+ if (skinIdx < 0) skinIdx = skinNames.Count - 1;
Tools.PostDebugMessage (string.Format (
"{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
this.GetType().Name,
- this._skinIdx,
+ this._skinName,
this.skin_list.Count
));
}
- string skin_name = skin_list[this._skinIdx].name;
- _content.text = skin_name;
+ _content.text = this.Skin.name;
_content.tooltip = "Current skin";
GUILayout.Label(_content, this.LabelStyles["center"], GUILayout.ExpandWidth(true));
@@ -561,19 +595,19 @@
_content.tooltip = "Select next skin";
if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
{
- this._skinIdx++;
- if (this._skinIdx >= skin_list.Count) this._skinIdx = 0;
+ skinIdx++;
+ if (skinIdx >= skinNames.Count) skinIdx = 0;
Tools.PostDebugMessage (string.Format (
"{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
this.GetType().Name,
- this._skinIdx,
+ this._skinName,
this.skin_list.Count
));
}
- if (this.Skin.name != this.defaultSkin)
- {
- this.defaultSkin = this.Skin.name;
+ if (this._skinName != skinNames[skinIdx])
+ {
+ this._skinName = skinNames[skinIdx];
}
GUILayout.EndHorizontal();
--- a/VOID_DataLogger.cs
+++ b/VOID_DataLogger.cs
@@ -30,19 +30,19 @@
/*
* Fields
* */
- protected bool stopwatch1_running = false;
-
- protected bool csv_logging = false;
- protected bool first_write = true;
-
- protected double stopwatch1 = 0;
-
- protected string csv_log_interval_str = "0.5";
+ protected bool stopwatch1_running;
+
+ protected bool csv_logging;
+ protected bool first_write;
+
+ protected double stopwatch1;
+
+ protected string csv_log_interval_str;
protected float csv_log_interval;
- protected double csvWriteTimer = 0;
- protected double csvCollectTimer = 0;
+ protected double csvWriteTimer;
+ protected double csvCollectTimer;
protected List<string> csvList = new List<string>();
@@ -57,6 +57,17 @@
public VOID_DataLogger()
{
this._Name = "CSV Data Logger";
+
+ this.stopwatch1_running = false;
+
+ this.csv_logging = false;
+ this.first_write = true;
+
+ this.stopwatch1 = 0;
+ this.csv_log_interval_str = "0.5";
+
+ this.csvWriteTimer = 0;
+ this.csvCollectTimer = 0;
this.WindowPos.x = Screen.width - 520;
this.WindowPos.y = 85;
--- a/VOID_DataValue.cs
+++ b/VOID_DataValue.cs
@@ -123,11 +123,11 @@
public abstract string ValueUnitString(string format);
- public virtual string ValueUnitString(ushort digits) {
+ public virtual string ValueUnitString(int digits) {
return Tools.MuMech_ToSI(this.ToDouble(), digits) + this.Units;
}
- public virtual string ValueUnitString(ushort digits, int MinMagnitude, int MaxMagnitude)
+ public virtual string ValueUnitString(int digits, int MinMagnitude, int MaxMagnitude)
{
return Tools.MuMech_ToSI(this.ToDouble(), digits, MinMagnitude, MaxMagnitude) + this.Units;
}
@@ -141,38 +141,61 @@
GUILayout.EndHorizontal ();
}
- public virtual ushort DoGUIHorizontal(ushort digits, bool precisionButton = true)
- {
- GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- GUILayout.Label(this.Label + ":", GUILayout.ExpandWidth(true));
- GUILayout.FlexibleSpace();
+ public virtual int DoGUIHorizontal(int digits, bool precisionButton = true)
+ {
if (precisionButton)
{
- float magnitude = (float)Math.Log10(Math.Abs(this.ToDouble()));
- GUILayout.Label(this.ValueUnitString(3, int.MinValue, (int)magnitude - digits), GUILayout.ExpandWidth(false));
- if (GUILayout.Button(digits.ToString()))
+ return this.DoGUIHorizontalPrec(digits);
+ }
+
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ GUILayout.Label(this.Label + " (P" + digits + "):", GUILayout.ExpandWidth(true));
+ GUILayout.FlexibleSpace();
+ GUILayout.Label(this.ValueUnitString(digits), GUILayout.ExpandWidth(false));
+ GUILayout.EndHorizontal();
+
+ return digits;
+ }
+
+ public virtual int DoGUIHorizontalPrec(int digits)
+ {
+ float magnitude;
+ float magLimit;
+
+ magnitude = (float)Math.Log10(Math.Abs(this.ToDouble()));
+
+ magLimit = Mathf.Max(magnitude, 6f);
+ magLimit = Mathf.Round((float)Math.Ceiling(magLimit / 3f) * 3f);
+
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ GUILayout.Label(this.Label + "ⁱ:", GUILayout.ExpandWidth(true));
+ GUILayout.FlexibleSpace();
+
+ GUILayout.Label(this.ValueUnitString(3, int.MinValue, (int)magnitude - digits), GUILayout.ExpandWidth(false));
+ GUILayout.EndHorizontal();
+
+ if (Event.current.type == EventType.mouseUp)
+ {
+ Rect lastRect = GUILayoutUtility.GetLastRect();
+ if (lastRect.Contains(Event.current.mousePosition))
{
- float magLimit = Math.Max(magnitude, 6f);
- magLimit = (float)Math.Ceiling(magLimit / 3f) * 3f;
if (Event.current.button == 0)
{
- digits = (ushort)((digits + 3) % (int)magLimit);
+ digits = (digits + 3) % (int)magLimit;
}
else if (Event.current.button == 1)
{
- digits = (ushort)((digits - 3) % (int)magLimit);
+ digits = (digits - 3) % (int)magLimit;
+ if (digits < 0)
+ {
+ digits = (int)magLimit - 3;
+ }
}
}
}
- else
- {
- GUILayout.Label(this.ValueUnitString(digits), GUILayout.ExpandWidth(false));
- }
- GUILayout.EndHorizontal();
return digits;
}
-
}
public class VOID_DoubleValue : VOID_NumValue<double>, IVOID_NumericValue
--- a/VOID_HUD.cs
+++ b/VOID_HUD.cs
@@ -36,8 +36,6 @@
protected VOID_SaveValue<int> _colorIndex = 0;
protected List<Color> textColors = new List<Color>();
-
- protected GUIStyle labelStyle;
/*
* Properties
@@ -79,8 +77,8 @@
this.textColors.Add(Color.cyan);
this.textColors.Add(Color.magenta);
- this.labelStyle = new GUIStyle ();
- this.labelStyle.normal.textColor = this.textColors [this.ColorIndex];
+ VOID_Core.Instance.LabelStyles["hud"] = new GUIStyle();
+ VOID_Core.Instance.LabelStyles["hud"].normal.textColor = this.textColors [this.ColorIndex];
Tools.PostDebugMessage ("VOID_HUD: Constructed.");
}
@@ -91,7 +89,7 @@
if (VOID_Core.Instance.powerAvailable)
{
- labelStyle.normal.textColor = textColors [ColorIndex];
+ VOID_Core.Instance.LabelStyles["hud"].normal.textColor = textColors [ColorIndex];
GUI.Label (
new Rect ((Screen.width * .2083f), 0, 300f, 70f),
@@ -103,7 +101,7 @@
" ETA " + Tools.ConvertInterval (vessel.orbit.timeToPe) +
"\nInc: " + vessel.orbit.inclination.ToString ("F3") + "°" +
"\nPrimary: " + vessel.mainBody.bodyName,
- labelStyle);
+ VOID_Core.Instance.LabelStyles["hud"]);
// Toadicus edit: Added "Biome: " line to surf/atmo HUD
GUI.Label (
new Rect ((Screen.width * .625f), 0, 300f, 90f),
@@ -116,13 +114,13 @@
"\nHdg: " + Tools.MuMech_get_heading (vessel).ToString ("F2") + "° " +
Tools.get_heading_text (Tools.MuMech_get_heading (vessel)) +
"\nBiome: " + Tools.Toadicus_GetAtt (vessel).name,
- labelStyle);
+ VOID_Core.Instance.LabelStyles["hud"]);
}
else
{
- labelStyle.normal.textColor = Color.red;
- GUI.Label (new Rect ((Screen.width * .2083f), 0, 300f, 70f), "-- POWER LOST --", labelStyle);
- GUI.Label (new Rect ((Screen.width * .625f), 0, 300f, 70f), "-- POWER LOST --", labelStyle);
+ VOID_Core.Instance.LabelStyles["hud"].normal.textColor = Color.red;
+ GUI.Label (new Rect ((Screen.width * .2083f), 0, 300f, 70f), "-- POWER LOST --", VOID_Core.Instance.LabelStyles["hud"]);
+ GUI.Label (new Rect ((Screen.width * .625f), 0, 300f, 70f), "-- POWER LOST --", VOID_Core.Instance.LabelStyles["hud"]);
}
}
--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -129,6 +129,8 @@
AVOID_SaveValue attr = attrs.FirstOrDefault () as AVOID_SaveValue;
string fieldName = string.Format("{0}_{1}", this.GetType().Name, attr.Name);
+
+ Tools.PostDebugMessage(string.Format("{0}: Loading field {1}.", this.GetType().Name, fieldName));
object fieldValue = field.GetValue(this);
@@ -256,6 +258,8 @@
public override void DrawGUI()
{
+ GUI.skin = VOID_Core.Instance.Skin;
+
Rect _Pos = this.WindowPos;
_Pos = GUILayout.Window(
--- a/VOID_Orbital.cs
+++ b/VOID_Orbital.cs
@@ -162,25 +162,25 @@
this.primaryName.DoGUIHorizontal ();
- this.precisionValues [idx] = this.orbitAltitude.DoGUIHorizontal (this.precisionValues [idx]);
- idx++;
-
- this.precisionValues [idx] = this.orbitVelocity.DoGUIHorizontal (this.precisionValues [idx]);
- idx++;
-
- this.precisionValues [idx] = this.orbitApoAlt.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)this.orbitAltitude.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
+
+ this.precisionValues [idx]= (ushort)this.orbitVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+ idx++;
+
+ this.precisionValues [idx]= (ushort)this.orbitApoAlt.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
this.timeToApo.DoGUIHorizontal();
- this.precisionValues [idx] = this.oribtPeriAlt.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)this.oribtPeriAlt.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
this.timeToPeri.DoGUIHorizontal();
this.orbitInclination.DoGUIHorizontal("F3");
- this.precisionValues [idx] = this.gravityAccel.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)this.gravityAccel.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
this.toggleExtended = GUILayout.Toggle(this.toggleExtended, "Extended info");
@@ -189,7 +189,7 @@
{
this.orbitPeriod.DoGUIHorizontal();
- this.precisionValues [idx] = this.semiMajorAxis.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)this.semiMajorAxis.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
this.eccentricity.DoGUIHorizontal("F4");
--- a/VOID_SurfAtmo.cs
+++ b/VOID_SurfAtmo.cs
@@ -138,7 +138,7 @@
GUILayout.BeginVertical();
- this.precisionValues [idx] = this.trueAltitude.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)this.trueAltitude.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
this.surfLatitude.DoGUIHorizontal ();
@@ -147,16 +147,16 @@
this.vesselHeading.DoGUIHorizontal ();
- this.precisionValues [idx] = this.terrainElevation.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)this.terrainElevation.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
- this.precisionValues [idx] = this.surfVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)this.surfVelocity.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
- this.precisionValues [idx] = this.vertVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)this.vertVelocity.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
- this.precisionValues [idx] = this.horzVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)this.horzVelocity.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
this.temperature.DoGUIHorizontal ("F2");
@@ -165,7 +165,7 @@
this.atmPressure.DoGUIHorizontal ("F2");
- this.precisionValues [idx] = this.atmLimit.DoGUIHorizontal (this.precisionValues [idx]);
+ this.precisionValues [idx]= (ushort)this.atmLimit.DoGUIHorizontal (this.precisionValues [idx]);
idx++;
// Toadicus edit: added Biome