Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 46 insertions, 30 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 861a639d3..3bda86036 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -753,13 +753,19 @@
                                                                 <StackPanel>
                                                                     <TextBlock>MEDIA</TextBlock>
                                                                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
-                                                                        <ComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" Style="{StaticResource TransparentComboBoxStyle}">
+                                                                        <ComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" Style="{StaticResource TransparentComboBoxStyle}" HorizontalContentAlignment="Stretch">
                                                                             <ComboBox.ItemTemplate>
                                                                                 <DataTemplate>
-                                                                                    <StackPanel>
-                                                                                        <TextBlock Text="{Binding Name}" FontWeight="Bold" FontStyle="Italic"></TextBlock>
-                                                                                        <TextBlock FontSize="11" Text="{Binding Manufacturer}" Foreground="Gray"></TextBlock>
-                                                                                    </StackPanel>
+                                                                                    <DockPanel>
+                                                                                        <StackPanel DockPanel.Dock="Left">
+                                                                                            <TextBlock Text="{Binding Name}" FontWeight="Bold" FontStyle="Italic"></TextBlock>
+                                                                                            <TextBlock FontSize="11" Text="{Binding Manufacturer}" Foreground="Gray"></TextBlock>
+                                                                                        </StackPanel>
+                                                                                        <TextBlock Margin="20 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Right">
+                                                                                            <Run Foreground="Gray">v:</Run>
+                                                                                            <Run FontWeight="Bold" Text="{Binding ColorConversionVersion,Mode=OneWay}"></Run>
+                                                                                        </TextBlock>
+                                                                                    </DockPanel>
                                                                                 </DataTemplate>
                                                                             </ComboBox.ItemTemplate>
                                                                         </ComboBox>
@@ -1425,20 +1431,15 @@
 
                                                 </DockPanel>
                                             </Border>
-                                            <ListBox ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled" Background="Transparent" BorderThickness="0" Style="{x:Null}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding RmlProcessParametersTableGroup.ProcessParametersTables}" SelectedItem="{Binding SelectedProcessParametersTable}" IsEnabled="{Binding RmlProcessParametersTableGroup.Active}">
+                                            <ListBox ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled" Background="Transparent" BorderThickness="0" Style="{x:Null}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding RmlProcessParametersTableGroup.ProcessParametersTables}" SelectedItem="{Binding SelectedProcessParametersTable}">
                                                 <ListBox.ItemContainerStyle>
                                                     <Style TargetType="ListBoxItem" BasedOn="{StaticResource basicListBoxItem}">
 
                                                     </Style>
                                                 </ListBox.ItemContainerStyle>
-                                                <!--<ListBox.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <WrapPanel IsItemsHost="True"></WrapPanel>
-                                            </ItemsPanelTemplate>
-                                        </ListBox.ItemsPanel>-->
                                                 <ListBox.ItemTemplate>
                                                     <DataTemplate DataType="{x:Type observables:ProcessParametersTable}">
-                                                        <Border Padding="5" CornerRadius="5" BorderThickness="1" Margin="5">
+                                                        <Border Padding="5" CornerRadius="5" BorderThickness="1" Margin="5" IsEnabled="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.RmlProcessParametersTableGroup.Active}">
                                                             <Border.Style>
                                                                 <Style TargetType="Border">
                                                                     <Setter Property="BorderBrush" Value="{StaticResource borderBrush}"></Setter>
@@ -1450,6 +1451,11 @@
                                                                             <Setter Property="Background" Value="{StaticResource TransparentBackgroundBrush300}"></Setter>
                                                                             <Setter Property="Opacity" Value="1"></Setter>
                                                                         </DataTrigger>
+                                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.AutoProcessSelection}" Value="True">
+                                                                            <Setter Property="BorderBrush" Value="{StaticResource AccentColorBrush}"></Setter>
+                                                                            <Setter Property="Background" Value="Transparent"></Setter>
+                                                                            <Setter Property="Opacity" Value="1"></Setter>
+                                                                        </DataTrigger>
                                                                     </Style.Triggers>
                                                                 </Style>
                                                             </Border.Style>
@@ -1520,7 +1526,8 @@
                                                                         </WrapPanel>
                                                                     </DockPanel>
 
