From c698425b1ab832fe351aff257815709c01950fc3 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 6 Nov 2019 18:06:45 +0200
Subject: Implemented liquid quantity validation on PPC and MS. Improved PPC
 full control view.

---
 .../ViewModels/MainViewVM.cs                       | 48 ++++++++++++++--------
 1 file changed, 31 insertions(+), 17 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 3a1f3fb11..c9483b9a2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1481,15 +1481,39 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                 JobHandler.Failed += (x, ex) =>
                 {
-                    LogManager.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
-                    _eventLogger.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
-                    SetJobFailed();
+                    if (ex is InsufficientLiquidQuantityException)
+                    {
+                        InvokeUI(() =>
+                        {
+                            _notification.ShowModalDialog<InsufficientLiquidQuantityViewVM, InsufficientLiquidQuantityView>(new InsufficientLiquidQuantityViewVM(ex as InsufficientLiquidQuantityException), (_) =>
+                            {
 
-                    InvokeUI(() =>
+                                MachineOperator.EnableJobLiquidQuantityValidation = false;
+                                StartJob();
+
+                            }, () =>
+                            {
+                                SetJobFailed();
+
+                                InvokeUI(() =>
+                                {
+                                    StopRecordingIfInProgress();
+                                });
+                            });
+                        });
+                    }
+                    else
                     {
-                        _notification.ShowError("Job failed. " + ex.FlattenMessage());
-                        StopRecordingIfInProgress();
-                    });
+                        LogManager.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
+                        _eventLogger.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
+                        SetJobFailed();
+
+                        InvokeUI(() =>
+                        {
+                            _notification.ShowError("Job failed. " + ex.FlattenMessage());
+                            StopRecordingIfInProgress();
+                        });
+                    }
                 };
 
                 JobHandler.Finalizing += (_, __) =>
@@ -1521,16 +1545,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     //Finally Canceled..
                 };
             }
-            catch (InsufficientLiquidQuantityException ex)
-            {
-                _notification.ShowModalDialog<InsufficientLiquidQuantityViewVM, InsufficientLiquidQuantityView>(new InsufficientLiquidQuantityViewVM(ex), (x) =>
-                {
-
-                    MachineOperator.EnableJobLiquidQuantityValidation = false;
-                    StartJob();
-
-                }, () => { });
-            }
             catch (Exception ex)
             {
                 LogManager.Log(ex);
-- 
cgit v1.3.1


From 1c9bea6d04dcfbfd1fbf0e1c437c110bc7dafa3e Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 7 Nov 2019 17:39:00 +0200
Subject: 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.

---
 .../ViewModels/MainViewVM.cs                       |  12 +++----
 .../Views/JobView.xaml                             |  35 +++++++++++++++++++++
 .../Twine Software Items (version 1).xlsb.xlsx     | Bin 18776 -> 20410 bytes
 .../Tango.BL/Dispensing/DispensingCalcBase.cs      |  10 ++++++
 .../Tango.BL/Dispensing/DispensingCalcService.cs   |  11 +++++++
 .../Tango.BL/Dispensing/IDispensingCalc.cs         |   7 +++++
 .../Dispensing/TransparentLiquidDispensingCalc.cs  |   6 ++--
 Software/Visual_Studio/Tango.BL/LiquidVolume.cs    |  12 ++++++-
 .../Tango.Emulations/Emulators/MachineEmulator.cs  |   2 +-
 .../Tango.Integration/Operation/MachineOperator.cs |   9 +++++-
 10 files changed, 91 insertions(+), 13 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index c9483b9a2..fec02529b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1034,6 +1034,11 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             var percent = (e.Progress / e.Total * 100d);
 
+            if (_preparingTaskItem != null)
+            {
+                _preparingTaskItem.Message = $"Preparing job for printing {(e.Progress / e.Total * 100d).ToString("0.0")}%...";
+            }
+
             if (_preparingTaskItem == null && percent == 0)
             {
                 _preparingTaskItem = _notification.PushTaskItem("Preparing job for printing...");
@@ -1043,13 +1048,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 _preparingTaskItem.Pop();
                 _preparingTaskItem = null;
             }
-            else
-            {
-                if (_preparingTaskItem != null)
-                {
-                    _preparingTaskItem.Message = $"Preparing job for printing {(e.Progress / e.Total * 100d).ToString("0.0")}%...";
-                }
-            }
         }
 
         private void MachineOperator_ResumingJob(object sender, ResumingJobEventArgs e)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 3bda86036..e1bbad6a7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -1179,6 +1179,41 @@
                                                                                                                             </DataGridTemplateColumn.CellTemplate>
                                                                                                                         </DataGridTemplateColumn>
                                                                                                                         <DataGridTemplateColumn Header="PULSE / SEC">
