Merged Vica High Volumes Calibration Branch.

1 files changed, 21 insertions, 0 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)