-                                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="5" Visibility="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                                    <Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="5">
+                                                                    <StackPanel Orientation="Horizontal" Visibility="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected,Converter={StaticResource BooleanToVisibilityConverter}}">
                                                                         <TextBlock Text="Active" FontWeight="Bold" FontStyle="Italic" FontSize="13" VerticalAlignment="Center"></TextBlock>
                                                                         <materialDesign:PackIcon Foreground="{StaticResource GreenBrush400}" Kind="CheckboxBlankCircle" VerticalAlignment="Center" Margin="5 0 0 0">
                                                                             <materialDesign:PackIcon.Style>
@@ -1553,6 +1560,7 @@
                                                                             </materialDesign:PackIcon.Style>
                                                                         </materialDesign:PackIcon>
                                                                     </StackPanel>
+                                                                    </Grid>
                                                                 </StackPanel>
                                                             </Grid>
                                                         </Border>
@@ -1560,24 +1568,32 @@
                                                 </ListBox.ItemTemplate>
                                             </ListBox>
 
-                                            <StackPanel Margin="10 20" VerticalAlignment="Bottom" Orientation="Horizontal" HorizontalAlignment="Right">
-                                                <Button Height="40" Width="105" Command="{Binding ResetProcessParametersCommand}" Background="Transparent" BorderBrush="{StaticResource DarkGrayBrush200}" Foreground="{StaticResource DarkGrayBrush200}" Margin="0 2 10 0" ToolTip="Resets the current process parameters in the embedded device">
-                                                    <TextBlock TextWrapping="Wrap" TextAlignment="Center">
+                                            <StackPanel Margin="10 10" VerticalAlignment="Bottom">
+
+                                                <StackPanel Orientation="Horizontal">
+                                                    <ToggleButton IsChecked="{Binding AutoProcessSelection}" />
+                                                    <TextBlock Margin="5 0 0 0">Use Recommended Process Parameters (auto)</TextBlock>
+                                                </StackPanel>
+
+                                                <StackPanel Margin="0 40 0 0" Orientation="Horizontal" HorizontalAlignment="Right">
+                                                    <Button Height="40" Width="105" Command="{Binding ResetProcessParametersCommand}" Background="Transparent" BorderBrush="{StaticResource DarkGrayBrush200}" Foreground="{StaticResource DarkGrayBrush200}" Margin="0 2 10 0" ToolTip="Resets the current process parameters in the embedded device">
+                                                        <TextBlock TextWrapping="Wrap" TextAlignment="Center">
                                                         TEMP OFF
-                                                    </TextBlock>
-                                                </Button>
-                                                <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
-                                                    <StackPanel Orientation="Horizontal">
-                                                        <materialDesign:PackIcon VerticalAlignment="Center" Kind="ContentSave"></materialDesign:PackIcon>
-                                                        <TextBlock Margin="10 0 0 0">SAVE PARAMETERS</TextBlock>
-                                                    </StackPanel>
-                                                </Button>
-                                                <Button Height="40" Margin="10 0 0 0" Command="{Binding PushProcessParametersCommand}" HorizontalAlignment="Left">
-                                                    <StackPanel Orientation="Horizontal">
-                                                        <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowRightBold"></materialDesign:PackIcon>
-                                                        <TextBlock Margin="10 0 0 0">PUSH PARAMETERS</TextBlock>
-                                                    </StackPanel>
-                                                </Button>
+                                                        </TextBlock>
+                                                    </Button>
+                                                    <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
+                                                        <StackPanel Orientation="Horizontal">
+                                                            <materialDesign:PackIcon VerticalAlignment="Center" Kind="ContentSave"></materialDesign:PackIcon>
+                                                            <TextBlock Margin="10 0 0 0">SAVE PARAMETERS</TextBlock>
+                                                        </StackPanel>
+                                                    </Button>
+                                                    <Button Height="40" Margin="10 0 0 0" Command="{Binding PushProcessParametersCommand}" HorizontalAlignment="Left">
+                                                        <StackPanel Orientation="Horizontal">
+                                                            <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowRightBold"></materialDesign:PackIcon>
+                                                            <TextBlock Margin="10 0 0 0">PUSH PARAMETERS</TextBlock>
+                                                        </StackPanel>
+                                                    </Button>
+                                                </StackPanel>
                                             </StackPanel>
                                         </StackPanel>
                                     </Grid>