mirror of
https://github.com/MaSzyna-EU07/StarterNG.git
synced 2026-11-18 22:45:59 +01:00
feat(blackbox): the train protection's buzzer told apart from its braking
The buzzer has a colour of its own on the timeline and in the cab, no longer the braking's red, and an event of its own: acknowledged after how long, or not acknowledged when the braking follows. The alerter's buzzer needs its lamp, since a protection with one acknowledgement tells the cab signalling's buzzer as the alerter's too. Braking with no lamp, the protection with no power, is not shown as the driver's on the timeline and in the cab either.
This commit is contained in:
@@ -181,6 +181,9 @@ public sealed class DefaultBlackBoxStrings : IBlackBoxStrings
|
||||
["EventHornMissed"] = "W6: NO HORN",
|
||||
["EventCab"] = "Cab {0} of {1}",
|
||||
["EventSecurityBraking"] = "BRAKING BY {0}",
|
||||
["EventSecurityAlarm"] = "{0} buzzer",
|
||||
["EventSecurityAlarmAcknowledged"] = "{0} buzzer, acknowledged after {1:0.0} s",
|
||||
["EventSecurityAlarmMissed"] = "{0} buzzer, not acknowledged",
|
||||
["EventTimetable"] = "Timetable {0}, {1}",
|
||||
["CabSpeed"] = "Speed",
|
||||
["CabAiTarget"] = "AI {0:0} km/h",
|
||||
@@ -452,6 +455,9 @@ public sealed class DefaultBlackBoxStrings : IBlackBoxStrings
|
||||
["EventHornMissed"] = "W6: BEZ TRĄBIENIA",
|
||||
["EventCab"] = "Kabina {0} w {1}",
|
||||
["EventSecurityBraking"] = "HAMOWANIE PRZEZ {0}",
|
||||
["EventSecurityAlarm"] = "Brzęczyk {0}",
|
||||
["EventSecurityAlarmAcknowledged"] = "Brzęczyk {0}, potwierdzony po {1:0.0} s",
|
||||
["EventSecurityAlarmMissed"] = "Brzęczyk {0}, bez potwierdzenia",
|
||||
["EventTimetable"] = "Rozkład {0}, {1}",
|
||||
["CabSpeed"] = "Prędkość",
|
||||
["CabAiTarget"] = "AI {0:0} km/h",
|
||||
|
||||
@@ -530,12 +530,12 @@ public sealed class CabPanel : Control
|
||||
if (s.Security != SecurityFlags.None || s.CabEnd != 0)
|
||||
{
|
||||
// A recording which tells them apart.
|
||||
safety.Add((Strings["DevVigilance"], Security(SecurityFlags.VigilanceBeeping, Palette.LampAlarm) ?? Security(SecurityFlags.Vigilance, Palette.Vigilance)));
|
||||
safety.Add((Strings["DevCabSignal"], Security(SecurityFlags.CabSignalBeeping, Palette.LampAlarm) ?? Security(SecurityFlags.CabSignal, Palette.CabSignal)));
|
||||
safety.Add((Strings["DevSecurityBraking"], Security(SecurityFlags.Braking, Palette.LampAlarm)));
|
||||
safety.Add((Strings["DevVigilance"], s.VigilanceBuzzer ? Palette.Buzzer : Security(SecurityFlags.Vigilance, Palette.Vigilance)));
|
||||
safety.Add((Strings["DevCabSignal"], s.CabSignalBuzzer ? Palette.Buzzer : Security(SecurityFlags.CabSignal, Palette.CabSignal)));
|
||||
safety.Add((Strings["DevSecurityBraking"], s.ProtectionBraking ? Palette.LampAlarm : null));
|
||||
}
|
||||
else
|
||||
safety.Add((Strings["DevAlerter"], (s.Flags & CabFlags.AlerterBeeping) != 0 ? Palette.LampAlarm
|
||||
safety.Add((Strings["DevAlerter"], (s.Flags & CabFlags.AlerterBeeping) != 0 ? Palette.Buzzer
|
||||
: (s.Flags & CabFlags.AlerterBlinking) != 0 ? Palette.LampWarning : null));
|
||||
safety.Add(Flag("DevWheelSlip", CabFlags.WheelSlip, Palette.LampAlarm));
|
||||
safety.Add(On("DevOverloadRelay", CabDevices.OverloadRelay, Palette.LampAlarm));
|
||||
|
||||
@@ -178,14 +178,7 @@ public sealed class EventList : ListBox
|
||||
foreach (var horn in recording.UserHornChecks())
|
||||
events.Add(new BlackBoxEvent(horn.Request.Time, strings[horn.Sounded ? "EventHornSounded" : "EventHornMissed"],
|
||||
horn.Sounded ? Palette.HornPoint : Palette.Bad, !horn.Sounded));
|
||||
foreach (var span in recording.SecurityBrakings())
|
||||
{
|
||||
// Which of them was not acknowledged: the lamps blinking when it braked.
|
||||
string who = recording.CabAt(span.Start) is { } s
|
||||
? s.Has(SecurityFlags.CabSignal) && s.Has(SecurityFlags.Vigilance) ? "CA/SHP" : s.Has(SecurityFlags.CabSignal) ? "SHP" : "CA"
|
||||
: "CA";
|
||||
events.Add(new BlackBoxEvent(span.Start, string.Format(culture, strings["EventSecurityBraking"], who), Palette.Bad, true));
|
||||
}
|
||||
AddSecurity(recording, strings, events, culture);
|
||||
AddCameras(recording, strings, events, culture);
|
||||
AddCouplings(recording, strings, events, culture);
|
||||
AddCabChanges(recording, strings, events, culture);
|
||||
@@ -198,6 +191,35 @@ public sealed class EventList : ListBox
|
||||
return events.OrderBy(e => e.Time).ToList();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The train protection: its buzzer, acknowledged or not, and the braking apart. A lamp acknowledged before the
|
||||
/// buzzer is the driving as usual, not told.
|
||||
/// </summary>
|
||||
private static void AddSecurity(Recording recording, IBlackBoxStrings strings, List<BlackBoxEvent> events, CultureInfo culture)
|
||||
{
|
||||
var brakings = recording.SecurityBrakings();
|
||||
foreach (var span in recording.SecurityAlarms())
|
||||
{
|
||||
string who = ProtectionName(recording.CabAt(span.Start));
|
||||
string text = brakings.Any(b => b.Start >= span.Start && b.Start <= span.End)
|
||||
? string.Format(culture, strings["EventSecurityAlarmMissed"], who)
|
||||
// Acknowledged when the sample it ended at buzzes no more: not the end of the recording or a gap in it.
|
||||
: recording.CabAt(span.End) is { } after && !after.VigilanceBuzzer && !after.CabSignalBuzzer
|
||||
? string.Format(culture, strings["EventSecurityAlarmAcknowledged"], who, span.End - span.Start)
|
||||
: string.Format(culture, strings["EventSecurityAlarm"], who);
|
||||
events.Add(new BlackBoxEvent(span.Start, text, Palette.Buzzer, false));
|
||||
}
|
||||
foreach (var span in brakings)
|
||||
events.Add(new BlackBoxEvent(span.Start, string.Format(culture, strings["EventSecurityBraking"],
|
||||
ProtectionName(recording.CabAt(span.Start))), Palette.Bad, true));
|
||||
}
|
||||
|
||||
/// <summary>Which of them it was: the lamps blinking.</summary>
|
||||
private static string ProtectionName(CabSample? sample) =>
|
||||
sample is not { } s ? "CA"
|
||||
: s.Has(SecurityFlags.CabSignal) && s.Has(SecurityFlags.Vigilance) ? "CA/SHP"
|
||||
: s.Has(SecurityFlags.CabSignal) ? "SHP" : "CA";
|
||||
|
||||
private static void AddUserVehicles(Recording recording, IBlackBoxStrings strings, List<BlackBoxEvent> events, CultureInfo culture)
|
||||
{
|
||||
UserVehicleChange? before = null;
|
||||
|
||||
@@ -79,6 +79,8 @@ public static class Palette
|
||||
public static readonly IBrush LampOn = Brush("#4cc46e");
|
||||
public static readonly IBrush LampWarning = Brush("#e8c547");
|
||||
public static readonly IBrush LampAlarm = Brush("#f0584a");
|
||||
/// <summary>The train protection's buzzer: still to be acknowledged, not braking yet.</summary>
|
||||
public static readonly IBrush Buzzer = Brush("#c77dff");
|
||||
public static readonly IBrush LightWhite = Brush("#fff6d8");
|
||||
public static readonly IBrush LightRed = Brush("#ff3b30");
|
||||
public static readonly IBrush Command = Brush("#8b96a3");
|
||||
|
||||
@@ -245,16 +245,16 @@ public sealed class TimelineView : Control
|
||||
rows[2].Add(x0, x1, s.BrakeCylinder > 0.2f ? BrakeShade(s.BrakeCylinder) : null, BandHeight);
|
||||
if (s.Security != SecurityFlags.None || s.CabEnd != 0)
|
||||
{
|
||||
// The alerter and the cab signalling apart, red when not acknowledged in time.
|
||||
rows[3].Add(x0, x1, s.Has(SecurityFlags.VigilanceBeeping) ? Palette.LampAlarm
|
||||
// The alerter and the cab signalling apart: the lamp, then its buzzer, red when it braked.
|
||||
rows[3].Add(x0, x1, s.VigilanceBuzzer ? Palette.Buzzer
|
||||
: s.Has(SecurityFlags.Vigilance) ? Palette.Vigilance : null, BandHeight);
|
||||
rows[4].Add(x0, x1, s.Has(SecurityFlags.CabSignalBeeping) ? Palette.LampAlarm
|
||||
rows[4].Add(x0, x1, s.CabSignalBuzzer ? Palette.Buzzer
|
||||
: s.Has(SecurityFlags.CabSignal) ? Palette.CabSignal : null, BandHeight);
|
||||
if (s.Has(SecurityFlags.Braking))
|
||||
if (s.ProtectionBraking)
|
||||
rows[s.Has(SecurityFlags.CabSignal) && !s.Has(SecurityFlags.Vigilance) ? 4 : 3].Add(x0, x1, Palette.Bad, BandHeight);
|
||||
}
|
||||
else
|
||||
rows[3].Add(x0, x1, (s.Flags & CabFlags.AlerterBeeping) != 0 ? Palette.LampAlarm
|
||||
rows[3].Add(x0, x1, (s.Flags & CabFlags.AlerterBeeping) != 0 ? Palette.Buzzer
|
||||
: (s.Flags & CabFlags.AlerterBlinking) != 0 ? Palette.Vigilance : null, BandHeight);
|
||||
// Where the user looked from: the samples go on in time, and so does the camera.
|
||||
while (camera + 1 < cameras.Count && cameras[camera + 1].Time <= s.Time)
|
||||
|
||||
Reference in New Issue
Block a user