diff options
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules')
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs | 4 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs | 14 |
2 files changed, 4 insertions, 14 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 283c051e8..1b5562a59 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 @@ -394,12 +394,12 @@ namespace Tango.PPC.Jobs.Models [JsonIgnore] public int NumberSpools { - get { return _numberSpools; } + get { return Math.Max(_numberSpools, 1); } set { if (_numberSpools != value) { - _numberSpools = value; + _numberSpools = Math.Max(value, 1); RaisePropertyChangedAuto(); OnNumberOfSpoolsChanged(); OnUpdateLengthhWeight(); diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs index 67a4cf972..db75b5e34 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs @@ -960,6 +960,7 @@ namespace Tango.PPC.Jobs.ViewModels job.Name = vm.Name; job.NumberOfHeads = 1; job.NumberOfUnits = 1; + job.NumberOfSpools = BuildProvider.MachineType == MachineTypes.Eureka ? 4 : 1; job.SampleUnitsOrMeters = 1; job.CreationDate = DateTime.UtcNow; job.JobStatus = JobStatuses.Draft; @@ -1045,6 +1046,7 @@ namespace Tango.PPC.Jobs.ViewModels job.NumberOfHeads = 1; job.NumberOfUnits = 1; job.SampleUnitsOrMeters = 1; + job.NumberOfSpools = BuildProvider.MachineType == MachineTypes.Eureka ? 4 : 1; job.CreationDate = DateTime.UtcNow; job.JobStatus = JobStatuses.Draft; job.JobType = JobTypes.Knitting; @@ -1056,18 +1058,6 @@ namespace Tango.PPC.Jobs.ViewModels job.WindingMethodGuid = Adapter.WindingMethods.FirstOrDefault().Guid; job.SpoolTypeGuid = Settings.SpoolTypeGuid != null ? Settings.SpoolTypeGuid : Adapter.SpoolTypes.FirstOrDefault().Guid; - if (BuildProvider.IsEureka) - { - job.EnableInterSegment = false; - job.InterSegmentLength = 0; - - if (BuildProvider.MachineType == MachineTypes.Eureka) - { - job.NumberOfSpools = 4; - } - job.NumberOfUnits = 1; - } - foreach (var segment in segments) { |