diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-07-23 18:54:57 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-07-23 18:54:57 +0300 |
| commit | 5c5cb4094035c88e0e8f3a403d29c6bc16b52bb5 (patch) | |
| tree | a20476d7c33604717c2beb519b00d50434145215 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML | |
| parent | cf49f9b7af8cb4ad0376157d27ef208eca6d1304 (diff) | |
| parent | 3dfe3c3923411953cf0568c925d6d778b61b2db7 (diff) | |
| download | Tango-5c5cb4094035c88e0e8f3a403d29c6bc16b52bb5.tar.gz Tango-5c5cb4094035c88e0e8f3a403d29c6bc16b52bb5.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML')
2 files changed, 2 insertions, 2 deletions
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"/> |