From 417b9159f79d8060d3b0056903c0a4907fa877cb Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Wed, 20 Jan 2021 01:12:24 +0200 Subject: Light Inks Display Improvements. --- .../Modules/Tango.MachineStudio.Developer/Views/JobView.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml index 395809c6f..e6c138c17 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml @@ -793,7 +793,7 @@ - + MEDIA LIQUIDS ( Max Nanolitter/CM ) -- cgit v1.3.1 From fcf28c7922843f8db94978de934e1e4195a5048a Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Fri, 22 Jan 2021 02:14:40 +0200 Subject: Color Conversion added specific "UseLightInks" flag. --- .../ViewModels/MainViewVM.cs | 6 +++--- .../Tango.ColorConversion/DefaultColorConverter.cs | 24 +++++++++++----------- .../Tango.ColorConversion/IColorConverter.cs | 12 +++++------ .../Tango.Integration/Operation/MachineOperator.cs | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index 4cc41e5a7..47a94a58d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -901,7 +901,7 @@ namespace Tango.MachineStudio.Developer.ViewModels { try { - var output = _converter.Convert(stop, false); + var output = _converter.Convert(stop, false, true); output.ApplyOnBrushStopLiquidVolumes(stop, SelectedProcessParametersTable); stop.OutOfGamutChecked = true; } @@ -940,7 +940,7 @@ namespace Tango.MachineStudio.Developer.ViewModels _hiveOpened = true; try { - HiveSuggestions = _converter.Convert(SelectedBrushStop, true).CreateHiveSuggestions(); + HiveSuggestions = _converter.Convert(SelectedBrushStop, true, true).CreateHiveSuggestions(); } catch (Exception ex) { @@ -981,7 +981,7 @@ namespace Tango.MachineStudio.Developer.ViewModels if (!_color_changed_from_hive && _hiveOpened) { SelectedBrushStop.Corrected = false; - HiveSuggestions = _converter.Convert(SelectedBrushStop, true).CreateHiveSuggestions(); + HiveSuggestions = _converter.Convert(SelectedBrushStop, true, true).CreateHiveSuggestions(); } } diff --git a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs index efa198577..51cac0ef1 100644 --- a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs +++ b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs @@ -65,7 +65,7 @@ namespace Tango.ColorConversion return output; } - public ConversionOutput Convert(BrushStop stop, Configuration configuration, Rml rml, bool generateHive, bool lightInksInstalled) + public ConversionOutput Convert(BrushStop stop, Configuration configuration, Rml rml, bool generateHive, bool lightInksInstalled, bool useLightInks = false) { if (stop == null) { @@ -131,7 +131,7 @@ namespace Tango.ColorConversion var settings = SettingsManager.Default.GetOrCreate(); - conversionInput.UseLightInks = rml.UseLightInks && lightInksInstalled && settings.UseLightInks; + conversionInput.UseLightInks = rml.UseLightInks && lightInksInstalled && useLightInks && settings.UseLightInks; conversionInput.ForwardData = ByteString.CopyFrom(rml.Cct.Data); @@ -178,7 +178,7 @@ namespace Tango.ColorConversion return Convert(conversionInput, rml.ColorConversionVersion); } - public ConversionOutput Convert(BrushStop stop, bool generateHive) + public ConversionOutput Convert(BrushStop stop, bool generateHive, bool useLightInks = false) { if (stop == null) { @@ -195,10 +195,10 @@ namespace Tango.ColorConversion throw new ArgumentNullException("The specified brush stop is associated with a job that is not a part of any machine or the machine does not have any configuration."); } - return Convert(stop, stop.Segment.Job.Machine.Configuration, stop.Segment.Job.Rml, generateHive, stop.Segment.Job.Machine.LightInksInstalled); + return Convert(stop, stop.Segment.Job.Machine.Configuration, stop.Segment.Job.Rml, generateHive, stop.Segment.Job.Machine.LightInksInstalled, useLightInks); } - public ConversionOutput Convert(Job job, Color color, bool generateHive) + public ConversionOutput Convert(Job job, Color color, bool generateHive, bool useLightInks = false) { if (job == null) { @@ -222,7 +222,7 @@ namespace Tango.ColorConversion }; stop.Color = color; - return Convert(stop, job.Machine.Configuration, job.Rml, generateHive, job.Machine.LightInksInstalled); + return Convert(stop, job.Machine.Configuration, job.Rml, generateHive, job.Machine.LightInksInstalled, useLightInks); } public bool IsOutOfGamut(BrushStop stop) @@ -324,27 +324,27 @@ namespace Tango.ColorConversion return processParameters; } - public Task ConvertAsync(BrushStop stop, Configuration configuration, Rml rml, bool generateHive, bool lightInksInstalled) + public Task ConvertAsync(BrushStop stop, Configuration configuration, Rml rml, bool generateHive, bool lightInksInstalled, bool useLightInks = false) { return Task.Factory.StartNew(() => { - return Convert(stop, configuration, rml, generateHive, lightInksInstalled); + return Convert(stop, configuration, rml, generateHive, lightInksInstalled, useLightInks); }); } - public Task ConvertAsync(BrushStop stop, bool generateHive) + public Task ConvertAsync(BrushStop stop, bool generateHive, bool useLightInks = false) { return Task.Factory.StartNew(() => { - return Convert(stop, generateHive); + return Convert(stop, generateHive, useLightInks); }); } - public Task ConvertAsync(Job job, Color color, bool generateHive) + public Task ConvertAsync(Job job, Color color, bool generateHive, bool useLightInks = false) { return Task.Factory.StartNew(() => { - return Convert(job, color, generateHive); + return Convert(job, color, generateHive, useLightInks); }); } diff --git a/Software/Visual_Studio/Tango.ColorConversion/IColorConverter.cs b/Software/Visual_Studio/Tango.ColorConversion/IColorConverter.cs index 0a8b01f80..ba69e945a 100644 --- a/Software/Visual_Studio/Tango.ColorConversion/IColorConverter.cs +++ b/Software/Visual_Studio/Tango.ColorConversion/IColorConverter.cs @@ -15,12 +15,12 @@ namespace Tango.ColorConversion public interface IColorConverter { ConversionOutput Convert(ConversionInput conversionInput, int version); - ConversionOutput Convert(BrushStop stop, Configuration configuration, Rml rml, bool generateHive, bool lightInksInstalled); - ConversionOutput Convert(BrushStop stop, bool generateHive); - ConversionOutput Convert(Job job, Color color, bool generateHive); - Task ConvertAsync(BrushStop stop, Configuration configuration, Rml rml, bool generateHive, bool lightInksInstalled); - Task ConvertAsync(BrushStop stop, bool generateHive); - Task ConvertAsync(Job job, Color color, bool generateHive); + ConversionOutput Convert(BrushStop stop, Configuration configuration, Rml rml, bool generateHive, bool lightInksInstalled, bool useLightInks = false); + ConversionOutput Convert(BrushStop stop, bool generateHive, bool useLightInks = false); + ConversionOutput Convert(Job job, Color color, bool generateHive, bool useLightInks = false); + Task ConvertAsync(BrushStop stop, Configuration configuration, Rml rml, bool generateHive, bool lightInksInstalled, bool useLightInks = false); + Task ConvertAsync(BrushStop stop, bool generateHive, bool useLightInks = false); + Task ConvertAsync(Job job, Color color, bool generateHive, bool useLightInks = false); bool IsOutOfGamut(BrushStop stop); ProcessParametersTable GetRecommendedProcessParameters(Job job); ProcessParametersTable GetRecommendedProcessParameters(Job job, ProcessParametersTablesGroup group); diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index 653c3279a..7117e0c94 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -2454,7 +2454,7 @@ namespace Tango.Integration.Operation //{ if (stop.BrushColorSpace == ColorSpaces.RGB || stop.BrushColorSpace == ColorSpaces.LAB) { - var output = converter.Convert(stop, false); + var output = converter.Convert(stop, false, true); //TODO: Restore this when Mirta conversion is working as expected. //if (suggestions.OutOfGamut) -- cgit v1.3.1