From cdf79876fb6a31c377335a89092216adab05387f Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 4 Jun 2023 11:46:29 +0300 Subject: Bugs - display pressure, fonts Related Work Items: #8523 --- .../Tango.PPC.UI/Models/MachineOverviewModel.cs | 61 +++++++++++----------- 1 file changed, 30 insertions(+), 31 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs index 0030d71aa..faddc5c54 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs @@ -70,30 +70,29 @@ namespace Tango.PPC.UI.Models UpdateHeaterItem(Tunnel, tunnelState); //Pumps Pressure - if (diagnostics.Monitors.EuInkLinesPressure.Count > 0 && diagnostics.Monitors.EuInkLinesPressure.Any(x => x.Data.Count > 0)) - { - //EuDispenser1Pressure - List EuDispensersPressure = new List(); - var EuDispenser1PressureValue = diagnostics.Monitors.EuDispenser1Pressure.FirstOrDefault(); - EuDispensersPressure.Add(EuDispenser1PressureValue); - var EuDispenser2PressureValue = diagnostics.Monitors.EuDispenser2Pressure.FirstOrDefault(); - EuDispensersPressure.Add(EuDispenser2PressureValue); - var EuDispenser3PressureValue = diagnostics.Monitors.EuDispenser3Pressure.FirstOrDefault(); - EuDispensersPressure.Add(EuDispenser3PressureValue); - var EuDispenser4PressureValue = diagnostics.Monitors.EuDispenser4Pressure.FirstOrDefault(); - EuDispensersPressure.Add(EuDispenser4PressureValue); - var EuDispenser5PressureValue = diagnostics.Monitors.EuDispenser5Pressure.FirstOrDefault(); - EuDispensersPressure.Add(EuDispenser5PressureValue); - var EuDispenser6PressureValue = diagnostics.Monitors.EuDispenser6Pressure.FirstOrDefault(); - EuDispensersPressure.Add(EuDispenser6PressureValue); - var EuDispenser7PressureValue = diagnostics.Monitors.EuDispenser7Pressure.FirstOrDefault(); - EuDispensersPressure.Add(EuDispenser7PressureValue); - var EuDispenser8PressureValue = diagnostics.Monitors.EuDispenser8Pressure.FirstOrDefault(); - EuDispensersPressure.Add(EuDispenser8PressureValue); - - var pumpsPressuerValue = EuDispensersPressure.Max();// diagnostics.Monitors.EuInkLinesPressure.SelectMany(x => x.Data).Max(); - UpdatePumpsPressureItem(pumpsPressuerValue); - } + + //EuDispenser1Pressure + List EuDispensersPressure = new List(); + var EuDispenser1PressureValue = diagnostics.Monitors.EuDispenser1Pressure.FirstOrDefault(); + EuDispensersPressure.Add(EuDispenser1PressureValue); + var EuDispenser2PressureValue = diagnostics.Monitors.EuDispenser2Pressure.FirstOrDefault(); + EuDispensersPressure.Add(EuDispenser2PressureValue); + var EuDispenser3PressureValue = diagnostics.Monitors.EuDispenser3Pressure.FirstOrDefault(); + EuDispensersPressure.Add(EuDispenser3PressureValue); + var EuDispenser4PressureValue = diagnostics.Monitors.EuDispenser4Pressure.FirstOrDefault(); + EuDispensersPressure.Add(EuDispenser4PressureValue); + var EuDispenser5PressureValue = diagnostics.Monitors.EuDispenser5Pressure.FirstOrDefault(); + EuDispensersPressure.Add(EuDispenser5PressureValue); + var EuDispenser6PressureValue = diagnostics.Monitors.EuDispenser6Pressure.FirstOrDefault(); + EuDispensersPressure.Add(EuDispenser6PressureValue); + var EuDispenser7PressureValue = diagnostics.Monitors.EuDispenser7Pressure.FirstOrDefault(); + EuDispensersPressure.Add(EuDispenser7PressureValue); + var EuDispenser8PressureValue = diagnostics.Monitors.EuDispenser8Pressure.FirstOrDefault(); + EuDispensersPressure.Add(EuDispenser8PressureValue); + + var pumpsPressuerValue = EuDispensersPressure.Max();// diagnostics.Monitors.EuInkLinesPressure.SelectMany(x => x.Data).Max(); + UpdatePumpsPressureItem(pumpsPressuerValue); + //Lubricant var lubricantValue = diagnostics.Monitors.EuLubricantCurrent.FirstOrDefault(); @@ -111,7 +110,7 @@ namespace Tango.PPC.UI.Models { item.Status = "Heating Up"; item.Color = Colors.Orange; - item.DisplayValue = $"{state.CurrentValue} / {state.SetPoint}"; + item.DisplayValue = $"{state.CurrentValue.ToString("N1")} / {state.SetPoint}"; item.MaxValue = state.SetPoint; item.Value = state.CurrentValue; } @@ -134,7 +133,7 @@ namespace Tango.PPC.UI.Models { item.Status = "Over-temperature"; item.Color = Colors.Red; - item.DisplayValue = $"{state.CurrentValue} / {state.SetPoint}"; + item.DisplayValue = $"{state.CurrentValue.ToString("N1")} / {state.SetPoint}"; item.MaxValue = state.SetPoint; item.Value = state.CurrentValue > state.SetPoint? state.SetPoint : state.CurrentValue; } @@ -153,13 +152,13 @@ namespace Tango.PPC.UI.Models { DryerAir.Status = "Heating Up"; DryerAir.Color = Colors.Orange; - DryerAir.DisplayValue = $"{currentvalue}"; + DryerAir.DisplayValue = currentvalue.ToString("N1"); } else if (currentvalue >= DryerAirMaxValue) { DryerAir.Status = "Operational"; DryerAir.Color = Colors.Green; - DryerAir.DisplayValue = $"{currentvalue}"; + DryerAir.DisplayValue = currentvalue.ToString("N1"); } DryerAir.Value = currentvalue; } @@ -170,13 +169,13 @@ namespace Tango.PPC.UI.Models { PumpsPressure.Status = "Overpressure"; PumpsPressure.Color = Colors.Red; - PumpsPressure.DisplayValue = maxValue.ToString(); + PumpsPressure.DisplayValue = maxValue.ToString("N1"); } else { PumpsPressure.Status = "Operational"; PumpsPressure.Color = Colors.Green; - PumpsPressure.DisplayValue = maxValue.ToString(); + PumpsPressure.DisplayValue = maxValue.ToString("N1"); } PumpsPressure.Value = maxValue; } @@ -196,7 +195,7 @@ namespace Tango.PPC.UI.Models return; } Lubricant.Status = "Active"; - Lubricant.DisplayValue = lubricantValue.ToString(); + Lubricant.DisplayValue = lubricantValue.ToString("N1"); Lubricant.Color = Colors.Green; return; } -- cgit v1.3.1