RML module and Machine designer lists performance improvements !

1 files changed, 14 insertions, 14 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
index fd05ee28e..3dfcc687d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
@@ -16,13 +16,15 @@
     <UserControl.Resources>
         <converters:DateTimeUTCToShortDateTimeConverter x:Key="DateTimeUTCToShortDateTimeConverter" />
         <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter>
+        <converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter" />
+        <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
     </UserControl.Resources>
 
     <Grid IsEnabled="{Binding IsFree}">
-        <DockPanel Margin="100 100 100 50" MaxWidth="1200">
+        <DockPanel Margin="100 50 100 50" MaxWidth="1500">
             <Grid DockPanel.Dock="Top">
                 <Image Source="../Images/threads.png" Width="300" Margin="10" />
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 10 30">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="0 0 10 30">
                     <materialDesign:PackIcon Kind="Magnify" Width="26" Height="26"/>
                     <TextBox Width="300" materialDesign:HintAssist.Hint="Search by name" Text="{Binding RMLFilter,UpdateSourceTrigger=PropertyChanged,Delay=500}"></TextBox>
                 </StackPanel>
@@ -78,40 +80,38 @@
                 </StackPanel>
             </Grid>
             <Grid>
-                <DataGrid Margin="0 0 0 10" BorderBrush="Silver" IsReadOnly="True" BorderThickness="1" RowHeight="60" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}">
+                <DataGrid Margin="0 0 0 10" BorderBrush="Silver" IsReadOnly="True" BorderThickness="1" SelectionUnit="FullRow" RowHeight="60" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" HorizontalScrollBarVisibility="Disabled">
                     <DataGrid.CellStyle>
                         <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                             <Setter Property="BorderThickness" Value="0"/>
                             <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
                             <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
-                            <Setter Property="Padding" Value="4"></Setter>
-                            <Setter Property="Margin" Value="0 5 0 0"></Setter>
                         </Style>
                     </DataGrid.CellStyle>
                     <DataGrid.Columns>
-                        <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="140"/>
-                        <DataGridTextColumn Header="MANUFACTURER" Binding="{Binding Manufacturer}" Width="Auto" />
-                        <DataGridTextColumn Header="MATERIAL" Binding="{Binding MediaMaterial.Name}" Width="Auto" />
-                        <DataGridTextColumn Header="PURPOSE" Binding="{Binding MediaPurpose.Name}" Width="Auto" />
-                        <DataGridTextColumn Header="CCT" Binding="{Binding Cct.FileName}" Width="110" />
-                        <DataGridTextColumn Header="CCT VER" Binding="{Binding ColorConversionVersion}" Width="70" />
+                        <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="200"/>
+                        <DataGridTextColumn Header="HEAD" Binding="{Binding HeadType}" Width="Auto" />
+                        <DataGridTextColumn Header="BTSR" Binding="{Binding Btsr}" Width="Auto" />
+                        <DataGridTextColumn Header="CCT" Binding="{Binding CCT}" Width="Auto" />
+                        <DataGridTextColumn Header="CL GR" Binding="{Binding UseGradients,Converter={StaticResource BooleanToYesNoConverter}}" Width="Auto" />
+                        <DataGridTextColumn Header="LIGHT INKS" Binding="{Binding UseLightInks,Converter={StaticResource BooleanToYesNoConverter}}" Width="Auto" />
                         <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="Auto" />
                         <DataGridTemplateColumn Header="LIQUID FACTORS" Width="1*">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
-                                    <ItemsControl ItemsSource="{Binding LiquidTypesRmls}" Margin="0 -5 0 0">
+                                    <ItemsControl ItemsSource="{Binding LiquidTypes}" Margin="0 -5 0 0">
                                         <ItemsControl.ItemsPanel>
                                             <ItemsPanelTemplate>
                                                 <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
                                             </ItemsPanelTemplate>
                                         </ItemsControl.ItemsPanel>
                                         <ItemsControl.ItemTemplate>
-                                            <DataTemplate DataType="{x:Type observables:LiquidTypesRml}">
+                                            <DataTemplate>
                                                 <Grid Width="35" Height="32" Margin="10 0 0 0">
                                                     <shapes:Hexagon StrokeThickness="1" Stroke="Gray">
                                                         <shapes:Hexagon.Fill>
                                                             <LinearGradientBrush Opacity="0.7" >
-                                                                <GradientStop Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
+                                                                <GradientStop Color="{Binding Converter={StaticResource ColorToIntegerConverter}}"/>
                                                                 <GradientStop Color="White" Offset="1"/>
                                                             </LinearGradientBrush>
                                                         </shapes:Hexagon.Fill>