diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-08 14:27:21 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-08 14:27:21 +0200 |
| commit | e2bf9f578c3ed53d869744f94b020048ca806c6e (patch) | |
| tree | 11b99612235ca541c029f45bac612706108de2df /Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs | |
| parent | e111c33bc87acf40202f9e5423e21b087a366f07 (diff) | |
| download | Tango-e2bf9f578c3ed53d869744f94b020048ca806c6e.tar.gz Tango-e2bf9f578c3ed53d869744f94b020048ca806c6e.zip | |
Refactored catalogs to per RML.
Dropped MEDIA_COLOR.
Added RML White Point LAB.
Added additional dispenser parameters in MS module.
Attempt to optimize PPC color catalog view performance.
Removed "Color Catalog Code" from brush stop.
Implemented PPC color catalog selection per RML.
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs index 6a05eee12..08600c928 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs @@ -333,7 +333,7 @@ namespace Tango.PPC.Jobs.ViewModels TwineCatalogAutoCompleteProvider = new AutoCompleteProvider<ColorCatalog>((color, filter) => { - return !String.IsNullOrWhiteSpace(filter) && color.Name.ToLower().StartsWith(filter.ToLower()); + return !String.IsNullOrWhiteSpace(filter) && color.RmlGuid == Job.Rml.Guid && color.Name.ToLower().StartsWith(filter.ToLower()); }); //Initialize Commands @@ -410,6 +410,9 @@ namespace Tango.PPC.Jobs.ViewModels .WithBrushStops() .BuildAsync(); + Job.RmlChanged -= OnRmlChanged; + Job.RmlChanged += OnRmlChanged; + Job.ValidateOnPropertyChanged = true; LogManager.Log("Loading RMLS..."); @@ -420,7 +423,7 @@ namespace Tango.PPC.Jobs.ViewModels SpoolTypes = await _db.SpoolTypes.ToListAsync(); LogManager.Log("Loading Customers..."); Customers = await _db.Customers.Where(x => x.OrganizationGuid == MachineProvider.Machine.OrganizationGuid).ToListAsync(); - TwineCatalogItems = await _db.ColorCatalogs.Where(x => x.ColorSpace.Code == (int)BL.Enumerations.ColorSpaces.Twine).OrderBy(x => x.Name).ToListAsync(); + TwineCatalogItems = await _db.ColorCatalogs.Where(x => x.RmlGuid == Job.Rml.Guid && x.ColorSpace.Code == (int)BL.Enumerations.ColorSpaces.Twine).OrderBy(x => x.Name).ToListAsync(); if (!_check_gamut_thread.IsAlive) { @@ -470,6 +473,8 @@ namespace Tango.PPC.Jobs.ViewModels } } + + /// <summary> /// Saves the job. /// </summary> @@ -551,6 +556,22 @@ namespace Tango.PPC.Jobs.ViewModels #endregion + #region RML Changed + + protected virtual async void OnRmlChanged(object sender, Rml rml) + { + TwineCatalogItems = await _db.ColorCatalogs.Where(x => x.RmlGuid == rml.Guid && x.ColorSpace.Code == (int)BL.Enumerations.ColorSpaces.Twine).OrderBy(x => x.Name).ToListAsync(); + + //Replace all brush stops color catalogs. + foreach (var stop in Job.Segments.SelectMany(x => x.BrushStops).Where(x => x.ColorCatalog != null && x.BrushColorSpace == BL.Enumerations.ColorSpaces.Twine).ToList()) + { + var replacement = TwineCatalogItems.SingleOrDefault(x => x.Name == stop.ColorCatalog.Name); + stop.ColorCatalog = replacement; + } + } + + #endregion + #region Segments Management /// <summary> @@ -741,7 +762,7 @@ namespace Tango.PPC.Jobs.ViewModels if (catalogItem != null) { - stop.ColorCatalog = TwineCatalogItems.SingleOrDefault(x => x.Guid == catalogItem.Entity.Guid); + stop.ColorCatalog = TwineCatalogItems.SingleOrDefault(x => x.Name == catalogItem.Entity.Name); } } |
