Fixed several bug with TS.

6 files changed, 123 insertions, 101 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml
index 0224ab766..7ebde1913 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml
@@ -138,7 +138,7 @@
                                 </DockPanel  >
 
                                 <DockPanel Visibility="{Binding ShowDuplicate,Converter={StaticResource BooleanToVisibilityConverter}}"  Margin="0 50 0 0" HorizontalAlignment="Stretch">
-                                    <TextBlock HorizontalAlignment="Left" Margin="0 10 0 0" FontSize="{StaticResource TangoDialogFontSize}" Width="155" >
+                                    <TextBlock HorizontalAlignment="Left" Margin="0 10 0 0" FontSize="{StaticResource TangoDialogFontSize}" Width="160" >
                                         <Run Text="Use Flat Spool"></Run>
                                     </TextBlock>
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
index d014aa000..12911a6e2 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
@@ -646,16 +646,18 @@ namespace Tango.PPC.Jobs.Models
 
         #region constructors
 
-        public BrushStopModel()
+        public BrushStopModel(BrushStop stop)
         {
             Guid = System.Guid.NewGuid().ToString();
 
             TangoIOC.Default.Inject(this);
 
+            BrushStop = stop;
+
             LiquidVolumes = new LiquidVolumesCollection();
         }
 
-        public BrushStopModel(SegmentModel segmentModel) : this()
+        public BrushStopModel(SegmentModel segmentModel, BrushStop stop) : this(stop)
         {
             SegmentModel = segmentModel;
 
@@ -675,7 +677,7 @@ namespace Tango.PPC.Jobs.Models
             RequiredMaxLiquidTest = false;
         }
 
