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

1 files changed, 15 insertions, 15 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorShadeView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorShadeView.xaml
index b9341d0de..c08e9c800 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorShadeView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/ColorShadeView.xaml
@@ -117,8 +117,8 @@
                         </Button>
                     </DockPanel>
                     <Grid  DockPanel.Dock="Bottom" Margin="0 0 0 0">
-                        <DataGrid  Margin="10" BorderBrush="Silver" BorderThickness="1" RowHeight="30" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="True" CanUserDeleteRows="True" ItemsSource="{Binding SelectedTab.RmlExtensionColorShadesTest.RmlExtensionColorShadesTestsData}" IsReadOnly="False" 
-                                  ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" MinHeight="700">
+                        <DataGrid x:Name="colorDataGrid"  Margin="10" BorderBrush="Silver" BorderThickness="1" RowHeight="30" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="True" CanUserDeleteRows="True" ItemsSource="{Binding SelectedTab.RmlExtensionColorShadesTest.RmlExtensionColorShadesTestsData}" IsReadOnly="False" 
+                                  ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" MinHeight="700" >
                             <DataGrid.ColumnHeaderStyle >
                                 <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
                                     <Setter Property="FontSize" Value="16"/>
@@ -140,7 +140,7 @@
                                 </Style>
                             </DataGrid.CellStyle>
                             <DataGrid.Columns>
-                                <DataGridTextColumn Header="Number" Binding="{Binding ColorNum}" Width="80" />
+                                <DataGridTextColumn Header="Number" Binding="{Binding ColorNum,Delay=10}" Width="80"  SortDirection="Ascending"/>
                                 <DataGridTemplateColumn Header="Shade" Width="200">
                                     <DataGridTemplateColumn.CellTemplate>
                                         <DataTemplate>
@@ -149,36 +149,36 @@
                                     </DataGridTemplateColumn.CellTemplate>
                                 </DataGridTemplateColumn>
 
-                                <DataGridTextColumn Header="L" Binding="{Binding L, UpdateSourceTrigger=PropertyChanged}" Width="1*" />
-                                <DataGridTextColumn Header="A" Binding="{Binding A, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="1*"/>
-                                <DataGridTextColumn Header="B" Binding="{Binding B, UpdateSourceTrigger=PropertyChanged}" Width="1*"/>
-                                <DataGridTextColumn Header="C" Binding="{Binding C, UpdateSourceTrigger=PropertyChanged}" Width="1*" />
-                                <DataGridTextColumn Header="M" Binding="{Binding M, UpdateSourceTrigger=PropertyChanged}" Width="1*"/>
-                                <DataGridTextColumn Header="Y" Binding="{Binding Y, UpdateSourceTrigger=PropertyChanged}" Width="1*"/>
-                                <DataGridTextColumn Header="K" Binding="{Binding K, UpdateSourceTrigger=PropertyChanged}" Width="1*" />
-                                <DataGridTextColumn Header="TI" Binding="{Binding TI, UpdateSourceTrigger=PropertyChanged}" Width="1*"/>
-                                <DataGridTextColumn Header="L" Binding="{Binding LRes, UpdateSourceTrigger=PropertyChanged}" Width="1*">
+                                <DataGridTextColumn Header="L" Binding="{Binding L, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" Width="1*" />
+                                    <DataGridTextColumn Header="A" Binding="{Binding A, StringFormat={}{0:F2}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged }" Width="1*"/>
+                                <DataGridTextColumn Header="B" Binding="{Binding B, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" Width="1*"/>
+                                <DataGridTextColumn Header="C" Binding="{Binding C, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" Width="1*" />
+                                <DataGridTextColumn Header="M" Binding="{Binding M, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" Width="1*"/>
+                                <DataGridTextColumn Header="Y" Binding="{Binding Y, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" Width="1*"/>
+                                <DataGridTextColumn Header="K" Binding="{Binding K, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" Width="1*" />
+                                <!--<DataGridTextColumn Header="TI" Binding="{Binding TI, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" Width="1*"/>-->
+                                <DataGridTextColumn Header="L" Binding="{Binding LRes, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}" Width="1*">
                                     <DataGridTextColumn.CellStyle>
                                         <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                                             <Setter Property="Background" Value="LightCyan" />
                                         </Style>
                                     </DataGridTextColumn.CellStyle>
                                 </DataGridTextColumn>
-                                <DataGridTextColumn Header="A" Binding="{Binding ARes}" Width="1*" >
+                                <DataGridTextColumn Header="A" Binding="{Binding ARes, StringFormat={}{0:F2}}" Width="1*" >
                                     <DataGridTextColumn.CellStyle>
                                         <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                                             <Setter Property="Background" Value="LightCyan" />
                                         </Style>
                                     </DataGridTextColumn.CellStyle>
                                 </DataGridTextColumn>
-                                <DataGridTextColumn Header="B" Binding="{Binding BRes}" Width="1*">
+                                <DataGridTextColumn Header="B" Binding="{Binding BRes, StringFormat={}{0:F2}}" Width="1*">
                                     <DataGridTextColumn.CellStyle>
                                         <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                                             <Setter Property="Background" Value="LightCyan" />
                                         </Style>
                                     </DataGridTextColumn.CellStyle>
                                 </DataGridTextColumn>
-                                <DataGridTextColumn Header="Delta E" Binding="{Binding DeltaE}" Width="1*">
+                                <DataGridTextColumn Header="Delta E" Binding="{Binding DeltaE, StringFormat={}{0:F2}}" Width="1*">
                                     <DataGridTextColumn.CellStyle>
                                         <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                                             <Setter Property="Background" Value="LightCyan" />