+                                                                                                                            <DataGridTemplateColumn.CellTemplate>
+                                                                                                                                <DataTemplate>
+                                                                                                                                    <Label VerticalAlignment="Center">
+                                                                                                                                        <Label.Style>
+                                                                                                                                            <Style TargetType="Label">
+                                                                                                                                                <Setter Property="Content">
+                                                                                                                                                    <Setter.Value>
+                                                                                                                                                        <TextBlock>
+                                                                                                                                                 <Run Text="{Binding PulsePerSecondFull,Mode=OneWay,StringFormat='0.0'}"></Run>
+                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="{StaticResource GrayBrush250}"></Run>
+                                                                                                                                                        </TextBlock>
+                                                                                                                                                    </Setter.Value>
+                                                                                                                                                </Setter>
+                                                                                                                                                <Style.Triggers>
+                                                                                                                                                    <DataTrigger Binding="{Binding DispenserStepDivision}" Value="{x:Static dispensing:DispenserStepDivisions.Auto}">
+                                                                                                                                                        <Setter Property="Content" Value="Auto"></Setter>
+                                                                                                                                                    </DataTrigger>
+                                                                                                                                                    <DataTrigger Binding="{Binding DispenserStepDivision,Converter={StaticResource IsNotConverter},ConverterParameter={x:Static dispensing:DispenserStepDivisions.Auto}}" Value="True">
+                                                                                                                                                        <Setter Property="Content">
+                                                                                                                                                            <Setter.Value>
+                                                                                                                                                                <TextBlock>
+                                                                                                                                                 <Run Text="{Binding PulsePerSecondFull,Mode=OneWay,StringFormat='0.0'}"></Run>
+                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="{StaticResource GrayBrush250}"></Run>
+                                                                                                                                                                </TextBlock>
+                                                                                                                                                            </Setter.Value>
+                                                                                                                                                        </Setter>
+                                                                                                                                                    </DataTrigger>
+                                                                                                                                                </Style.Triggers>
+                                                                                                                                            </Style>
+                                                                                                                                        </Label.Style>
+                                                                                                                                    </Label>
+                                                                                                                                </DataTemplate>
+                                                                                                                            </DataGridTemplateColumn.CellTemplate>
+                                                                                                                        </DataGridTemplateColumn>
+                                                                                                                        <DataGridTemplateColumn Header="PULSE / SEC (full step)">
                                                                                                                             <DataGridTemplateColumn.CellTemplate>
                                                                                                                                 <DataTemplate>
                                                                                                                                     <Label VerticalAlignment="Center">
diff --git a/Software/Visual_Studio/Resources/Twine Software Items (version 1).xlsb.xlsx b/Software/Visual_Studio/Resources/Twine Software Items (version 1).xlsb.xlsx
index 3a107258a..221518a5c 100644
Binary files a/Software/Visual_Studio/Resources/Twine Software Items (version 1).xlsb.xlsx and b/Software/Visual_Studio/Resources/Twine Software Items (version 1).xlsb.xlsx differ
diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs
index e0f16d4d4..dcca5817c 100644
--- a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs
@@ -56,6 +56,16 @@ namespace Tango.BL.Dispensing
             return CalculateNanoliterPerSecond(liquidVolume) / liquidVolume.NanoliterPerStep / (double)liquidVolume.DispenserStepDivision;
         }
 
