diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-03-16 15:23:40 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-03-16 15:23:40 +0200 |
| commit | 6ccd2ee79d33669baea3d5d49b3fc5597e32d177 (patch) | |
| tree | 4f69894b5c12f9dc461a8542895ac443662f4633 /Software/Visual_Studio/Tango.Integration | |
| parent | c1105285f1c0d3051a0bef4e70a4a345a7ed42cc (diff) | |
| download | Tango-6ccd2ee79d33669baea3d5d49b3fc5597e32d177.tar.gz Tango-6ccd2ee79d33669baea3d5d49b3fc5597e32d177.zip | |
Changed bit result Pending to Skipped.
Changed status display order.
Increased BIT fetch timeout to 5 min.
Diffstat (limited to 'Software/Visual_Studio/Tango.Integration')
3 files changed, 14 insertions, 14 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/BitResultComposition.cs b/Software/Visual_Studio/Tango.Integration/Operation/BitResultComposition.cs index cbe6e5fa3..8c27d36fa 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/BitResultComposition.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/BitResultComposition.cs @@ -22,9 +22,9 @@ namespace Tango.Integration.Operation { switch (status) { - case BitResultStatus.Passed: + case BitResultStatus.Skipped: return 3; - case BitResultStatus.Pending: + case BitResultStatus.Passed: return 2; case BitResultStatus.Warning: return 1; diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs index 605e8be47..342bc01e3 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs @@ -26,7 +26,7 @@ namespace Tango.Integration.Operation protected double _last_progress; protected const int PROGRESS_REPORT_RANGE_METERS = 5; protected bool loggedContinueMessage; - private int _handlerCounter; + private static int _handlerCounter; #region Events @@ -335,15 +335,15 @@ namespace Tango.Integration.Operation if (_last_progress != s.Progress) { - 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 <= PROGRESS_REPORT_RANGE_METERS || s.Progress >= Status.TotalProgress - PROGRESS_REPORT_RANGE_METERS) + //{ + LogManager.Log($"{GetJobHandlerString()} 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 3bbbd2efe..bf21df35d 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -4193,7 +4193,7 @@ namespace Tango.Integration.Operation var response = await SendRequest<BitResultsRequest, BitResultsResponse>(new BitResultsRequest(), new TransportRequestConfig() { ShouldLog = true, - Timeout = TimeSpan.FromMinutes(1.5) + Timeout = TimeSpan.FromMinutes(5) }); var compositions = new List<BitResultComposition>(); @@ -4202,7 +4202,7 @@ namespace Tango.Integration.Operation { BitResultComposition composition = new BitResultComposition(); composition.BitType = bitType; - composition.BitResult = new BitResult() { BitType = (PMR.Diagnostics.BitType)bitType.Code }; + composition.BitResult = new BitResult() { BitType = (PMR.Diagnostics.BitType)bitType.Code, Description = "Skipped" }; compositions.Add(composition); } |