Merge pull request #390 from Sharpe49/signal-debug

Adds the signal ID and the aspect (including text aspect) of each signal head to the signalling debug window

Author: cjakeman

Source/RunActivity/Viewer3D/Popups/SignallingDebugWindow.cs

@@ -215,11 +215,14 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
                             }
                             else if (signalObj != null)
                             {
+                                var aspects = string.Join(" / ", signalObj.Signal.SignalHeads.Select(
+                                    head => $"{head.state}" + (head.TextSignalAspect.Length > 0 ? $" ({head.TextSignalAspect})" : string.Empty)
+                                    ));
                                 primitives.Add(new DispatcherLabel(currentPosition.WorldLocation,
                                            GetAspect(signalObj.Signal) == DebugWindowSignalAspect.Stop ? Color.Red :
                                                GetAspect(signalObj.Signal) == DebugWindowSignalAspect.Warning ? Color.Yellow :
                                                Color.Green,
-                                           String.Format("Signal ({0})", signalObj.Signal.this_sig_lr(MstsSignalFunction.NORMAL)),
+                                           $"Signal {signalObj.Signal.thisRef} ({aspects})",
                                            Owner.TextFontDefaultOutlined));
                             }