+        /// <summary>
+        /// Calculates the required full pulses per second.
+        /// </summary>
+        /// <param name="liquidVolume">The liquid volume.</param>
+        /// <returns></returns>
+        public double CalculatePulsePerSecondFull(LiquidVolume liquidVolume)
+        {
+            return CalculateNanoliterPerSecond(liquidVolume) / liquidVolume.NanoliterPerStep;
+        }
+
         /// <summary>
         /// Coerces the specified liquid volume.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcService.cs b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcService.cs
index a41eb1040..3dd38fb10 100644
--- a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcService.cs
+++ b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcService.cs
@@ -44,6 +44,17 @@ namespace Tango.BL.Dispensing
             return formula.CalculatePulsePerSecond(liquidVolume);
         }
 
+        /// <summary>
+        /// Calculates the full pulse per second.
+        /// </summary>
+        /// <param name="liquidVolume">The liquid volume.</param>
+        /// <returns></returns>
+        public static double CalculatePulsePerSecondFull(LiquidVolume liquidVolume)
+        {
+            IDispensingCalc formula = DispensingCalcResolver.Resolve(liquidVolume);
+            return formula.CalculatePulsePerSecondFull(liquidVolume);
+        }
+
         /// <summary>
         /// Coerces the volume.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/IDispensingCalc.cs b/Software/Visual_Studio/Tango.BL/Dispensing/IDispensingCalc.cs
index 7c5928bf6..7ec715a88 100644
--- a/Software/Visual_Studio/Tango.BL/Dispensing/IDispensingCalc.cs
+++ b/Software/Visual_Studio/Tango.BL/Dispensing/IDispensingCalc.cs
@@ -28,6 +28,13 @@ namespace Tango.BL.Dispensing
         /// <returns></returns>
         double CalculatePulsePerSecond(LiquidVolume liquidVolume);
 
+        /// <summary>
+        /// Calculates the required full pulses per second.
+        /// </summary>
+        /// <param name="liquidVolume">The liquid volume.</param>
+        /// <returns></returns>
+        double CalculatePulsePerSecondFull(LiquidVolume liquidVolume);
+
         /// <summary>
         /// Coerces the specified liquid volume.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs b/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs
index 15e9b69d9..40a716c13 100644
--- a/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs
+++ b/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs
@@ -45,9 +45,9 @@ namespace Tango.BL.Dispensing
         {
             if (liquidVolume.ProcessParametersTable != null)
             {
-                double nlPcmSum = liquidVolume.BrushStop.LiquidVolumes.Where(x => (IdsPackFormulas)x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor).Sum(x => x.NanoliterPerCentimeter);
-                double minInkUptake = liquidVolume.ProcessParametersTable.MinInkUptake;
-                double volume = ((liquidVolume.LiquidMaxNanoliterPerCentimeter - nlPcmSum) / liquidVolume.LiquidMaxNanoliterPerCentimeter) * 100d;
+                //double nlPcmSum = liquidVolume.BrushStop.LiquidVolumes.Where(x => (IdsPackFormulas)x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor).Sum(x => x.NanoliterPerCentimeter);
+                //double minInkUptake = liquidVolume.ProcessParametersTable.MinInkUptake;
+                //double volume = ((liquidVolume.LiquidMaxNanoliterPerCentimeter - nlPcmSum) / liquidVolume.LiquidMaxNanoliterPerCentimeter) * 100d;
                 return Math.Max(100d - liquidVolume.BrushStop.LiquidVolumes.Where(x => (IdsPackFormulas)x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor).Sum(x => x.Volume), 0);
             }
             else
diff --git a/Software/Visual_Studio/Tango.BL/LiquidVolume.cs b/Software/Visual_Studio/Tango.BL/LiquidVolume.cs
index 69499905a..723356ef6 100644
--- a/Software/Visual_Studio/Tango.BL/LiquidVolume.cs
+++ b/Software/Visual_Studio/Tango.BL/LiquidVolume.cs
@@ -70,7 +70,7 @@ namespace Tango.BL
         public DispenserStepDivisions DispenserStepDivision
         {
             get { return (DispenserStepDivisions)BrushStop.GetDispensingDivision(IdsPack.PackIndex); }
-            set { BrushStop.SetDispensingDivision(IdsPack.PackIndex, (int)value); RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(PulsePerSecond)); RaisePropertyChanged(nameof(NanoliterPerStep)); }
+            set { BrushStop.SetDispensingDivision(IdsPack.PackIndex, (int)value); RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(PulsePerSecond)); RaisePropertyChanged(nameof(NanoliterPerStep)); RaisePropertyChanged(nameof(PulsePerSecondFull)); }
         }
 
         public void Invalidate()
