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/Tango.Integration | |
| parent | 70c0c5921c3c124779ec0d603e43d72e67def63f (diff) | |
| download | Tango-c03fb4a1b2aadd8952b321d08ca840e55fcee72d.tar.gz Tango-c03fb4a1b2aadd8952b321d08ca840e55fcee72d.zip | |
Revision of statistics and resumed jobs.
Diffstat (limited to 'Software/Visual_Studio/Tango.Integration')
3 files changed, 8 insertions, 0 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs b/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs index 6285bb7b0..d4fcf7f41 100644 --- a/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs +++ b/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs @@ -157,6 +157,8 @@ namespace Tango.Integration.JobRuns run.LiquidQuantities = e.LiquidQuantities; run.IsGradient = _job.Segments.Any(x => x.BrushStops.Count > 1); run.GradientResolutionCm = MachineOperator.GradientGenerationConfiguration.ResolutionCM; + run.ActualStartPosition = e.Job.ResumeStartPosition; + run.ActualEndPosition = e.JobHandler.Status.ProgressMinusSettingUp; if (_defaultMachine != null) { diff --git a/Software/Visual_Studio/Tango.Integration/Operation/AdditionalJobConfiguration.cs b/Software/Visual_Studio/Tango.Integration/Operation/AdditionalJobConfiguration.cs index 43beba7f0..0fa5a15c6 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/AdditionalJobConfiguration.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/AdditionalJobConfiguration.cs @@ -13,6 +13,7 @@ namespace Tango.Integration.Operation public int RemainingUnits { get; set; } public double GlobalStartPosition { get; set; } public double FirstUnitStartPosition { get; set; } + public double ResumeProgress { get; set; } } public double LubricationVolume { get; set; } diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index 063aa740d..2e84d3fb5 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -2796,6 +2796,11 @@ namespace Tango.Integration.Operation jobForJobRun.Name = job.Name; jobForJobRun.ID = job.ID; + if (config.ResumeConfig != null) + { + jobForJobRun.ResumeStartPosition = config.ResumeConfig.ResumeProgress; + } + int max = job.OrderedSegmentsWithGroups.Last().SegmentIndex + 1; for (int i = 0; i < job.NumberOfUnits - 1; i++) |