From 274c76530dc20060832dd0e274851f5c5f3af6f2 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Thu, 26 Nov 2020 14:07:57 +0200
Subject: Set Max X axis in graph 100 or by input max value.

Related Work Items: #4153
---
 .../ViewModels/ColorCalibrationViewVM.cs            | 21 +++++++++++++++++++++
 .../Views/ColorCalibrationView.xaml                 |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

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

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>
-- 
cgit v1.3.1