From f18636711f5cdf36f561dfe4da93335a08000877 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Thu, 23 Jul 2020 16:34:59 +0300
Subject: Color Calibration. Change order items in input Ink file of
 linearization.

---
 .../Modules/Tango.MachineStudio.RML/Models/ColorLinearizationModel.cs   | 2 +-
 .../Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/ColorLinearizationModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/ColorLinearizationModel.cs
index 8a24a9702..53e15f976 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/ColorLinearizationModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/ColorLinearizationModel.cs
@@ -11,10 +11,10 @@ namespace Tango.MachineStudio.RML.Models
     {
         public class LinearizationDataItem
         {
+            public double InkPercentage { get; set; }
             public double L { get; set; }
             public double A { get; set; }
             public double B { get; set; }
-            public int InkPercentage { get; set; }
         }
 
         public ColorLinearizationModel()
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml
index 291d335de..b9077d365 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml
@@ -103,7 +103,7 @@
                                 <oxy:Plot Title="{Binding LiquidTypeName}" x:Name="CalibrationPlot" Margin="0 0 10 0" Background="Transparent">
                                     <oxy:Plot.Series >
                                         <oxy:LineSeries ItemsSource="{Binding Points}"  Color="#73B6EC" MarkerFill="SteelBlue"  MarkerType="Circle" />
-                                        <oxy:LineSeries ItemsSource="{Binding TargetPoints}"  Color="#E14141"   MarkerFill="#E14141"  MarkerType="Circle" />
+                                        <oxy:LineSeries ItemsSource="{Binding TargetPoints}"  Color="#E14141"     />
                                     </oxy:Plot.Series>
                                     <oxy:Plot.Axes>
                                         <oxy:LinearAxis Position="Bottom"  Title = "nl/cm" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True"/>
-- 
cgit v1.3.1