Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software

1 files changed, 24 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 4e4a0edc3..1d45b8c12 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
@@ -232,6 +232,26 @@ namespace Tango.MachineStudio.RML.ViewModels
             set { _BPoints = value; }
         }
 
+        private double _linearizationXMaxValue;
+
+        public double LinearizationXMaxValue
+        {
+            get { return _linearizationXMaxValue; }
+            set { _linearizationXMaxValue = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+        private double _linearizationYMaxValue;
+
+        public double LinearizationYMaxValue
+        {
+            get { return _linearizationYMaxValue; }
+            set { _linearizationYMaxValue = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
 
         #endregion
 
@@ -257,6 +277,7 @@ namespace Tango.MachineStudio.RML.ViewModels
             LPoints = new List<DataPoint>();
             APoints = new List<DataPoint>();
             BPoints = new List<DataPoint>();
+            LinearizationXMaxValue = LinearizationYMaxValue = 100;
         }
 
         public void Loading()
@@ -463,7 +484,9 @@ namespace Tango.MachineStudio.RML.ViewModels
             {
                 LinearizationPoints.Add(new DataPoint(nw.Item1.InkPercentage, nw.Item2));
             }
-           
+            LinearizationXMaxValue = Math.Max( 100, LinearizationPoints.Max(x => x.X));
+            LinearizationYMaxValue = Math.Max(100, LinearizationPoints.Max(x => x.Y));
+
             LinearizationPlotControl.InvalidatePlot(true);
         }