@@ -96,6 +96,7 @@ namespace Tango.BL
                 RaisePropertyChanged(nameof(LiquidMaxNanoliterPerCentimeter));
                 RaisePropertyChanged(nameof(NanoliterPerSecond));
                 RaisePropertyChanged(nameof(PulsePerSecond));
+                RaisePropertyChanged(nameof(PulsePerSecondFull));
                 RaisePropertyChanged(nameof(NanoliterPerCentimeter));
                 RaisePropertyChanged(nameof(Volume));
                 RaisePropertyChanged(nameof(NanoliterPerStep));
@@ -177,6 +178,15 @@ namespace Tango.BL
             }
         }
 
+        [JsonIgnore]
+        public double PulsePerSecondFull
+        {
+            get
+            {
+                return DispensingCalcService.CalculatePulsePerSecondFull(this);
+            }
+        }
+
         [JsonIgnore]
         public double NanoliterPerStep
         {
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index ad3b242f4..74eb3cab1 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -660,7 +660,7 @@ namespace Tango.Emulations.Emulators
             double progress = 0;
             _cancelJob = false;
             bool message_sent = false;
-            double length = job.Segments.Sum(x => x.Length) * (Math.Max(job.NumberOfUnits, 1));
+            double length = job.Length;
 
             Task.Factory.StartNew(() =>
             {
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();
-- 
cgit v1.3.1


From f28e23366e163ac8bc057155af007356e94c8871 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Tue, 12 Nov 2019 12:18:31 +0200
Subject: see item

Related Work Items: #1295
---
 .../ViewModels/MainViewVM.cs                       | 75 +++++++++++++---------
 .../DefaultGradientGenerationConfiguration.cs      |  6 +-
 .../Tango.Integration/Operation/MachineOperator.cs | 53 ++++++++++-----
 3 files changed, 84 insertions(+), 50 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index fec02529b..93baf3b9d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1920,50 +1920,60 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 CanWork = false;
 
-                using (_notification.PushTaskItem("Saving job details..."))
+                try
                 {
-                    await Task.Factory.StartNew(() =>
+                    using (_notification.PushTaskItem("Saving job details..."))
                     {
-                        LogManager.Log(String.Format("Saving the active job {0}...", ActiveJob.Name));
-                        ActiveJob.LastUpdated = DateTime.UtcNow;
-                        ActiveJob.Rml = SelectedRML;
-                        ActiveJob.EstimatedDurationMili = (int)EstimatedDuration.TotalMilliseconds;
-                        _activeJobDbContext.SaveChanges();
-
-                        _machineDbContext.Entry(SelectedMachineJob).Reload();
+                        await Task.Factory.StartNew(() =>
+                        {
+                            LogManager.Log(String.Format("Saving the active job {0}...", ActiveJob.Name));
+                            ActiveJob.LastUpdated = DateTime.UtcNow;
+                            ActiveJob.Rml = SelectedRML;
+                            ActiveJob.EstimatedDurationMili = (int)EstimatedDuration.TotalMilliseconds;
+                            _activeJobDbContext.SaveChanges();
 
+                            _machineDbContext.Entry(SelectedMachineJob).Reload();
 
-                        _machineDbContext.Entry(SelectedMachineJob).Collection(x => x.Segments).Load();
 
-                        foreach (var segment in SelectedMachineJob.Segments.ToList())
-                        {
-                            _machineDbContext.Entry(segment).Collection(x => x.BrushStops).Load();
+                            _machineDbContext.Entry(SelectedMachineJob).Collection(x => x.Segments).Load();
 
-                            foreach (var brushStop in segment.BrushStops.ToList())
+                            foreach (var segment in SelectedMachineJob.Segments.ToList())
                             {
-                                _machineDbContext.Entry(brushStop).Reload();
-                            }
+                                _machineDbContext.Entry(segment).Collection(x => x.BrushStops).Load();
 
-                            _machineDbContext.Entry(segment).Reload();
-                        }
+                                foreach (var brushStop in segment.BrushStops.ToList())
+                                {
+                                    _machineDbContext.Entry(brushStop).Reload();
+                                }
 
-                        InvokeUI(() =>
-                        {
-                            SelectedMachineJob.Segments = SelectedMachineJob.Segments;
-                        });
+                                _machineDbContext.Entry(segment).Reload();
+                            }
 
-                        var settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
-                        settings.DefaultJobRmlGuid = ActiveJob.RmlGuid;
-                        settings.Save();
+                            InvokeUI(() =>
+                            {
+                                SelectedMachineJob.Segments = SelectedMachineJob.Segments;
+                            });
 
-                        if (ActiveJob != null)
-                        {
-                            _current_job_string = ActiveJob.ToJobFileWhenLoaded().ToString();
-                        }
-                    });
-                }
+                            var settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
+                            settings.DefaultJobRmlGuid = ActiveJob.RmlGuid;
+                            settings.Save();
 
-                CanWork = true;
+                            if (ActiveJob != null)
+                            {
+                                _current_job_string = ActiveJob.ToJobFileWhenLoaded().ToString();
+                            }
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "Error saving active job.");
+                    _notification.ShowError($"An error occurred while trying to save the current job.\n{ex.FlattenMessage()}");
+                }
+                finally
+                {
+                    CanWork = true;
+                }
             }
         }
 
