Show signalling debug information for all signal types

Author: Sharpe49

Source/Orts.Simulation/Simulation/Signalling/Signals.cs

@@ -1247,7 +1247,7 @@ public void SetNumSignalHeads()
         ///   -6  : end of (sub)route
         /// </summary>
         public TrackCircuitSignalItem Find_Next_Object_InRoute(Train.TCSubpathRoute routePath,
-                int routeIndex, float routePosition, float maxDistance, MstsSignalFunction fn_type, Train.TrainRouted thisTrain)
+                int routeIndex, float routePosition, float maxDistance, MstsSignalFunction? fn_type, Train.TrainRouted thisTrain)
         {
             ObjectItemInfo.ObjectItemFindState locstate = ObjectItemInfo.ObjectItemFindState.None;
             // local processing state     //
@@ -1318,6 +1318,28 @@ public TrackCircuitSignalItem Find_Next_Object_InRoute(Train.TCSubpathRoute rout
                         }
                     }
                 }
+                // all function types
+                else if (fn_type == null)
+                {
+                    List<TrackCircuitSignalItem> signalList = new List<TrackCircuitSignalItem>();
+
+                    signalList = thisSection.CircuitItems.TrackCircuitSignals[actDirection].Select(x => x.TrackCircuitItem).Aggregate((acc, list) => acc.Concat(list).ToList());
+
+                    signalList.Sort((a, b) => a.SignalLocation < b.SignalLocation ? -1 : a.SignalLocation > b.SignalLocation ? 1 : 0);
+
+                    locstate = ObjectItemInfo.ObjectItemFindState.None;
+
+                    foreach (TrackCircuitSignalItem thisSignal in signalList)
+                    {
+                        if (thisSignal.SignalLocation > lengthOffset)
+                        {
+                            locstate = ObjectItemInfo.ObjectItemFindState.Object;
+                            foundObject = thisSignal.SignalRef;
+                            totalLength += thisSignal.SignalLocation - lengthOffset;
+                            break;
+                        }
+                    }
+                }
                 // other fn_types
                 else
                 {
@@ -1549,6 +1571,63 @@ public ObjectItemInfo GetNextObject_InRoute(Train.TrainRouted thisTrain, Train.T
             return returnItem;
         }
 
+        public ObjectItemInfo GetNextSignal_InRoute(Train.TrainRouted thisTrain, Train.TCSubpathRoute routePath,
+            int routeIndex, float routePosition, float maxDistance, Train.TCPosition thisPosition, MstsSignalFunction? requiredSignalFunction = null)
+        {
+            Train.TCSubpathRoute usedRoute = routePath;
+
+            // if routeIndex is not valid, build temp route from present position to first node or signal
+            if (routeIndex < 0)
+            {
+                bool thisIsFreight = thisTrain != null ? thisTrain.Train.IsFreight : false;
+
+                List<int> tempSections = ScanRoute(thisTrain.Train, thisPosition.TCSectionIndex,
+                    thisPosition.TCOffset, thisPosition.TCDirection,
+                    true, 200f, false, true, true, false, true, false, false, true, false, thisIsFreight);
+
+
+                Train.TCSubpathRoute tempRoute = new Train.TCSubpathRoute();
+                int prevSection = -2;
+
+                foreach (int sectionIndex in tempSections)
+                {
+                    Train.TCRouteElement thisElement =
+                        new Train.TCRouteElement(TrackCircuitList[Math.Abs(sectionIndex)],
+                            sectionIndex > 0 ? 0 : 1, this, prevSection);
+                    tempRoute.Add(thisElement);
+                    prevSection = Math.Abs(sectionIndex);
+                }
+                usedRoute = tempRoute;
+                routeIndex = 0;
+            }
+
+            TrackCircuitSignalItem nextSignal = Find_Next_Object_InRoute(usedRoute, routeIndex, routePosition, maxDistance, requiredSignalFunction, thisTrain);
+
+            if (nextSignal.SignalState == ObjectItemInfo.ObjectItemFindState.Object)
+            {
+                if (thisTrain != null && nextSignal.SignalRef.enabledTrain != thisTrain)
+                {
+                    nextSignal.SignalState = ObjectItemInfo.ObjectItemFindState.PassedDanger;  // do not return OBJECT_FOUND - signal is not valid
+                }
+            }
+
+            ObjectItemInfo returnItem;
+            if (nextSignal == null)
+            {
+                returnItem = new ObjectItemInfo(ObjectItemInfo.ObjectItemFindState.None);
+            }
+            else if (nextSignal.SignalState != ObjectItemInfo.ObjectItemFindState.Object)
+            {
+                returnItem = new ObjectItemInfo(nextSignal.SignalState);
+            }
+            else
+            {
+                returnItem = new ObjectItemInfo(nextSignal.SignalRef, nextSignal.SignalLocation);
+            }
+
+            return returnItem;
+        }
+
         /// <summary>
         /// Gets the Track Monitor Aspect from the MSTS aspect (for the TCS) 
         /// </summary>

Source/RunActivity/Viewer3D/Popups/SignallingDebugWindow.cs

@@ -293,14 +293,11 @@ TrackSectionCacheEntry GetCacheEntry(Traveller position)
                 thisPosition.SetTCPosition(tn.TCCrossReference, offset, direction);
                 Train.TCSubpathRoute tempRoute = Owner.Viewer.Simulator.Signals.BuildTempRoute(null, thisPosition.TCSectionIndex, thisPosition.TCOffset, thisPosition.TCDirection, 5000.0f, true, false, false);
 
-                ObjectItemInfo thisInfo = Owner.Viewer.Simulator.Signals.GetNextObject_InRoute(null, tempRoute, 0,
-                    thisPosition.TCOffset, -1, ObjectItemInfo.ObjectItemType.Signal, thisPosition);
+                ObjectItemInfo thisInfo = Owner.Viewer.Simulator.Signals.GetNextSignal_InRoute(null, tempRoute, 0, thisPosition.TCOffset, -1, thisPosition, null);
 
                 var signal = thisInfo.ObjectDetails;
                 if (signal == null)
                     break;
-                if (signal.this_sig_lr(MstsSignalFunction.NORMAL) == MstsSignalAspect.UNKNOWN)
-                    break;
                 var signalDistance = thisInfo.distance_found;
 
                 if (signalDistance > 0)