From 178e25e4dba37decbcbc389955539997e0321df7 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Fri, 31 Jul 2020 19:28:46 +0300 Subject: Fixed total dye time formating on PPC and MS. --- .../Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs index 302c50e8e..30b2c83fd 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs @@ -97,7 +97,7 @@ namespace Tango.MachineStudio.UI.ViewModels { var jobRuns = await db.JobRuns.Where(x => x.MachineGuid == ApplicationManager.Machine.Guid).Select(x => new { x.StartDate, x.EndDate, x.EndPosition }).ToListAsync(); - TotalMachineWorkTime = TimeSpan.FromHours(jobRuns.Select(x => x.EndDate - x.StartDate).Sum(x => x.TotalHours)).ToString(@"hh\:mm\:ss"); + TotalMachineWorkTime = TimeSpan.FromHours(jobRuns.Select(x => x.EndDate - x.StartDate).Sum(x => x.TotalHours)).ToStringUnlimitedHours(); int meters = (int)jobRuns.Select(x => x.EndPosition).Sum(); TotalMachineMeters = $"{meters.ToString("N0")} meters"; -- cgit v1.3.1 From af0cef3da965c7cf6f58faad51788816f001490e Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Sat, 1 Aug 2020 14:58:33 +0300 Subject: Fixed issue with wrong color catalog output due to liquid volumes not resetting. --- .../MachineStudio/Tango.MachineStudio.UI/TFS/TeamMembersProvider.cs | 3 ++- Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamMembersProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamMembersProvider.cs index 0691ca6bd..464599452 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamMembersProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamMembersProvider.cs @@ -13,7 +13,8 @@ namespace Tango.MachineStudio.UI.TFS { public IEnumerable GetSuggestions(string filter) { - return TangoIOC.Default.GetInstance().Project.Members.Where(x => x.AssignName.ToLower().Contains(filter.ToLower())); + var members = TangoIOC.Default.GetInstance().Project.Members; + return members.Where(x => x.AssignName.ToLower().Contains(filter.ToLower())); } } } diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index 68bba48e6..0ae2086d3 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -2223,7 +2223,6 @@ namespace Tango.Integration.Operation { stop.SetLiquidVolumes(job.Machine.Configuration, job.Rml, processParameters); - if (stop.ColorCatalogsItem.Cyan > 0) { var liquidVolume = stop.LiquidVolumes.SingleOrDefault(x => x.LiquidType == LiquidTypes.Cyan); @@ -2235,7 +2234,6 @@ namespace Tango.Integration.Operation liquidVolume.Volume = stop.ColorCatalogsItem.Cyan; } - if (stop.ColorCatalogsItem.Magenta > 0) { var liquidVolume = stop.LiquidVolumes.SingleOrDefault(x => x.LiquidType == LiquidTypes.Magenta); @@ -2247,7 +2245,6 @@ namespace Tango.Integration.Operation liquidVolume.Volume = stop.ColorCatalogsItem.Magenta; } - if (stop.ColorCatalogsItem.Yellow > 0) { var liquidVolume = stop.LiquidVolumes.SingleOrDefault(x => x.LiquidType == LiquidTypes.Yellow); @@ -2259,7 +2256,6 @@ namespace Tango.Integration.Operation liquidVolume.Volume = stop.ColorCatalogsItem.Yellow; } - if (stop.ColorCatalogsItem.Black > 0) { var liquidVolume = stop.LiquidVolumes.SingleOrDefault(x => x.LiquidType == LiquidTypes.Black); -- cgit v1.3.1