@@ -2273,6 +2283,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             return;
                         }
                         SelectedSegment.BrushStops.Remove(x);
+                        _activeJobDbContext.BrushStops.Remove(x);
                     });
 
                     ArrangeBrushStopsIndices();
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs b/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs
index 1f8cf6ada..acc0c6723 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs
@@ -101,7 +101,9 @@ namespace Tango.Integration.Operation
 
             var refStop = clonedStops.First().Clone(segment);
 
-            for (double cm = 0; cm <= segment.Length; cm += (ResolutionCM / 100d))
+            decimal segment_length = (decimal)segment.Length;
+
+            for (decimal cm = 0; cm <= segment_length; cm += (ResolutionCM / 100M))
             {
                 if (aborted) return stops;
 
@@ -127,7 +129,7 @@ namespace Tango.Integration.Operation
                 {
                     Job = job,
                     Total = job.Segments.Sum(x => x.Length),
-                    Progress = previousSegmentsLength + cm,
+                    Progress = previousSegmentsLength + (double)cm,
                 });
             }
 
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index ea1b0a0e3..d6d926800 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -1418,24 +1418,42 @@ namespace Tango.Integration.Operation
             {
                 liquidQuantities.Add(pack.PackIndex, 0);
             }
-
+            int resolution = GradientGenerationConfiguration.ResolutionCM;
             for (int i = 0; i < Math.Max(job.NumberOfUnits, 1); i++)
             {
                 for (int segmentIndex = 0; segmentIndex < job.Segments.Count; segmentIndex++)
                 {
                     var segment = job.Segments[segmentIndex];
                     var segment_length_cm = segment.Length * 100d;
-
-                    var stop_count = segment.BrushStops.Count - (segment.BrushStops.Count == 1 ? 0 : 1);
-                    var stop_length_centimeters = segment_length_cm / stop_count;
-
-                    for (int stopIndex = 0; stopIndex < stop_count; stopIndex++)
-                    {
-                        var stop = segment.BrushStops[stopIndex];
-
-                        foreach (var liquidVolumes in stop.LiquidVolumes)
+                    
+                    List<BrushStop> orderedBrushCollection = segment.BrushStops.OrderBy(x => x.OffsetMeters).ToList();
+                    
+                    int solid_gradient_oeff = orderedBrushCollection.Count == 1 ? 1 : 2;
+                    double prev_offset_cm = 0;
+                    for (int brushIndex = 0; brushIndex < orderedBrushCollection.Count; brushIndex++)
+                    {
+                        var brush = orderedBrushCollection[brushIndex];
+                        double brush_length_centimeters = 0d;
+                        double brush_offset_cm = 0;
+                        if ((brushIndex + 1) < orderedBrushCollection.Count)
                         {
-                            liquidQuantities[liquidVolumes.IdsPack.PackIndex] += liquidVolumes.NanoliterPerCentimeter * stop_length_centimeters;
+                            brush_offset_cm = (brush.OffsetMeters * 100d);
+                            double next_brush_offset_cm = (orderedBrushCollection[brushIndex + 1].OffsetMeters * 100d);
+                            brush_length_centimeters = ((next_brush_offset_cm - brush_offset_cm) + (brush_offset_cm - prev_offset_cm));
+                            if (brushIndex == 0)// add a resolution step for first brush
+                                brush_length_centimeters += resolution;
+                        }
+                        else//last brush or solid brush
+                        {
+                            brush_length_centimeters = (segment_length_cm - prev_offset_cm);
+                            if (orderedBrushCollection.Count > 1)// add a resolution for last brush , not solid brush
+                                brush_length_centimeters -= resolution;
+                        }
+                        prev_offset_cm = brush_offset_cm;
+                        
+                        foreach (var liquidVolumes in brush.LiquidVolumes)
+                        {
+                            liquidQuantities[liquidVolumes.IdsPack.PackIndex] += liquidVolumes.NanoliterPerCentimeter * (brush_length_centimeters / solid_gradient_oeff);
                         }
                     }
                 }
@@ -1749,10 +1767,10 @@ namespace Tango.Integration.Operation
                     job.NumberOfUnits = 1;
                 }
 
-                //if (EnableJobLiquidQuantityValidation)
-                //{
-                //    ValidateJobLiquidQuantity(job, processParameters, job.Machine.Configuration);
-                //}
+                if (EnableJobLiquidQuantityValidation)
+                {
+                   ValidateJobLiquidQuantity(job, processParameters, job.Machine.Configuration);
+                }
 
                 var originalJob = job;
                 var clonedJob = job.Clone();
@@ -1902,7 +1920,10 @@ namespace Tango.Integration.Operation
                     {
                         try
                         {
-                            ValidateJobLiquidQuantity(ticket, processParameters, job.Machine.Configuration);
+                            //ValidateJobLiquidQuantity(originalJob, processParameters, job.Machine.Configuration);
+                            var ticketForValidation = ticket.Clone();
+                            ticketForValidation.NumberOfUnits = (uint)originalJob.NumberOfUnits;
+                            ValidateJobLiquidQuantity(ticketForValidation, processParameters, job.Machine.Configuration);
                         }
                         catch (Exception ex)
                         {
-- 
cgit v1.3.1