diff options
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules')
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs | 12 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs | 1 |
2 files changed, 10 insertions, 3 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 983719e57..35569d74f 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 @@ -362,7 +362,6 @@ namespace Tango.PPC.Jobs.Models _numberSpools = value; RaisePropertyChangedAuto(); OnNumberOfSpoolsChanged(); - RaisePropertyChanged(nameof(Copies)); OnUpdateLengthhWeight(); } } @@ -897,7 +896,13 @@ namespace Tango.PPC.Jobs.Models private void OnEnableInterSegmentChanged() { + if(EnableInterSegment == false && InterSegmentLength > 0) + { + _intersegmentlength = 0; + RaisePropertyChanged(nameof(InterSegmentLength)); + } _groupingSegments.ToList().ForEach(x => x.EnableInterSegment = EnableInterSegment); + OnLengthChanged(); UpdateEffectiveSegments(); } @@ -1141,10 +1146,11 @@ namespace Tango.PPC.Jobs.Models private void OnNumberOfSpoolsChanged() { - if(NumberSpools > 0) + if(NumberSpools >= 4) { int coeff = (int)(Copies + NumberSpools -1) / NumberSpools; - Copies = coeff * NumberSpools; + _copies = coeff * NumberSpools; + RaisePropertyChanged(nameof(Copies)); } } 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 8a01e07cc..2ffa84992 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 @@ -258,6 +258,7 @@ namespace Tango.PPC.Jobs.ViewModels SetOrDiscardAll(); return; } + JobModel.EnableInterSegment = false; } _isBasicMode = value; RaisePropertyChangedAuto(); |
