unit: cleanup switch lamp unit before renaming

Author: jsm174

Editor/Descriptors/SwitchLampUnitDescriptor.cs

@@ -16,6 +16,8 @@
 
 // ReSharper disable UnusedType.Global
 
+using System;
+using System.Text.RegularExpressions;
 using Unity.VisualScripting;
 using VisualPinball.Unity.Editor;
 using IconSize = VisualPinball.Unity.Editor.IconSize;
@@ -31,7 +33,7 @@ public SwitchLampUnitDescriptor(SwitchLampUnit target) : base(target)
 
 		protected override string DefinedSummary()
 		{
-			return "This node triggers an event when a switch in the list of given ID is enabled.";
+			return "This node enabled or disables lamps based on matching a source value with a specifed value.";
 		}
 
 		protected override EditorTexture DefinedIcon() => EditorTexture.Single(Unity.Editor.Icons.Light(IconSize.Large, IconColor.Orange));
@@ -40,10 +42,18 @@ protected override void DefinedPort(IUnitPort port, UnitPortDescription desc)
 		{
 			base.DefinedPort(port, desc);
 
-			switch (port.key) {
-				case nameof(SwitchLampUnit.LampIdValues):
-					desc.summary = "The Lamp ID and value";
-					break;
+			if (port.key == nameof(SwitchLampUnit.SourceValue)) {
+				desc.summary = "Source value to use for matching";
+			}
+			else {
+				var match = new Regex("^(item)([0-9]+)$").Match(port.key);
+
+				if (match.Success) {
+					var id = int.Parse(match.Groups[2].Value);
+
+					desc.label = $"Lamp ID {id}";
+					desc.summary = "Lamp ID to enable if specified Value matches source Value, or disable if specified Value does not match source Value";
+				}
 			}
 		}
 	}

Editor/Inspectors/LampIdValueInspector.cs

