diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2024-07-14 23:06:47 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2024-07-14 23:06:47 +0300 |
| commit | c03fb4a1b2aadd8952b321d08ca840e55fcee72d (patch) | |
| tree | 453cc2986a60c87ddff21bff348d6d35d7ed1c2e /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs | |
| parent | 70c0c5921c3c124779ec0d603e43d72e67def63f (diff) | |
| download | Tango-c03fb4a1b2aadd8952b321d08ca840e55fcee72d.tar.gz Tango-c03fb4a1b2aadd8952b321d08ca840e55fcee72d.zip | |
Revision of statistics and resumed jobs.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs index 5f38ae147..84b7ca76b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs @@ -517,7 +517,10 @@ namespace Tango.MachineStudio.Statistics.ViewModels x.LightCyanQuantity, x.LightMagentaQuantity, x.LightYellowQuantity, - x.IsHeadCleaning + x.IsHeadCleaning, + x.ActualStartPosition, + x.ActualEndPosition, + x.JobLogicalLength, }); var machineIDs = new HashSet<string>(SelectedMachines.SynchedSource.ToList().Select(p => p.Guid)); if (machineIDs.Count > 0) @@ -591,7 +594,10 @@ namespace Tango.MachineStudio.Statistics.ViewModels LightCyanQuantity = x.LightCyanQuantity, LightMagentaQuantity = x.LightMagentaQuantity, LightYellowQuantity = x.LightYellowQuantity, - IsHeadCleaning = x.IsHeadCleaning + IsHeadCleaning = x.IsHeadCleaning, + ActualStartPosition = x.ActualStartPosition, + ActualEndPosition = x.ActualEndPosition, + JobLogicalLength = x.JobLogicalLength, }).ToList(); var modelList = runs.Select(x => new JobRunModel() @@ -739,7 +745,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels /// </summary> protected void GenerateTotalRunsLength() { - double val = JobRuns.Where(z => z.JobRun.EndPosition > 0).Sum(x => x.JobRun.JobLength); + double val = JobRuns.Where(z => z.JobRun.EndPosition > 0).Sum(x => x.Distance); StatisticsValueCollection.AddStatisticsValue("Total Runs Length", val, " m"); } |
