From 439029c0228ec639013502d4094361f80f836c5d Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Wed, 18 Sep 2019 12:07:19 +0300 Subject: Dropped dependencies of ColorLab module. Implemented ColorConversion view and view model. Refactored Machine Designer "Color Calibration" Tab. --- .../Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs | 3 --- .../MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/RgbVM.cs | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels') 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 2624c9b7d..735f75ab0 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 @@ -174,9 +174,6 @@ namespace Tango.MachineStudio.RML.ViewModels public ColorConversionViewVM(INotificationProvider notification) { _notification = notification; - - // CCT = new Cct(); - SourceColor = new RgbVM(); SourceColor.ColorChanged += SourceColor_ColorChanged; } 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 e64592aae..18e6d4fca 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 @@ -24,7 +24,7 @@ namespace Tango.MachineStudio.RML.ViewModels _color_change_timer.Tick += _color_change_timer_Tick; _color_change_timer.Stop(); - Color = Colors.DimGray; + _color = Colors.DimGray; } private void _color_change_timer_Tick(object sender, EventArgs e) -- cgit v1.3.1