From 8e49a8041391c9aa946060aed2c538b1ce958a68 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 19 Sep 2019 18:29:10 +0300
Subject: Added support for multiple ColorLib versions ! Added version control
 and display in RML & Research Module. Implemented GenerateHive optimizations.

---
 .../ViewModels/ColorConversionViewVM.cs             |  9 ++++++---
 .../ViewModels/MainViewVM.cs                        | 21 +++++++++++++++++++++
 .../Tango.MachineStudio.RML/ViewModels/RgbVM.cs     |  6 +++---
 .../Tango.MachineStudio.RML/Views/RmlView.xaml      |  3 +++
 .../Tango.MachineStudio.RML/Views/RmlsView.xaml     |  2 ++
 5 files changed, 35 insertions(+), 6 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML')

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..ebbe08fae 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
@@ -19,7 +19,7 @@ using Tango.SharedUI;
 
 namespace Tango.MachineStudio.RML.ViewModels
 {
-    public class ColorConversionViewVM: ViewModel
+    public class ColorConversionViewVM : ViewModel
     {
         #region properties
 
@@ -268,7 +268,9 @@ namespace Tango.MachineStudio.RML.ViewModels
 
                     IColorConverter converter = new DefaultColorConverter();
 
-                    var output = converter.Convert(input);
+                    input.GenerateHive = true;
+
+                    var output = converter.Convert(input, RML.ColorConversionVersion);
 
                     IsOutOfGamut = output.OutOfGamut;
 
@@ -330,6 +332,7 @@ namespace Tango.MachineStudio.RML.ViewModels
                 ConversionInput input = new ConversionInput();
                 input.ColorSpace = PMR.ColorLab.ColorSpace.Volume;
                 input.ForwardData = ByteString.CopyFrom(CCT.Data);
+                input.GenerateHive = false;
 
                 input.InputCoordinates = new InputCoordinates();
                 input.ThreadL = RML.WhitePointL;
@@ -364,7 +367,7 @@ namespace Tango.MachineStudio.RML.ViewModels
 
                 IColorConverter converter = new DefaultColorConverter();
 
-                var output = converter.Convert(input);
+                var output = converter.Convert(input, RML.ColorConversionVersion);
 
                 if (SourceColor.IsLab)
                 {
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 361608ef6..c2637b527 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
@@ -208,6 +208,27 @@ namespace Tango.MachineStudio.RML.ViewModels
 
             _rmls_context = ObservablesContext.CreateDefault();
             Rmls = await new RmlsCollectionBuilder(_rmls_context).SetAll().WithLiquidFactors().WithMediaProperties().BuildAsync();
+
+            //Load CCT file names...
+            var ccts = await _rmls_context.Ccts.Select(x => new
+            {
+                x.Guid,
+                x.FileName
+            }).ToListAsync();
+
+            foreach (var rml in Rmls)
+            {
+                var cct = ccts.SingleOrDefault(x => x.Guid == rml.CctGuid);
+
+                if (cct != null)
+                {
+                    rml.Cct = new Cct()
+                    {
+                        Guid = cct.Guid,
+                        FileName = cct.FileName,
+                    };
+                }
+            }
         }
 
         private async void LoadActiveRML(String guid)
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..084a317a7 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
@@ -106,9 +106,9 @@ namespace Tango.MachineStudio.RML.ViewModels
             {
                 Lab lab = new Lab(L, A, B);
                 Rgb rgb = lab.To<Rgb>();
-                _red = rgb.R;
-                _green = rgb.G;
-                _blue = rgb.B;
+                _red = (int)rgb.R;
+                _green = (int)rgb.G;
+                _blue = (int)rgb.B;
             }
 
             _color = Color.FromRgb((byte)Red, (byte)Green, (byte)Blue);
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
index 628b9e402..f81ce804e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
@@ -179,6 +179,9 @@
                                                                     </StackPanel>
                                                                 </Button>
                                                             </UniformGrid>
+
+                                                            <TextBlock Margin="0 40 0 0" Text="Color Conversion Version:" HorizontalAlignment="Center"></TextBlock>
+                                                            <mahapps:NumericUpDown Minimum="1" Maximum="2" Value="{Binding ActiveRML.ColorConversionVersion}" HorizontalContentAlignment="Center" Background="Transparent" BorderBrush="{StaticResource DimGrayBrush}" HasDecimals="False" Margin="0 5 0 0" />
                                                         </StackPanel>
                                                     </StackPanel>
                                                 </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
index ec1e1a78a..9f09ad248 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
@@ -61,6 +61,8 @@
                         <DataGridTextColumn Header="MANUFACTURER" Binding="{Binding Manufacturer}" Width="Auto" />
                         <DataGridTextColumn Header="MATERIAL" Binding="{Binding MediaMaterial.Name}" Width="Auto" />
                         <DataGridTextColumn Header="PURPOSE" Binding="{Binding MediaPurpose.Name}" Width="Auto" />
+                        <DataGridTextColumn Header="CCT" Binding="{Binding Cct.FileName}" Width="Auto" />
+                        <DataGridTextColumn Header="CCT VER" Binding="{Binding ColorConversionVersion}" Width="70" />
                         <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="Auto" />
                         <DataGridTemplateColumn Header="LIQUID FACTORS" Width="1*">
                             <DataGridTemplateColumn.CellTemplate>
-- 
cgit v1.3.1