diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-02-05 14:40:05 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-02-05 14:40:05 +0200 |
| commit | 97c1df6f802449daa37b259b8c440e474eaa4a28 (patch) | |
| tree | e69c54bbeed36e2484a71532c1145dc620d2e8df /Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs | |
| parent | b9cadce8257cb9e567917c753ecafb4ee9c42ce1 (diff) | |
| download | Tango-97c1df6f802449daa37b259b8c440e474eaa4a28.tar.gz Tango-97c1df6f802449daa37b259b8c440e474eaa4a28.zip | |
Machine Studio. Set some colors in dialogs for Dark theme.
Removed gradientResolution from CreateJobRunLiquidQuantities.
Diffstat (limited to 'Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs')
| -rw-r--r-- | Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index e64ff7430..2528746f8 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -1754,7 +1754,7 @@ namespace Tango.Integration.Operation } else { - _currentJobLiquidQuantities = CreateJobRunLiquidQuantities(job, configuration, processParameters, handler.Status.Progress, handler.Status.TotalProgress, GradientGenerationConfiguration.ResolutionCM); + _currentJobLiquidQuantities = CreateJobRunLiquidQuantities(job, configuration, processParameters, handler.Status.Progress, handler.Status.TotalProgress); } } catch (Exception ex) @@ -1862,7 +1862,7 @@ namespace Tango.Integration.Operation /// <param name="length">The length.</param> /// <param name="gradientResolution">The gradient resolution.</param> /// <returns></returns> - public static List<BL.ValueObjects.JobRunLiquidQuantity> CreateJobRunLiquidQuantities(Job job, Configuration configuration, ProcessParametersTable processParameters, double position, double length, int gradientResolution) + public static List<BL.ValueObjects.JobRunLiquidQuantity> CreateJobRunLiquidQuantities(Job job, Configuration configuration, ProcessParametersTable processParameters, double position, double length) { var units = Math.Max(job.NumberOfUnits, 1); @@ -1892,8 +1892,7 @@ namespace Tango.Integration.Operation { liquidQuantities.Add(pack.PackIndex, 0); } - - int resolution = gradientResolution; + bool stop_calc = false; for (int segmentIndex = 0; segmentIndex < effectiveSegments.Count && !stop_calc; segmentIndex++) @@ -1932,10 +1931,6 @@ namespace Tango.Integration.Operation delta_brushLenghtToStopPosition = (total_length + prev_offset_cm + brush_length_centimeters) - position_cm; brush_length_centimeters = brush_length_centimeters - (delta_brushLenghtToStopPosition * delta_brushLenghtToStopPosition / brush_length_centimeters); } - if (brushIndex == 0)// add a resolution step for first brush - { - brush_length_centimeters += resolution; - } } else//last brush or solid brush { @@ -1949,13 +1944,7 @@ namespace Tango.Integration.Operation { brush_length_centimeters = position_cm - total_length; stop_calc = true; - } - // add a resolution for last brush , not solid brush - if (orderedBrushCollection.Count > 1) - { - brush_length_centimeters -= resolution; - } - } + } } prev_offset_cm = brush_offset_cm; |