-        public BrushStopModel(BrushStop brushStop, SegmentModel segmentModel, int version) : this()
+        public BrushStopModel(BrushStop brushStop, SegmentModel segmentModel, int version) : this(brushStop)
         {
             SegmentModel = segmentModel;
             BrushStop = brushStop;
@@ -868,7 +870,7 @@ namespace Tango.PPC.Jobs.Models
 
         public BrushStopModel Clone()
         {
-            var cloned = new BrushStopModel(SegmentModel);
+            var cloned = new BrushStopModel(SegmentModel, BrushStop);
             cloned.StopIndex = StopIndex;
             cloned.PreventPropertyUpdate = true;
             cloned.Red = Red;
@@ -885,7 +887,7 @@ namespace Tango.PPC.Jobs.Models
             cloned.Saturation = Saturation;
             cloned.Brightness = Brightness;
             cloned.Color = Color;
-
+            cloned.BrushStop = BrushStop;
             cloned.ColorCatalogsItem = ColorCatalogsItem;
             cloned.ColorSpace = ColorSpace;
             cloned.BestMatchColor = BestMatchColor;
@@ -962,6 +964,7 @@ namespace Tango.PPC.Jobs.Models
 
             Configuration configuration = SegmentModel.Job.Machine.Configuration;
             Rml rml = SegmentModel.Job.Rml;
+
             s.Segment = BrushStop.Segment;
             s.SetLiquidVolumes(configuration, rml, rml.GetActiveProcessGroup().ProcessParametersTables.FirstOrDefault());
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs
index ca24f4bcf..5fe11ced3 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs
@@ -28,7 +28,7 @@ namespace Tango.PPC.Jobs.Models
         public Job Job { get; set; }
 
         protected String _name;
-        
+
         public String Name
         {
             get
@@ -81,11 +81,11 @@ namespace Tango.PPC.Jobs.Models
         {
             if (Segments != null)
             {
-                if((EnableInterSegment && IsAllSegmentsPerSpool))
-                    return GroupingSegments.Count > 0 ? (GroupingSegments.Sum(x => x.LengthWithInterSegment) ) : 0;
+                if ((EnableInterSegment && IsAllSegmentsPerSpool))
+                    return GroupingSegments.Count > 0 ? (GroupingSegments.Sum(x => x.LengthWithInterSegment)) : 0;
                 return GroupingSegments.Sum(x => x.FullLength);
                 //return Segments.Sum(x => x.LengthWithInterSegment);
-               // return Segments.Sum(x => x.LengthWithFactor) + ((EnableInterSegment && IsAllSegmentsPerSpool) ? (InterSegmentLength * (Segments.Count > 0 ? Segments.Count - 1 : Segments.Count)) : 0);
+                // return Segments.Sum(x => x.LengthWithFactor) + ((EnableInterSegment && IsAllSegmentsPerSpool) ? (InterSegmentLength * (Segments.Count > 0 ? Segments.Count - 1 : Segments.Count)) : 0);
             }
             else
             {
@@ -138,7 +138,7 @@ namespace Tango.PPC.Jobs.Models
                 }
             }
         }
-        
+
         protected Double _intersegmentlength;
 
         /// <summary>
@@ -184,7 +184,7 @@ namespace Tango.PPC.Jobs.Models
 
                 _lastLength = GetLength();
                 var l = _lastLength * Math.Max(NumberOfUnits, 1);
-                
+
                 if (EnableInterSegment && NumberOfUnits > 1)
                 {
                     l += ((NumberOfUnits - 1) * InterSegmentLength);
@@ -199,11 +199,11 @@ namespace Tango.PPC.Jobs.Models
         {
             get
             {
-                if(NumberSpools >= 4)
+                if (NumberSpools >= 4)
                 {
                     return LengthIncludingNumberOfUnits * NumberSpools;
                 }
-                
+
                 return LengthIncludingNumberOfUnits;
             }
         }
@@ -227,7 +227,7 @@ namespace Tango.PPC.Jobs.Models
                 {
                     _rml = value;
                     RaisePropertyChangedAuto();
-                    RaisePropertyChanged( nameof(GetEstimatedDuration));
+                    RaisePropertyChanged(nameof(GetEstimatedDuration));
                     RaisePropertyChanged(nameof(GramPerLength));
                     OnUpdateLengthhWeight();
                 }
@@ -268,7 +268,7 @@ namespace Tango.PPC.Jobs.Models
         /// </summary>
         [JsonIgnore]
         public List<ColorSpace> ColorSpacesList { get; set; }
-        
+
         protected Customer _customer;
 
         /// <summary>
@@ -342,7 +342,8 @@ namespace Tango.PPC.Jobs.Models
         public string SpoolTypeName
         {
             get { return _spoolTypeName; }
-            set {
+            set
+            {
                 _spoolTypeName = value;
                 RaisePropertyChangedAuto();
             }
@@ -351,7 +352,7 @@ namespace Tango.PPC.Jobs.Models
 
         public string SpoolGuid
         {
-            get {  return SpoolType.Guid; }
+            get { return SpoolType.Guid; }
         }
 
         private int _numberSpools;
@@ -359,8 +360,9 @@ namespace Tango.PPC.Jobs.Models
         public int NumberSpools
         {
             get { return _numberSpools; }
-            set {
-                if(_numberSpools != value)
+            set
+            {
+                if (_numberSpools != value)
                 {
                     _numberSpools = value;
                     RaisePropertyChangedAuto();
@@ -383,9 +385,9 @@ namespace Tango.PPC.Jobs.Models
             {
                 if (_copies != value)
                 {
-                    if (NumberSpools>=4)
+                    if (NumberSpools >= 4)
                     {
-                        if(value < NumberSpools)
+                        if (value < NumberSpools)
                             _copies = NumberSpools;
                         else
                         {
@@ -424,8 +426,8 @@ namespace Tango.PPC.Jobs.Models
                 }
             }
         }
-        public JobTypes JobType { get; set;  }
-        
+        public JobTypes JobType { get; set; }
+
         protected SynchronizedObservableCollection<SegmentModel> _segments;
 
         /// <summary>
@@ -467,7 +469,7 @@ namespace Tango.PPC.Jobs.Models
                 {
                     _segmentsGroups = value;
                     RaisePropertyChangedAuto();
-                   
+
                 }
             }
         }
@@ -490,14 +492,14 @@ namespace Tango.PPC.Jobs.Models
                 }
             }
         }
-        
+
         private ObservableCollection<SegmentModel> _effectiveSegments;
         [JsonIgnore]
         public ObservableCollection<SegmentModel> EffectiveSegments
         {
             get
             {
-                 return _effectiveSegments;
+                return _effectiveSegments;
             }
         }
 
@@ -538,7 +540,8 @@ namespace Tango.PPC.Jobs.Models
         [JsonIgnore]
         public bool HasSelectedItems
         {
-            get {
+            get
+            {
                 return GroupingSegments.Any(x => x.IsSelected);
             }
         }
@@ -548,13 +551,13 @@ namespace Tango.PPC.Jobs.Models
         {
             get
             {
-                var items = GroupingSegments.Where(x=> x.IsSelected).ToList();
-                
-                foreach(var item in items)
+                var items = GroupingSegments.Where(x => x.IsSelected).ToList();
+
+                foreach (var item in items)
                 {
-                    if(item is SegmentModel seg)
+                    if (item is SegmentModel seg)
                     {
-                        if(seg.IsGradient)
+                        if (seg.IsGradient)
                             return true;
                     }
                     else if (item is SegmentsGroupModel group)
@@ -568,7 +571,7 @@ namespace Tango.PPC.Jobs.Models
                         }
                     }
                 }
-                return false ;
+                return false;
             }
         }
 
@@ -602,9 +605,9 @@ namespace Tango.PPC.Jobs.Models
             }
         }
 
-        
+
         ProcessParametersTable _processParametersTable;
-       [JsonIgnore]
+        [JsonIgnore]
         public ProcessParametersTable ProcessParametersTable
         {
             get
@@ -622,9 +625,9 @@ namespace Tango.PPC.Jobs.Models
             }
         }
 
-        private  void InitializeProcessParameters()
+        private void InitializeProcessParameters()
         {
-            _processParametersTable =  GetRecommendedProcessParameters();
+            _processParametersTable = GetRecommendedProcessParameters();
         }
 
         [JsonIgnore]
@@ -635,7 +638,7 @@ namespace Tango.PPC.Jobs.Models
                 if (Rml == null || Rml.GetActiveProcessGroup().ProcessParametersTables == null)
                     return TimeSpan.Zero;
                 var processParameters = ProcessParametersTable;
-                if(processParameters == null)
+                if (processParameters == null)
                     processParameters = Rml.GetActiveProcessGroup().ProcessParametersTables.FirstOrDefault();
 
                 if (processParameters.DyeingSpeed != 0)
@@ -673,7 +676,7 @@ namespace Tango.PPC.Jobs.Models
             }
         }
 
