From e2bf9f578c3ed53d869744f94b020048ca806c6e Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 8 Jan 2019 14:27:21 +0200 Subject: 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. --- .../Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs | 9 --------- 1 file changed, 9 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs index f8966b729..57c1aa724 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs @@ -42,13 +42,6 @@ namespace Tango.MachineStudio.RML.ViewModels set { _materials = value; RaisePropertyChangedAuto(); } } - private ObservableCollection _colors; - public ObservableCollection Colors - { - get { return _colors; } - set { _colors = value; RaisePropertyChangedAuto(); } - } - private ObservableCollection _purposes; public ObservableCollection Purposes { @@ -265,7 +258,6 @@ namespace Tango.MachineStudio.RML.ViewModels private void LoadRmlProperties() { Materials = _active_context.MediaMaterials.ToObservableCollection(); - Colors = _active_context.MediaColors.ToObservableCollection(); Purposes = _active_context.MediaPurposes.ToObservableCollection(); Conditions = _active_context.MediaConditions.ToObservableCollection(); LinearMassDensityUnits = _active_context.LinearMassDensityUnits.ToObservableCollection(); @@ -303,7 +295,6 @@ namespace Tango.MachineStudio.RML.ViewModels rml.Manufacturer = "Twine"; rml.Code = Rmls.Max(x => x.Code) + 1; rml.MediaMaterial = Materials.FirstOrDefault(); - rml.MediaColor = Colors.FirstOrDefault(); rml.MediaPurpose = Purposes.FirstOrDefault(); rml.MediaCondition = Conditions.FirstOrDefault(); rml.LinearMassDensityUnit = LinearMassDensityUnits.FirstOrDefault(); -- cgit v1.3.1