diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2024-12-09 10:21:13 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2024-12-09 10:21:13 +0200 |
| commit | 7ae452b5edf226e02de077b0181bd50723124fbb (patch) | |
| tree | 5a4b945b945e75a28f9144e2567596a539302d84 /Software/Visual_Studio/PPC/Tango.PPC.UI | |
| parent | 065e754c221e69b7c12b72c92a0d6168623449d4 (diff) | |
| download | Tango-7ae452b5edf226e02de077b0181bd50723124fbb.tar.gz Tango-7ae452b5edf226e02de077b0181bd50723124fbb.zip | |
Minor fixes.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs index ff66130bb..1966d88f6 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs @@ -431,7 +431,8 @@ namespace Tango.PPC.UI.ViewModels Max = x.MidTankType.LiterCapacity, IDSPack = x, JerricanPresent = true, - }).OrderBy(y => y.IDSPack.LiquidType.Type).ToList(); + }).ToList(); + var LubLevel = MachineProvider.Machine.Configuration.NoneEmptyIdsPacks.Where(x => x.MidTankType.Type == MidTankTypes.LubricantMidTank).FirstOrDefault(); MidTankLubLevel = new JerricanLevelModel() { JerricanPresent = true }; @@ -483,10 +484,9 @@ namespace Tango.PPC.UI.ViewModels foreach (var item in status.IDSPacksLevels) { JerricanLevelModel model = null; - if (item.Index == 8)//lub + if (item.Index == MidTankLubLevel.IDSPack.PackIndex)//lub { model = MidTankLubLevel; - } else { @@ -610,7 +610,7 @@ namespace Tango.PPC.UI.ViewModels List<LiquidOutputModel> outputs = new List<LiquidOutputModel>(); - var idsPacks = MachineProvider.Machine.Configuration.GetSupportedIdsPacks(Job.Rml); + var idsPacks = MachineProvider.Machine.Configuration.GetSupportedIdsPacks(Job.Rml).OrderBy(x => x.PackIndex).ToList(); foreach (var idsPack in idsPacks.Where(x => x.LiquidType.HasPigment)) { |