From 15a3a16275590dec76658cffd0fb1f9be540798c Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Mon, 22 Mar 2021 18:06:50 +0200 Subject: Fixed issue in RML module => Color Conversion => RGB/LAB final display. --- .../Tango.MachineStudio.RML/ViewModels/RgbVM.cs | 35 +++++++++++++--------- 1 file changed, 21 insertions(+), 14 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/RgbVM.cs') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/RgbVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/RgbVM.cs index e8b8cbe86..f06a91f90 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/RgbVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/RgbVM.cs @@ -17,8 +17,12 @@ namespace Tango.MachineStudio.RML.ViewModels public event EventHandler ColorChanged; + public bool SynchronizeColorSpaces { get; set; } + public RgbVM() { + SynchronizeColorSpaces = true; + _color_change_timer = new DispatcherTimer(); _color_change_timer.Interval = TimeSpan.FromMilliseconds(30); _color_change_timer.Tick += _color_change_timer_Tick; @@ -94,21 +98,24 @@ namespace Tango.MachineStudio.RML.ViewModels { _color_change_timer.Stop(); - if (!IsLab) - { - Rgb rgb = new Rgb(Red, Green, Blue); - Lab lab = rgb.To(); - _l = lab.L; - _a = lab.A; - _b = lab.B; - } - else + if (SynchronizeColorSpaces) { - Lab lab = new Lab(L, A, B); - Rgb rgb = lab.To(); - _red = (int)rgb.R; - _green = (int)rgb.G; - _blue = (int)rgb.B; + if (!IsLab) + { + Rgb rgb = new Rgb(Red, Green, Blue); + Lab lab = rgb.To(); + _l = lab.L; + _a = lab.A; + _b = lab.B; + } + else + { + Lab lab = new Lab(L, A, B); + Rgb rgb = lab.To(); + _red = (int)rgb.R; + _green = (int)rgb.G; + _blue = (int)rgb.B; + } } _color = Color.FromRgb((byte)Red, (byte)Green, (byte)Blue); -- cgit v1.3.1