aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-11-07 17:39:00 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-11-07 17:39:00 +0200
commit1c9bea6d04dcfbfd1fbf0e1c437c110bc7dafa3e (patch)
tree4f421cf42471e353df9a26f2b9ac33ffe245b0bc /Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
parent984687c7b622e74228445b00f3a467d9b65b1641 (diff)
downloadTango-1c9bea6d04dcfbfd1fbf0e1c437c110bc7dafa3e.tar.gz
Tango-1c9bea6d04dcfbfd1fbf0e1c437c110bc7dafa3e.zip
Fixed issue with job completion on emulator.
Added liquid volumes grid full step. Added full step to dispensing calculations. Fixed issue with gradient generation progress on MS. Worked on software items doc.
Diffstat (limited to 'Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs')
-rw-r--r--Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 6963b90d4..ea1b0a0e3 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -1272,6 +1272,13 @@ namespace Tango.Integration.Operation
PreparingJobProgress?.Invoke(this, e);
});
LogManager.Log($"Gradient generated.");
+
+ PreparingJobProgress?.Invoke(this, new PreparingJobProgressEventArgs()
+ {
+ Job = job,
+ Total = job.Segments.Sum(x => x.Length),
+ Progress = job.Segments.Sum(x => x.Length),
+ });
}
foreach (var stop in stops)
@@ -1784,7 +1791,7 @@ namespace Tango.Integration.Operation
if (JobUnitsMethod == JobUnitsMethods.Device)
{
- ticket.NumberOfUnits = (uint)job.NumberOfUnits;
+ ticket.NumberOfUnits = (uint)Math.Max(job.NumberOfUnits, 1);
}
ticket.Spool = new JobSpool();