-        
+
 
 
         [JsonIgnore]
@@ -684,12 +687,12 @@ namespace Tango.PPC.Jobs.Models
         {
             get
             {
-                if(Rml != null)
+                if (Rml != null)
                     return Rml.GetGramPer1000mLength;
                 return 0d;
             }
         }
-        
+
         [JsonIgnore]
         public double WeightIncludingNumberOfUnits
         {
@@ -703,7 +706,7 @@ namespace Tango.PPC.Jobs.Models
                 return weight;
             }
         }
-        
+
         [JsonIgnore]
         public double WeightIncludingNumberOfUnitsAndSpools
         {
@@ -753,7 +756,7 @@ namespace Tango.PPC.Jobs.Models
         {
             LoadGroupingSegments();
         }
-        
+
         /// <summary>
         /// Loads the grouping segments.
         /// </summary>
@@ -765,7 +768,7 @@ namespace Tango.PPC.Jobs.Models
             //segmentsWithGroups.AddRange(Segments.Where(x => x.SegmentsGroupModel == null));
             //segmentsWithGroups.AddRange(SegmentsGroups);
             OrderedSegmentsWithGroups.ForEach(x => _groupingSegments.Add(x));
-           
+
             if (_groupingSegments.Count > 0)
                 _groupingSegments.Last().IsLast = true;
             RaisePropertyChanged(nameof(GroupingSegments));
@@ -810,14 +813,14 @@ namespace Tango.PPC.Jobs.Models
         /// <returns></returns>
         public SegmentModel CreateInterSegment(double length)
         {
-            SegmentModel segment =  new SegmentModel()
+            SegmentModel segment = new SegmentModel()
             {
                 IsInterSegment = true,
                 Length = length,
                 Name = "Inter Segment",
                 Job = this,
             };
-            segment.BrushStops.Add(new BrushStopModel(segment)
+            segment.BrushStops.Add(new BrushStopModel(segment, null)
             {
                 ColorSpace = ColorSpaces.RGB,
                 Color = System.Windows.Media.Colors.White,
@@ -833,7 +836,7 @@ namespace Tango.PPC.Jobs.Models
         /// <param name="length">The length.</param>
         /// <param name="segmentIndex">Index of the segment.</param>
         /// <returns></returns>
-        public SegmentModel AddNewSegment( double length, Int32 segmentIndex)
+        public SegmentModel AddNewSegment(double length, Int32 segmentIndex)
         {
             SegmentModel segment = new SegmentModel();
             segment.Name = "Standard Segment";
@@ -842,43 +845,48 @@ namespace Tango.PPC.Jobs.Models
 
             segment.Job = this;
             segment.EnableInterSegment = InterSegmentLength > 0;
-            
+
             Segments.Add(segment);
             if (segmentIndex < GroupingSegments.Count())
             {
-                GroupingSegments.Insert(segmentIndex , segment);
+                GroupingSegments.Insert(segmentIndex, segment);
             }
             else
                 GroupingSegments.Add(segment);
             ArrangeSegmentsIndixes();
-            
+
             return segment;
         }
 
         protected ProcessParametersTable GetRecommendedProcessParameters()
         {
-                try
+            try
+            {
+                IColorConverter _converter = new DefaultColorConverter();
+                bool useLightInks = true;
+                if (OrderedSegmentsWithGroups.Count > 1 && !EnableInterSegment)
+                    useLightInks = false;
+                List<BrushStop> stops = new List<BrushStop>();
+                foreach (var segment in OrderedSegmentsWithGroups)
                 {
-                    IColorConverter _converter = new DefaultColorConverter();
-                    bool useLightInks = true;
-                    if (OrderedSegmentsWithGroups.Count > 1 && !EnableInterSegment)
-                        useLightInks = false;
-                    List<BrushStop> stops = new List<BrushStop>();
-                    foreach (var segment in OrderedSegmentsWithGroups)
+                    if (segment is SegmentModel innerSegment)
                     {
-                        if (segment is SegmentModel innerSegment)
+                        foreach (var stop in innerSegment.BrushStops.OrderBy(x => x.StopIndex).ToList())
                         {
-                            foreach (var stop in innerSegment.BrushStops.OrderBy(x => x.StopIndex).ToList())
+                            if (stop.BrushStop != null)
                             {
                                 BrushStop bs = stop.CreateBrushStop();
                                 stops.Add(bs);
                             }
                         }
-                        else if (segment is SegmentsGroupModel group)
+                    }
+                    else if (segment is SegmentsGroupModel group)
+                    {
+                        foreach (var segm_group in group.Segments.OrderBy(x => x.SegmentIndex))
                         {
-                            foreach (var segm_group in group.Segments.OrderBy(x => x.SegmentIndex))
+                            foreach (var stop in segm_group.BrushStops.OrderBy(x => x.StopIndex).ToList())
                             {
-                                foreach (var stop in segm_group.BrushStops.OrderBy(x => x.StopIndex).ToList())
+                                if (stop.BrushStop != null)
                                 {
                                     BrushStop bs = stop.CreateBrushStop();
                                     stops.Add(bs);
@@ -886,13 +894,22 @@ namespace Tango.PPC.Jobs.Models
                             }
                         }
                     }
+                }
+
+                if (stops.Count > 0)
+                {
                     return _converter.GetRecommendedProcessParameters(Rml, Machine, stops, Rml.GetActiveProcessGroup(), useLightInks);
                 }
-                catch (Exception ex)
+                else
                 {
-                    LogManager.Log(ex, "Error calculating recommended process parameters.");
-                    return null;
+                    return Rml.GetActiveProcessGroup().ProcessParametersTables.FirstOrDefault();
                 }
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error calculating recommended process parameters.");
+                return null;
+            }
         }
         #endregion
 
@@ -900,7 +917,7 @@ namespace Tango.PPC.Jobs.Models
 
         private void OnEnableInterSegmentChanged()
         {
-            if(EnableInterSegment == false && InterSegmentLength > 0)
+            if (EnableInterSegment == false && InterSegmentLength > 0)
             {
                 _intersegmentlength = 0;
                 RaisePropertyChanged(nameof(InterSegmentLength));
@@ -942,14 +959,14 @@ namespace Tango.PPC.Jobs.Models
                                 //    effectiveSegments.Add(segments[i].Clone());
                                 //}
                                 //else
-                                    effectiveSegments.Add(segments[i]);
+                                effectiveSegments.Add(segments[i]);
                                 if (EnableInterSegment && !(repeats == (segmentsGroup.Repeats - 1) && i == (segments.Count - 1)))
                                 {
                                     effectiveSegments.Add(CreateInterSegment(InterSegmentLength));
                                 }
                             }
                         }
-                        if (EnableInterSegment && segmentsGroup.SegmentIndex != max )
+                        if (EnableInterSegment && segmentsGroup.SegmentIndex != max)
                         {
                             effectiveSegments.Add(CreateInterSegment(InterSegmentLength));
                         }
@@ -1000,11 +1017,11 @@ namespace Tango.PPC.Jobs.Models
                 segment.PropertyChanged -= Segment_PropertyChanged;
                 segment.PropertyChanged += Segment_PropertyChanged;
             }
-            
+
             OnLengthChanged();
             //UpdateEffectiveSegments();
         }
-        
+
         /// <summary>
         /// Handles the PropertyChanged event of all job segments.
         /// </summary>
@@ -1024,14 +1041,14 @@ namespace Tango.PPC.Jobs.Models
                 OnLengthChanged();
                 UpdateEffectiveSegments();
             }
-            else if(e.PropertyName == nameof(SegmentModel.IsSelected))
+            else if (e.PropertyName == nameof(SegmentModel.IsSelected))
             {
                 if (_preventChange) return;
-                if(Segments.ToList().TrueForAll(x => x.IsSelected))
+                if (Segments.ToList().TrueForAll(x => x.IsSelected))
                 {
                     _selectAllSegments = true;
                 }
-                else 
+                else
                 {
                     _selectAllSegments = false;
                 }
@@ -1039,7 +1056,7 @@ namespace Tango.PPC.Jobs.Models
                 UpdateSelectedButtons();
             }
         }
-        
+
         private void SegmentsGroup_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
         {
             foreach (var group in GroupingSegments.ToList())
@@ -1098,7 +1115,7 @@ namespace Tango.PPC.Jobs.Models
                 {
                     var maxRep = (maxLength == 0 ? 999 : (maxLength / Length));
 
-                    if(!IsEureka)
+                    if (!IsEureka)
                         await TangoIOC.Default.GetInstance<INotificationProvider>().ShowError($"You have reached the maximum length for this job {maxLength}.");
 
                     //if(NumberOfUnits > 1 && NumberOfUnits > maxRep)
@@ -1106,12 +1123,12 @@ namespace Tango.PPC.Jobs.Models
                     //    NumberOfUnits = (int)maxRep;
                     //}
                 }
-                
+
                 OnUpdateLengthhWeight();
                 RaisePropertyChanged(nameof(Length));
 
             }
-            RaisePropertyChanged(nameof(GetEstimatedDuration)); 
+            RaisePropertyChanged(nameof(GetEstimatedDuration));
         }
 
         private void OnUpdateLengthhWeight()
@@ -1124,7 +1141,7 @@ namespace Tango.PPC.Jobs.Models
 
         private void OnSelectAllChanged()
         {
-            if (Segments != null )
+            if (Segments != null)
             {
                 _preventChange = true;
                 GroupingSegments.ToList().ForEach(x => x.IsSelected = SelectAllSegments);
@@ -1143,21 +1160,21 @@ namespace Tango.PPC.Jobs.Models
             }
             _enableintersegment = InterSegmentLength > 0;
             _preventChange = false;
-           
+
             OnLengthChanged();
             UpdateEffectiveSegments();
         }
-        
+
         private void OnNumberOfSpoolsChanged()
         {
-            if(NumberSpools >= 4)
+            if (NumberSpools >= 4)
             {
-                int coeff = (int)(Copies + NumberSpools -1) / NumberSpools;
+                int coeff = (int)(Copies + NumberSpools - 1) / NumberSpools;
                 _copies = coeff * NumberSpools;
                 RaisePropertyChanged(nameof(Copies));
             }
         }
-        
+
         #endregion
 
         #region collapsed mode actions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobProgressViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobProgressViewVM.cs
index a5b68b368..112d6d6c6 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobProgressViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobProgressViewVM.cs
@@ -104,11 +104,10 @@ namespace Tango.PPC.Jobs.ViewModels
             get { return _currentBrushStop; }
             set
             {
-                // if (_currentBrushStop != value)
+                if (_currentBrushStop != value)
                 {
                     _currentBrushStop = value;
                     OnUpdateCurrentBrush();
-                    RaisePropertyChangedAuto();
                 }
             }
         }
