diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels')
2 files changed, 5 insertions, 37 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs index be7dc3a67..b9e2ebf5d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs @@ -248,12 +248,6 @@ namespace Tango.MachineStudio.RML.ViewModels input.UseLubricantTransform = RML.UseLubricantTransform; input.VMax = RML.VMax; - input.SetPredictionType(RML.PredictionType); - input.SetPredictionMethod(RML.PredictionMethod); - input.CMYKVHueThreshhold = RML.CmykvHueThreshold; - input.CMYKVK = RML.KNearestK; - input.SimpleRGBPreviewFactor = RML.SimpleRgbPreviewFactor; - //Validate calibration data foreach (var vm in LiquidsCalibrationData.Where(x => x.LiquidType.HasPigment)) { @@ -288,6 +282,8 @@ namespace Tango.MachineStudio.RML.ViewModels inputLiquid.LiquidType = (PMR.ColorLab.LiquidType)vm.LiquidType.Code; inputLiquid.MaxNanoliterPerCentimeter = LiquidTypesRmls.SingleOrDefault(x => x.LiquidType.Code == vm.LiquidType.Code).MaxNlPerCm; + inputLiquid.IsExtraInk = vm.LiquidType.IsExtraInk; + inputLiquid.Color = vm.LiquidType.Color; input.InputCoordinates.InputLiquids.Add(inputLiquid); } @@ -393,12 +389,6 @@ namespace Tango.MachineStudio.RML.ViewModels input.UseLubricantTransform = RML.UseLubricantTransform; input.VMax = RML.VMax; - input.SetPredictionType(RML.PredictionType); - input.SetPredictionMethod(RML.PredictionMethod); - input.CMYKVHueThreshhold = RML.CmykvHueThreshold; - input.CMYKVK = RML.KNearestK; - input.SimpleRGBPreviewFactor = RML.SimpleRgbPreviewFactor; - foreach (var vm in LiquidsCalibrationData.Where(x => x.LiquidType.HasPigment)) { InputLiquid inputLiquid = new InputLiquid(); @@ -412,6 +402,8 @@ namespace Tango.MachineStudio.RML.ViewModels inputLiquid.LiquidType = (PMR.ColorLab.LiquidType)vm.LiquidType.Code; inputLiquid.MaxNanoliterPerCentimeter = LiquidTypesRmls.SingleOrDefault(x => x.LiquidType.Code == vm.LiquidType.Code).MaxNlPerCm; inputLiquid.Volume = LiquidVolumes.SingleOrDefault(x => x.LiquidType == vm.LiquidType).Volume; + inputLiquid.IsExtraInk = vm.LiquidType.IsExtraInk; + inputLiquid.Color = vm.LiquidType.Color; input.InputCoordinates.InputLiquids.Add(inputLiquid); } 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 db0d7e2aa..0962cd4d1 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 @@ -350,31 +350,7 @@ namespace Tango.MachineStudio.RML.ViewModels public override async void OnApplicationReady() { - using (_notification.PushTaskItem("Loading color measurements...")) - { - using (var db = ObservablesContext.CreateDefault()) - { - var measurements = await db.ColorMeasurements.ToListAsync(); - - List<PMR.ColorLab.ColorMeasurement> pmrMeasurements = new List<PMR.ColorLab.ColorMeasurement>(); - foreach (var m in measurements) - { - pmrMeasurements.Add(new PMR.ColorLab.ColorMeasurement() - { - C = m.C, - M = m.M, - Y = m.Y, - K = m.K, - V = m.V, - L = m.L, - A = m.A, - B = m.B, - }); - } - - DefaultColorConverter.SetMeasurements(pmrMeasurements); - } - } + } private async Task LoadRmls() |