diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-10-06 04:14:12 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-10-06 04:14:12 +0300 |
| commit | d2a95e54a3ae4fb7ff8b29bd85bb221cf3769a1f (patch) | |
| tree | 980fec7240cde4884bf689d1ec9f443f2b097613 /Software/Visual_Studio/MachineStudio | |
| parent | c719c53ebb4d27e7f45c71f65588b2c5b7e75f86 (diff) | |
| parent | 0efcffe3bfcd8a561a1dbca7ce01db3115d98440 (diff) | |
| download | Tango-d2a95e54a3ae4fb7ff8b29bd85bb221cf3769a1f.tar.gz Tango-d2a95e54a3ae4fb7ff8b29bd85bb221cf3769a1f.zip | |
Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software
Diffstat (limited to 'Software/Visual_Studio/MachineStudio')
3 files changed, 27 insertions, 4 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); } 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> 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 |