@@ -207,6 +206,8 @@ namespace Tango.PPC.Jobs.ViewModels
         {
             CurrentBrushStop.SetLiquidVolumes(MachineProvider.Machine.Configuration, Job.Rml, MachineProvider.MachineOperator.CurrentProcessParameters);
 
+            RaisePropertyChanged(nameof(CurrentBrushStop));
+
             RaisePropertyChanged(nameof(CyanOutput));
             RaisePropertyChanged(nameof(LightCyanOutput));
             RaisePropertyChanged(nameof(MagentaOutput));
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
index ee3cece33..a9ee25238 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
@@ -101,11 +101,12 @@ namespace Tango.PPC.Jobs.ViewModels
 
         public bool CanEdit
         {
-            get {
-                return Job != null && 
-                    (!MachineProvider.MachineOperator.IsPrinting 
-                        || MachineProvider.MachineOperator.RunningJob == null 
-                        || MachineProvider.MachineOperator.RunningJob.Guid != Job.Guid) 
+            get
+            {
+                return Job != null &&
+                    (!MachineProvider.MachineOperator.IsPrinting
+                        || MachineProvider.MachineOperator.RunningJob == null
+                        || MachineProvider.MachineOperator.RunningJob.Guid != Job.Guid)
                     && !HasResumeModel;
             }
         }
@@ -116,7 +117,7 @@ namespace Tango.PPC.Jobs.ViewModels
             {
                 return Job != null && HasResumeModel &&
                     (!MachineProvider.MachineOperator.IsPrinting
-                      ||  (MachineProvider.MachineOperator.RunningJob != null
+                      || (MachineProvider.MachineOperator.RunningJob != null
                         && MachineProvider.MachineOperator.RunningJob.Guid != Job.Guid));
             }
         }
@@ -292,7 +293,7 @@ namespace Tango.PPC.Jobs.ViewModels
                 }
             }
         }
