diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2021-09-30 14:23:41 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2021-09-30 14:23:41 +0300 |
| commit | e8f482f7802624caf526b619d922dcb59be27e63 (patch) | |
| tree | 128422d4beb6320a3cf872a0f7353047ee74e421 /Software/Visual_Studio/MachineStudio/Modules | |
| parent | 46c6b9854e9355b45739bf6d0bc23a47583d6b01 (diff) | |
| download | Tango-e8f482f7802624caf526b619d922dcb59be27e63.tar.gz Tango-e8f482f7802624caf526b619d922dcb59be27e63.zip | |
MS. Set Max and Min values to Linearization graph in both directions according to data.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules')
2 files changed, 26 insertions, 3 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> |