From edbc861c78d65b8f5e6c627e59522abb43016f1f Mon Sep 17 00:00:00 2001 From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Fri, 10 Jan 2025 01:55:05 -0500 Subject: [PATCH] Add copy threshold button to air alarms (#34346) --- .../Atmos/Monitor/UI/AirAlarmWindow.xaml.cs | 9 ++++--- .../Monitor/UI/Widgets/PumpControl.xaml.cs | 8 +++--- .../UI/Widgets/ScrubberControl.xaml.cs | 8 +++--- .../Atmos/Monitor/UI/Widgets/SensorInfo.xaml | 3 +++ .../Monitor/UI/Widgets/SensorInfo.xaml.cs | 13 +++++++--- .../Atmos/Monitor/Systems/AirAlarmSystem.cs | 20 ++++++++++++++ .../Monitor/Systems/AtmosMonitoringSystem.cs | 26 +++++++++++++++++-- Resources/Locale/en-US/atmos/air-alarm-ui.ftl | 2 ++ 8 files changed, 72 insertions(+), 17 deletions(-) diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs index 6516498386..f0201dc81b 100644 --- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs +++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs @@ -130,8 +130,8 @@ public sealed partial class AirAlarmWindow : FancyWindow if (!_pumps.TryGetValue(addr, out var pumpControl)) { var control= new PumpControl(pump, addr); - control.PumpDataChanged += AtmosDeviceDataChanged!.Invoke; - control.PumpDataCopied += AtmosDeviceDataCopied!.Invoke; + control.PumpDataChanged += AtmosDeviceDataChanged; + control.PumpDataCopied += AtmosDeviceDataCopied; _pumps.Add(addr, control); CVentContainer.AddChild(control); } @@ -145,8 +145,8 @@ public sealed partial class AirAlarmWindow : FancyWindow if (!_scrubbers.TryGetValue(addr, out var scrubberControl)) { var control = new ScrubberControl(scrubber, addr); - control.ScrubberDataChanged += AtmosDeviceDataChanged!.Invoke; - control.ScrubberDataCopied += AtmosDeviceDataCopied!.Invoke; + control.ScrubberDataChanged += AtmosDeviceDataChanged; + control.ScrubberDataCopied += AtmosDeviceDataCopied; _scrubbers.Add(addr, control); CScrubberContainer.AddChild(control); } @@ -161,6 +161,7 @@ public sealed partial class AirAlarmWindow : FancyWindow { var control = new SensorInfo(sensor, addr); control.OnThresholdUpdate += AtmosAlarmThresholdChanged; + control.SensorDataCopied += AtmosDeviceDataCopied; _sensors.Add(addr, control); CSensorContainer.AddChild(control); } diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs index 2cd51d6fc7..8502cd2712 100644 --- a/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs +++ b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs @@ -83,10 +83,10 @@ public sealed partial class PumpControl : BoxContainer PumpDataChanged?.Invoke(_address, _data); }; - _copySettings.OnPressed += _ => - { - PumpDataCopied?.Invoke(_data); - }; + _copySettings.OnPressed += _ => + { + PumpDataCopied?.Invoke(_data); + }; } public void ChangeData(GasVentPumpData data) diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs index c16ff688c9..d03ac77ab3 100644 --- a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs +++ b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs @@ -72,10 +72,10 @@ public sealed partial class ScrubberControl : BoxContainer ScrubberDataChanged?.Invoke(_address, _data); }; - _copySettings.OnPressed += _ => - { - ScrubberDataCopied?.Invoke(_data); - }; + _copySettings.OnPressed += _ => + { + ScrubberDataCopied?.Invoke(_data); + }; foreach (var value in Enum.GetValues()) { diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml index 005e6807b3..c50dadc9c7 100644 --- a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml +++ b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml @@ -3,6 +3,9 @@ + +