Resume global progress modification.

Events updated.

2 files changed, 26 insertions, 26 deletions

diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
index 47f4ca94a..36604ba3c 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
@@ -193,8 +193,8 @@ namespace Tango.Integration.Operation
             Status.SettingUpTotalProgress = processParameters.DryerBufferLengthMeters;
             if (resumeConfig != null && resumeConfig.GlobalStartPosition > 0)
             {
-                Status.SettingUpTotalProgress = resumeConfig.GlobalStartPosition;
-                Status.CurrentUnitProgress = ResumeConfig.FirstUnitStartPosition;
+                //Status.SettingUpTotalProgress = resumeConfig.GlobalStartPosition;
+                //Status.CurrentUnitProgress = ResumeConfig.FirstUnitStartPosition;
             }
             Status.TotalProgressMinusSettingUp = Job.LengthIncludingNumberOfUnits;
             Status.IsSettingUp = true;
@@ -344,22 +344,22 @@ namespace Tango.Integration.Operation
             
             if (_last_progress != s.Progress)
             {
-                if (LogManager.Categories.Exists(x => x == LogCategory.Debug))
-                {
+                //if (LogManager.Categories.Exists(x => x == LogCategory.Debug))
+                //{
                     LogManager.Log($"Updating job progress {s.Progress}/{Status.TotalProgress}...");
-                }
-                else
-                {
-                    if (s.Progress <= PROGRESS_REPORT_RANGE_METERS || s.Progress >= Status.TotalProgress - PROGRESS_REPORT_RANGE_METERS)
-                    {
-                        LogManager.Log($"Updating job progress {s.Progress}/{Status.TotalProgress}...");
-                    }
-                    else if (!loggedContinueMessage)
-                    {
-                        loggedContinueMessage = true;
-                        LogManager.Log($"Progress logging will continue {PROGRESS_REPORT_RANGE_METERS} meters before completion...");
-                    }
-                }
+                //}
+                //else
+                //{
+                //    if (s.Progress <= PROGRESS_REPORT_RANGE_METERS || s.Progress >= Status.TotalProgress - PROGRESS_REPORT_RANGE_METERS)
+                //    {
+                //        LogManager.Log($"Updating job progress {s.Progress}/{Status.TotalProgress}...");
+                //    }
+                //    else if (!loggedContinueMessage)
+                //    {
+                //        loggedContinueMessage = true;
+                //        LogManager.Log($"Progress logging will continue {PROGRESS_REPORT_RANGE_METERS} meters before completion...");
+                //    }
+                //}
             }
 
             if (s.Progress < 0)
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 5bece20cd..fed6825f3 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -3278,26 +3278,26 @@ namespace Tango.Integration.Operation
                     {
                         LogManager.Log("Job Resume Detected...");
 
-                        resumePreProgress = config.ResumeConfig.GlobalStartPosition - config.ResumeConfig.FirstUnitStartPosition;//- processParameters.DryerBufferLengthMeters;
+                        resumePreProgress = config.ResumeConfig.GlobalStartPosition;// - config.ResumeConfig.FirstUnitStartPosition;//- processParameters.DryerBufferLengthMeters;
 
-                        request.FirstUnitStartPosition = config.ResumeConfig.FirstUnitStartPosition + processParameters.DryerBufferLengthMeters;
+                        request.FirstUnitStartPosition = config.ResumeConfig.GlobalStartPosition;
 
                         //LogManager.Log($" resumePreProgress = {resumePreProgress}, GlobalStartPosition {config.ResumeConfig.GlobalStartPosition}  FirstUnitStartPosition {request.FirstUnitStartPosition}");
                         request.JobTicket.Length = (request.JobTicket.Length / Math.Max(request.JobTicket.NumberOfUnits, 1)) * (int)Math.Max(config.ResumeConfig.RemainingUnits, 1);
                         request.JobTicket.NumberOfUnits = (uint)Math.Max(config.ResumeConfig.RemainingUnits, 1);
-
-                        LogManager.Log($"Resume Config:\n{config.ResumeConfig.ToJsonString()}\n\nAppended Progress: {resumePreProgress}\n\nSent To Firmware:\nJob Length: {request.JobTicket.Length}\nNumber Of Units: {request.JobTicket.NumberOfUnits}\nFirst Unit Start Position: {request.FirstUnitStartPosition}");
+                          
+                        LogManager.Log($"Resume Config:\n{config.ResumeConfig.ToJsonString()}\n");
                     }
 
                     SendContinuousRequest<JobRequest, JobResponse>(request, new TransportContinuousRequestConfig() { Timeout = TimeSpan.FromSeconds(10), ContinuousTimeout = TimeSpan.FromSeconds(10), ShouldLog = true }).Subscribe((response) =>
                     {
                         if (!completed)
                         {
-                            if (resumePreProgress > 0 && response.Message.Status.Progress > 0)
-                            {
-                                LogManager.Log($"Appending Resume Progress {resumePreProgress} + {response.Message.Status.Progress}", LogCategory.Debug);
-                                response.Message.Status.Progress += resumePreProgress;
-                            }
+                            //if (resumePreProgress > 0 && response.Message.Status.Progress > 0)
+                            //{
+                            //    //LogManager.Log($"Appending Resume Progress {resumePreProgress} + {response.Message.Status.Progress}", LogCategory.Debug);
+                            //    //response.Message.Status.Progress += resumePreProgress;
+                            //}
 
                             handler.RaiseStatusReceived(response.Message.Status);
                             _last_job_status = handler.Status;