Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software

1 files changed, 6 insertions, 2 deletions

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 d8a71fc78..983719e57 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
@@ -79,7 +79,7 @@ namespace Tango.PPC.Jobs.Models
             if (Segments != null)
             {
                 if((EnableInterSegment && IsAllSegmentsPerSpool))
-                    return GroupingSegments.Count > 0 ? (GroupingSegments.Sum(x => x.LengthWithInterSegment) - InterSegmentLength) : 0;
+                    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);
@@ -1097,8 +1097,9 @@ namespace Tango.PPC.Jobs.Models
                     //    NumberOfUnits = (int)maxRep;
                     //}
                 }
-                RaisePropertyChanged(nameof(Length));
+                
                 OnUpdateLengthhWeight();
+                RaisePropertyChanged(nameof(Length));
 
             }
             RaisePropertyChanged(nameof(GetEstimatedDuration)); 
@@ -1131,8 +1132,11 @@ namespace Tango.PPC.Jobs.Models
                 int max = GroupingSegments.Max(x => x.SegmentIndex);
                 GroupingSegments.Where(i => i.SegmentIndex != max).ToList().ForEach(x => x.EnableInterSegment = InterSegmentLength > 0);
             }
+            _enableintersegment = InterSegmentLength > 0;
             _preventChange = false;
+           
             OnLengthChanged();
+            UpdateEffectiveSegments();
         }
         
         private void OnNumberOfSpoolsChanged()