tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

whoops!

Browse Source
This commit is contained in:
vulppine
2022-08-19 00:20:50 -07:00
parent 376f4c8972
commit 7f76d49ea8
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml
View File

@@ -3,19 +3,23 @@
<Collapsible Orientation="Vertical"> <Collapsible Orientation="Vertical">
<CollapsibleHeading Name="SensorAddress" /> <CollapsibleHeading Name="SensorAddress" />
<CollapsibleBody> <CollapsibleBody>
<RichTextLabel Name="PressureLabel"></RichTextLabel> <BoxContainer>
<RichTextLabel Name="TemperatureLabel"></RichTextLabel> <RichTextLabel Name="PressureLabel"></RichTextLabel>
<RichTextLabel Name="TotalMolesLabel" /> <RichTextLabel Name="TemperatureLabel"></RichTextLabel>
<RichTextLabel Name="AlarmStateLabel" /> <RichTextLabel Name="TotalMolesLabel" />
<BoxContainer Name="GasContainer" /> <RichTextLabel Name="AlarmStateLabel" />
<Collapsible Orientation="Vertical" Margin="2"> <BoxContainer Name="GasContainer" />
<CollapsibleHeading Title="{Loc 'air-alarm-ui-sensor-thresholds'}" /> <Collapsible Orientation="Vertical" Margin="2">
<CollapsibleBody> <CollapsibleHeading Title="{Loc 'air-alarm-ui-sensor-thresholds'}" />
<Control Name="PressureThresholdContainer" /> <CollapsibleBody>
<Control Name="TemperatureThresholdContainer" /> <BoxContainer Orientation="Vertical">
<BoxContainer Name="GasThresholds" Orientation="Vertical" /> <Control Name="PressureThresholdContainer" />
</CollapsibleBody> <Control Name="TemperatureThresholdContainer" />
</Collapsible> <BoxContainer Name="GasThresholds" Orientation="Vertical" />
</BoxContainer>
</CollapsibleBody>
</Collapsible>
</BoxContainer>
</CollapsibleBody> </CollapsibleBody>
</Collapsible> </Collapsible>
</BoxContainer> </BoxContainer>

12
Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs
View File

@@ -35,15 +35,16 @@ public sealed partial class SensorInfo : BoxContainer
{ {
var label = new Label(); var label = new Label();
label.Text = Loc.GetString("air-alarm-ui-gases", ("gas", $"{gas}"), label.Text = Loc.GetString("air-alarm-ui-gases", ("gas", $"{gas}"),
("amount", $"{(amount / data.TotalMoles):0.##}")); ("amount", $"{amount:0.####}"),
("percentage", $"{(amount / data.TotalMoles):0.##}"));
GasContainer.AddChild(label); GasContainer.AddChild(label);
_gasLabels.Add(gas, label); _gasLabels.Add(gas, label);
} }
_pressureThreshold = _pressureThreshold =
new ThresholdControl("Pressure", data.PressureThreshold, AtmosMonitorThresholdType.Pressure); new ThresholdControl(Loc.GetString("air-alarm-ui-thresholds-pressure-title"), data.PressureThreshold, AtmosMonitorThresholdType.Pressure);
PressureThresholdContainer.AddChild(_pressureThreshold); PressureThresholdContainer.AddChild(_pressureThreshold);
_temperatureThreshold = new ThresholdControl("Temperature", data.TemperatureThreshold, _temperatureThreshold = new ThresholdControl(Loc.GetString("air-alarm-ui-thresholds-temperature-title"), data.TemperatureThreshold,
AtmosMonitorThresholdType.Temperature); AtmosMonitorThresholdType.Temperature);
TemperatureThresholdContainer.AddChild(_temperatureThreshold); TemperatureThresholdContainer.AddChild(_temperatureThreshold);
@@ -59,7 +60,7 @@ public sealed partial class SensorInfo : BoxContainer
foreach (var (gas, threshold) in data.GasThresholds) foreach (var (gas, threshold) in data.GasThresholds)
{ {
var gasThresholdControl = new ThresholdControl(gas.ToString(), threshold, AtmosMonitorThresholdType.Gas, gas); var gasThresholdControl = new ThresholdControl(Loc.GetString($"air-alarm-ui-thresholds-gas-title", ("gas", $"{gas}")), threshold, AtmosMonitorThresholdType.Gas, gas, 100);
gasThresholdControl.ThresholdDataChanged += (type, threshold, arg3) => gasThresholdControl.ThresholdDataChanged += (type, threshold, arg3) =>
{ {
OnThresholdUpdate!(_address, type, threshold, arg3); OnThresholdUpdate!(_address, type, threshold, arg3);
@@ -84,7 +85,8 @@ public sealed partial class SensorInfo : BoxContainer
} }
label.Text = Loc.GetString("air-alarm-ui-gases", ("gas", $"{gas}"), label.Text = Loc.GetString("air-alarm-ui-gases", ("gas", $"{gas}"),
("amount", $"{(amount / data.TotalMoles):0.##}")); ("amount", $"{amount:0.####}"),
("percentage", $"{(amount / data.TotalMoles):0.##}"));
} }
_pressureThreshold.UpdateThresholdData(data.PressureThreshold); _pressureThreshold.UpdateThresholdData(data.PressureThreshold);