-        
+
         private JobResumeModel _resumeModel;
         public JobResumeModel ResumeModel
         {
@@ -435,7 +436,7 @@ namespace Tango.PPC.Jobs.ViewModels
             CopyCommand = new RelayCommand(Copy);
             UndoCommand = new RelayCommand(Undo);//(x) => { return UndoRedoManager.Instance.IsEnableUndoOperation(); }
             RedoCommand = new RelayCommand(Redo);//(x) => { return UndoRedoManager.Instance.IsEnableRedoOperation();}
-            DropResumeCommand = new RelayCommand(DropResume, (x)=> CanDropResume);
+            DropResumeCommand = new RelayCommand(DropResume, (x) => CanDropResume);
 
 
             NavigateBackToJobs = new RelayCommand(NavigateBack);
@@ -522,7 +523,7 @@ namespace Tango.PPC.Jobs.ViewModels
                     }
 
                     RaisePropertyChanged(nameof(CanEdit));
-                     DropResumeCommand.RaiseCanExecuteChanged();
+                    DropResumeCommand.RaiseCanExecuteChanged();
 
                     Job.NameChanged -= Job_NameChanged;
                     Job.NameChanged += Job_NameChanged;
@@ -1169,7 +1170,7 @@ namespace Tango.PPC.Jobs.ViewModels
                 DialogEditObject = new ColorSelectionViewVM.DialogObject()
                 {
                     SelectedSegment = segment,
-                    BrushStopForEdit = new BrushStopModel(segment),
+                    BrushStopForEdit = new BrushStopModel(segment, null),
                     IsEditingMode = false,
                     Catalogs = _catalogs
                 }
@@ -1776,10 +1777,10 @@ namespace Tango.PPC.Jobs.ViewModels
         private void MachineOperator_PrintingStarted(object sender, PrintingEventArgs e)
         {
             RaisePropertyChanged(nameof(CanEdit));
-            InvokeUI( () =>
-            {
-                DropResumeCommand.RaiseCanExecuteChanged();
-            });
+            InvokeUI(() =>
+           {
+               DropResumeCommand.RaiseCanExecuteChanged();
+           });
         }
 
         private void MachineOperator_PrintingEnded(object sender, Integration.Operation.PrintingEventArgs e)
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 1c2ce0042..e8ef93edd 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -1562,7 +1562,7 @@ namespace Tango.Integration.Operation
 
                     if (EnableJobResume)
                     {
-                        ResumeJob();
+                        //ResumeJob();
                     }
 
                     if (response.Message.IsAfterReset)