From 85597e05c8e3d5bd8662e89885b6fec27cbf0fc7 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Thu, 13 Jan 2022 14:40:35 +0200 Subject: #5821 Save all changes in DB and loading data. --- .../Views/ColorCalibrationView.xaml | 2 +- .../Views/ColorCalibrationView.xaml.cs | 68 +++++++++++----------- 2 files changed, 35 insertions(+), 35 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorCalibrationView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorCalibrationView.xaml index 278d58d02..407ad2e9f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorCalibrationView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorCalibrationView.xaml @@ -175,7 +175,7 @@ - + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorCalibrationView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorCalibrationView.xaml.cs index 06bd67231..84219c093 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorCalibrationView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorCalibrationView.xaml.cs @@ -26,30 +26,8 @@ namespace Tango.MachineStudio.ThreadExtensions.Views public ColorCalibrationView() { InitializeComponent(); - //this.Loaded += ColorCalibrationView_Loaded; } - - //private void ColorCalibrationView_Loaded(object sender, RoutedEventArgs e) - //{ - // if (contentGrid != null && contentGrid.DataContext is ColorCalibrationViewVM) - // { - // ColorCalibrationViewVM vm = (ColorCalibrationViewVM)contentGrid.DataContext; - // DataTemplate myDataTemplate = cyanChartsContent.ContentTemplate; - - - // vm.CyanPlot.DataPlotControl = (Plot)cyanChartsContent.ContentTemplate.FindName("LABDataPlot", cyanChartsContent); - // vm.CyanPlot.LinearizationPlotControl = (Plot)cyanChartsContent.ContentTemplate.FindName("LinearizationPlot", cyanChartsContent); - // vm.MagentaPlot.DataPlotControl = (Plot)magentaChartsContent.ContentTemplate.FindName("LABDataPlot", cyanChartsContent); - // vm.MagentaPlot.LinearizationPlotControl = (Plot)magentaChartsContent.ContentTemplate.FindName("LinearizationPlot", cyanChartsContent); - // vm.YellowPlot.DataPlotControl = (Plot)yellowChartsContent.ContentTemplate.FindName("LABDataPlot", cyanChartsContent); - // vm.YellowPlot.LinearizationPlotControl = (Plot)yellowChartsContent.ContentTemplate.FindName("LinearizationPlot", cyanChartsContent); - // vm.BlackPlot.DataPlotControl = (Plot)blackChartsContent.ContentTemplate.FindName("LABDataPlot", cyanChartsContent); - // vm.BlackPlot.LinearizationPlotControl = (Plot)blackChartsContent.ContentTemplate.FindName("LinearizationPlot", cyanChartsContent); - - // vm.IsViewLoaded = true; - // } - //} - + private void ContentGrid_Loaded(object sender, RoutedEventArgs e) { var grid = (UIElement)sender; @@ -57,21 +35,43 @@ namespace Tango.MachineStudio.ThreadExtensions.Views { ColorCalibrationViewVM vm = (ColorCalibrationViewVM)((UniformGrid)grid).DataContext; ColorCalibrationTabVM selectedTab = vm.SelectedTab; - // var Plot = (cyanChartsContent as FrameworkElement).FindChild("LABDataPlot"); - if (selectedTab != null) + if (selectedTab != null && !selectedTab.IsTabLoaded) { - selectedTab.CyanPlot.DataPlotControl = (cyanChartsContent as FrameworkElement).FindChild("LABDataPlot"); - selectedTab.CyanPlot.LinearizationPlotControl = (cyanChartsContent as FrameworkElement).FindChild("LinearizationPlot"); - selectedTab.MagentaPlot.DataPlotControl = (magentaChartsContent as FrameworkElement).FindChild("LABDataPlot"); - selectedTab.MagentaPlot.LinearizationPlotControl = (magentaChartsContent as FrameworkElement).FindChild("LinearizationPlot"); - selectedTab.YellowPlot.DataPlotControl = (yellowChartsContent as FrameworkElement).FindChild("LABDataPlot"); - selectedTab.YellowPlot.LinearizationPlotControl = (yellowChartsContent as FrameworkElement).FindChild("LinearizationPlot"); - selectedTab.BlackPlot.DataPlotControl = (blackChartsContent as FrameworkElement).FindChild("LABDataPlot"); - selectedTab.BlackPlot.LinearizationPlotControl = (blackChartsContent as FrameworkElement).FindChild("LinearizationPlot"); - + InitPlots(selectedTab); vm.IsViewLoaded = true; } } } + + private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e) + { + var listBox = (UIElement)sender; + if (listBox != null && ((ListBox)listBox).DataContext is ColorCalibrationViewVM) + { + ColorCalibrationViewVM vm = (ColorCalibrationViewVM)((ListBox)listBox).DataContext; + ColorCalibrationTabVM selectedTab = vm.SelectedTab; + InitPlots(selectedTab); + } + } + + private void InitPlots(ColorCalibrationTabVM selectedTab) + { + if (selectedTab != null && !selectedTab.IsTabLoaded) + { + if (null == (cyanChartsContent as FrameworkElement).FindChild("LABDataPlot")) + return; + selectedTab.CyanPlot.DataPlotControl = (cyanChartsContent as FrameworkElement).FindChild("LABDataPlot"); + selectedTab.CyanPlot.LinearizationPlotControl = (cyanChartsContent as FrameworkElement).FindChild("LinearizationPlot"); + selectedTab.MagentaPlot.DataPlotControl = (magentaChartsContent as FrameworkElement).FindChild("LABDataPlot"); + selectedTab.MagentaPlot.LinearizationPlotControl = (magentaChartsContent as FrameworkElement).FindChild("LinearizationPlot"); + selectedTab.YellowPlot.DataPlotControl = (yellowChartsContent as FrameworkElement).FindChild("LABDataPlot"); + selectedTab.YellowPlot.LinearizationPlotControl = (yellowChartsContent as FrameworkElement).FindChild("LinearizationPlot"); + selectedTab.BlackPlot.DataPlotControl = (blackChartsContent as FrameworkElement).FindChild("LABDataPlot"); + selectedTab.BlackPlot.LinearizationPlotControl = (blackChartsContent as FrameworkElement).FindChild("LinearizationPlot"); + + selectedTab.InitData(); + selectedTab.IsTabLoaded = true; + } + } } } -- cgit v1.3.1