aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2021-10-12 17:11:01 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2021-10-12 17:11:01 +0300
commitfb59c6dd769996977c02c83b90ce74591412de75 (patch)
treec0b87decde0bd5d62a975f81d4b2a8f21fcde199 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml
parentd2a95e54a3ae4fb7ff8b29bd85bb221cf3769a1f (diff)
downloadTango-fb59c6dd769996977c02c83b90ce74591412de75.tar.gz
Tango-fb59c6dd769996977c02c83b90ce74591412de75.zip
1). Save results om selected machine. 2). Notification about save RML on back from selected RML.
Related Work Items: #5768
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml6
1 files changed, 4 insertions, 2 deletions
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>