diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-01-20 14:09:20 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-01-20 14:09:20 +0200 |
| commit | 4029a2148e82dd34c20057d33ab70f09cb6dce16 (patch) | |
| tree | 3f4473593b7711152ebb2a2b61ad3e390750992c /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML | |
| parent | 62baeff056ab56c376becd665b1bd5691573e8d5 (diff) | |
| parent | 274c76530dc20060832dd0e274851f5c5f3af6f2 (diff) | |
| download | Tango-4029a2148e82dd34c20057d33ab70f09cb6dce16.tar.gz Tango-4029a2148e82dd34c20057d33ab70f09cb6dce16.zip | |
Merged Vica High Volumes Calibration Branch.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML')
2 files changed, 22 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs index f04eccd90..4e4a0edc3 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs @@ -178,6 +178,20 @@ namespace Tango.MachineStudio.RML.ViewModels set { _LabMaxVal = value; RaisePropertyChangedAuto(); } } + private int _maxLABPlotX; + /// <summary> + /// Gets or sets the maximum lab plot X values for LinearizationGraph left part + /// </summary> + public int MaxLABPlotX + { + get { return _maxLABPlotX; } + set + { + _maxLABPlotX = value; + RaisePropertyChangedAuto(); + } + } + public Plot LABLinearizationPlotControl { get; set; } public Plot LinearizationPlotControl { get; set; } private IList<DataPoint> _linearizationPoints; @@ -407,6 +421,7 @@ namespace Tango.MachineStudio.RML.ViewModels APoints.Clear(); BPoints.Clear(); LabMinVal = LabMaxVal = 0; + MaxLABPlotX = 100; LABLinearizationPlotControl.InvalidatePlot(true); List<ColorLinearizationModel.LinearizationDataItem> items; @@ -433,6 +448,12 @@ namespace Tango.MachineStudio.RML.ViewModels APoints.Add(new DataPoint(labItem.InkPercentage, labItem.A)); BPoints.Add(new DataPoint(labItem.InkPercentage, labItem.B)); } + int maxValue = (int)(items.Max(x => x.InkPercentage)); + if(maxValue >100) + { + MaxLABPlotX = maxValue; + } + LABLinearizationPlotControl.InvalidatePlot(true); if (outputPoints == null || outputPoints.Count != items.Count) 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 116500f80..d0c2af490 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 @@ -174,7 +174,7 @@ <oxy:LineSeries ItemsSource="{Binding BPoints}" Color="#73B6EC" Title="B" StrokeThickness="1.5"/> </oxy:Plot.Series> <oxy:Plot.Axes> - <oxy:LinearAxis Position="Bottom" Title = "Ink%" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" AxisTitleDistance ="12" Minimum="0" Maximum="100" /> + <oxy:LinearAxis Position="Bottom" Title = "Ink%" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" AxisTitleDistance ="12" Minimum="0" Maximum="{Binding MaxLABPlotX}" /> <oxy:LinearAxis Position="Left" Title = "LAB" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" Minimum="{Binding LabMinVal}" Maximum="{Binding LabMaxVal}" MinorStep="10" /> </oxy:Plot.Axes> </oxy:Plot> |