@@ -10,6 +10,8 @@ namespace VisualPinball.Unity.VisualScripting.Editor
 
     public sealed class LampIdValueInspector : Inspector
     {
+        private static readonly int LabelPadding = 5;
+
         public LampIdValueInspector(Metadata metadata, Func<IEnumerable<string>> getSuggestions) : base(metadata)
         {
             Ensure.That(nameof(getSuggestions)).IsNotNull(getSuggestions);
@@ -34,19 +36,20 @@ private float GetFieldHeight(float width, GUIContent label)
 
         protected override void OnGUI(Rect position, GUIContent label)
         {
+            LampIdValue lampIdValue = LampIdValue.FromJson((string)metadata.value);
+
+            var valueLabelWidth = EditorStyles.label.CalcSize(new GUIContent("Value")).x;
+            var valueWidth = EditorStyles.textField.CalcSize(new GUIContent($"{lampIdValue.value}")).x;
+
             position = BeginLabeledBlock(metadata, position, label);
 
             var fieldPosition = position.VerticalSection(ref y, GetFieldHeight(position.width, GUIContent.none));
-
-            LampIdValue lampIdValue = LampIdValue.FromJson((string)metadata.value);
-
-            var valueWidth = LudiqGUI.GetTextFieldAdaptiveWidth(lampIdValue.value);
 
             var textFieldPosition = new Rect
                 (
                 fieldPosition.x,
                 fieldPosition.y,
-                fieldPosition.width - Styles.popup.fixedWidth - valueWidth - 60,
+                fieldPosition.width - valueWidth - LabelPadding - valueLabelWidth - LabelPadding - Styles.popup.fixedWidth,
                 fieldPosition.height
                 );
 
@@ -81,26 +84,25 @@ protected override void OnGUI(Rect position, GUIContent label)
 
             EditorGUI.EndDisabledGroup();
 
-            var valueFieldPosition = new Rect
+            var valueLabelPosition = new Rect
+                 (
+                 fieldPosition.x + fieldPosition.width - valueWidth - LabelPadding - valueLabelWidth,
+                 fieldPosition.y,
+                 valueLabelWidth,
+                 fieldPosition.height
+                 );
+
+            EditorGUI.LabelField(valueLabelPosition, "Value");
+
+            var valueIntFieldPosition = new Rect
                 (
                 fieldPosition.x + fieldPosition.width - valueWidth,
                 fieldPosition.y,
                 valueWidth,
                 fieldPosition.height
-                );
-
-            var valueLabelFieldPosition = new Rect
-             (
-             fieldPosition.x + fieldPosition.width - valueWidth - 50,
-             fieldPosition.y,
-             50,
-             fieldPosition.height
-             );
-
-
-            EditorGUI.LabelField(valueLabelFieldPosition, "Value");
+                );
 
-            var newValue = LudiqGUI.DraggableIntField(valueFieldPosition, lampIdValue.value);
+            var newValue = LudiqGUI.DraggableIntField(valueIntFieldPosition, lampIdValue.value);
 
             if (EndBlock(metadata))
             {
@@ -117,8 +119,12 @@ public override float GetAdaptiveWidth()
         {
             LampIdValue lampIdValue = LampIdValue.FromJson((string)metadata.value);
 
-            return Mathf.Max(30, EditorStyles.textField.CalcSize(new GUIContent(lampIdValue.id)).x + 1 + Styles.popup.fixedWidth) +
-                LudiqGUI.GetTextFieldAdaptiveWidth(lampIdValue.value) + 70;
+            return Mathf.Max(30,
+                EditorStyles.textField.CalcSize(new GUIContent(lampIdValue.id)).x + 1 + Styles.popup.fixedWidth) +
+                LabelPadding +
+                EditorStyles.label.CalcSize(new GUIContent("Value")).x +
+                LabelPadding +
+                EditorStyles.textField.CalcSize(new GUIContent($"{lampIdValue.value}")).x;
         }
 
         public static class Styles

Editor/Widgets/SwitchLampUnitWidget.cs

@@ -42,7 +42,7 @@ public override Inspector GetPortInspector(IUnitPort port, Metadata meta)
 			}
 
 			for (var index = 0; index < unit.idCount; index++) {
-				if (unit.LampIdValues[index] == port) {
+				if (unit.Items[index] == port) {
 					LampIdValueInspector lampIdInspector = new LampIdValueInspector(meta, GetNameSuggestions);
 					InspectorProvider.instance.Renew(ref lampIdInspector, meta, _lampIdInspectorConstructorList[index]);
 
@@ -57,7 +57,7 @@ private IEnumerable<string> GetNameSuggestions()
 		{
 			return !GleAvailable
 				? new List<string>()
-				: Gle.RequestedLamps.Select(lamp => lamp.Id).ToList();
+				: Gle.AvailableLamps.Select(lamp => lamp.Id).ToList();
 		}
 	}
 }

Runtime/Nodes/Lamps/SwitchLampUnit.cs

@@ -66,11 +66,11 @@ public int idCount
 		public ControlOutput OutputTrigger;
 
 		[DoNotSerialize]
-		[PortLabel("Value")]
-		public ValueInput Value { get; private set; }
+		[PortLabel("Source Value")]
+		public ValueInput SourceValue { get; private set; }
 
 		[DoNotSerialize]
-		public List<ValueInput> LampIdValues { get; private set; }
+		public List<ValueInput> Items { get; private set; }
 
 		private Dictionary<int, LampIdValue> _lampIdValueCache = new Dictionary<int, LampIdValue>();
 
@@ -79,15 +79,15 @@ protected override void Definition()
 			InputTrigger = ControlInput(nameof(InputTrigger), Process);
 			OutputTrigger = ControlOutput(nameof(OutputTrigger));
 
-			Value = ValueInput<int>(nameof(Value));
+			SourceValue = ValueInput<int>(nameof(SourceValue));
 
-			LampIdValues = new List<ValueInput>();
+			Items = new List<ValueInput>();
 
 			for (var i = 0; i < idCount; i++) {
-				var valueInput = ValueInput($"Lamp ID {i + 1}", LampIdValue.Empty.ToJson());
-				LampIdValues.Add(valueInput);
+				var item = ValueInput($"item{i + 1}", LampIdValue.Empty.ToJson());
+				Items.Add(item);
 
-				Requirement(valueInput, InputTrigger);
+				Requirement(item, InputTrigger);
 			}
 
 			_lampIdValueCache.Clear();
@@ -102,10 +102,10 @@ private ControlOutput Process(Flow flow)
 				return OutputTrigger;
 			}
 
-			var value = flow.GetValue<int>(Value);
+			var value = flow.GetValue<int>(SourceValue);
 
-			foreach (var lampIdValue in LampIdValues) {
-				var json = flow.GetValue<string>(lampIdValue);
+			foreach (var item in Items) {
+				var json = flow.GetValue<string>(item);
 
 				if (!_lampIdValueCache.ContainsKey(json.GetHashCode())) {
 					_lampIdValueCache[json.GetHashCode()] = LampIdValue.FromJson(json);