From d9600b7013eaf652e65b54f85618c75b5d0e0066 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy.mail.net@gmail.com>
Date: Sun, 22 Aug 2021 13:15:32 +0300
Subject: Machine_Studio_v4.7.0

---
 .../MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/MachineStudio')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 73bbd1b03..25d3f14e1 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("4.6.1.0")]
+[assembly: AssemblyVersion("4.7.0.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
-- 
cgit v1.3.1


From e8f482f7802624caf526b619d922dcb59be27e63 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Thu, 30 Sep 2021 14:23:41 +0300
Subject: MS.  Set Max and Min values to Linearization graph in both directions
 according to data.

---
 .../ViewModels/ColorCalibrationViewVM.cs           | 25 +++++++++++++++++++++-
 .../Views/ColorCalibrationView.xaml                |  4 ++--
 2 files changed, 26 insertions(+), 3 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio')

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);
         }
 
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 d0c2af490..01119b3e1 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
@@ -186,8 +186,8 @@
                                             <oxy:LineSeries ItemsSource="{Binding LinearizationPoints}"  Color="#73B6EC" MarkerFill="SteelBlue" MarkerType="Circle"/>
                                         </oxy:Plot.Series>
                                         <oxy:Plot.Axes>
-                                            <oxy:LinearAxis Position="Bottom"  Title = "In Ink" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" Minimum="0" Maximum="100"/>
-                                            <oxy:LinearAxis Position="Left"  Title = "Out Ink" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" Minimum="0" Maximum="100"/>
+                                            <oxy:LinearAxis Position="Bottom"  Title = "In Ink" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" Minimum="0" Maximum="{Binding LinearizationXMaxValue}"/>
+                                            <oxy:LinearAxis Position="Left"  Title = "Out Ink" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" Minimum="0" Maximum="{Binding LinearizationYMaxValue}"/>
                                         </oxy:Plot.Axes>
                                     </oxy:Plot>
                                 </Border>
-- 
cgit v1.3.1