diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions')
2 files changed, 59 insertions, 4 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs index b33ead70a..fc07a5903 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs @@ -33,6 +33,12 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels { public class MainViewVM : StudioViewModel<IMainView> { + public enum MachineTestResultsTabs + { + ColorParameters, + TestResults + } + private INotificationProvider _notification; private IAuthenticationProvider _authentication; private IActionLogManager _actionLogManager; @@ -286,6 +292,21 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels } + private MachineTestResultsTabs PreviosSelectedTab { get; set; } + + private MachineTestResultsTabs _selectedTab; + + public MachineTestResultsTabs SelectedTab + { + get { return _selectedTab; } + set { + PreviosSelectedTab = _selectedTab; + _selectedTab = value; + OnSelectedMachineTestResultsTabChanged(); + RaisePropertyChangedAuto(); + } + } + #endregion #region commands @@ -298,8 +319,11 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels private async void BackToThreadExtensionViews(object obj) { - View.NavigateTo(RMLExtensionNavigationView.RMLExtensionsView); - await LoadRmlExtentions(); + if (_notification.ShowQuestion("Are you sure you want to exit the RML without saving changes?")) + { + View.NavigateTo(RMLExtensionNavigationView.RMLExtensionsView); + await LoadRmlExtentions(); + } } public RelayCommand AddManufacturerItemCommand { get; set; } @@ -1102,6 +1126,10 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels { ColorParametersVewVM.SelectedMachineGUID = SelectedMachine.Guid; } + if(TestResultsViewVM != null) + { + TestResultsViewVM.SelectedMachineGUID = SelectedMachine.Guid; + } } #endregion @@ -1148,5 +1176,30 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels } #endregion + + #region selections + + private void OnSelectedMachineTestResultsTabChanged() + { + if(SelectedTab == MachineTestResultsTabs.ColorParameters) + { + //if(PreviosSelectedTab == MachineTestResultsTabs.TestResults && TestResultsViewVM != null) + //{ + // TestResultsViewVM.Save(); + //} + //save + //if (_notification.ShowQuestion("Are you sure you want to exit this page without saving changes?")) + + } + else if(SelectedTab == MachineTestResultsTabs.TestResults) + { + //if (PreviosSelectedTab == MachineTestResultsTabs.ColorParameters && ColorParametersVewVM != null) + //{ + // ColorParametersVewVM.Save(); + //} + } + } + + #endregion } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml index 27bffbebb..bfb8a58d0 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml @@ -11,12 +11,14 @@ xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:global="clr-namespace:Tango.MachineStudio.ThreadExtensions" + xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="1200" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}"> <UserControl.Resources> <autoCompleteMachine:MachinesProvider x:Key="MachinesProvider" /> + <converters:EnumToIntConverter x:Key="EnumToIntConverter" /> </UserControl.Resources> <Grid> @@ -41,7 +43,7 @@ </controls:SearchComboBox> </StackPanel> <Grid IsEnabled="{Binding IsFree}" Margin="0 30 20 10" > - <TabControl Background="Transparent" Margin="0,-50,0,0" x:Name="processTabControl" Padding="0 25 0 0" > + <TabControl Background="Transparent" Margin="0,-50,0,0" x:Name="processTabControl" Padding="0 25 0 0" SelectedIndex="{Binding SelectedTab,Mode=TwoWay,Converter={StaticResource EnumToIntConverter}}"> <TabControl.Resources> <Style TargetType="TabPanel"> <Setter Property="HorizontalAlignment" Value="Center"/> @@ -53,7 +55,7 @@ <TabItem Header="COLOR PARAMETERS" Margin="20 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20"> <local:ColorParametersView/> </TabItem> - <TabItem Header="TEST RESULTS" Margin="20 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20"> + <TabItem Header="TEST RESULTS" Margin="20 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20" > <local:TestResultsView /> </TabItem> </TabControl> |