diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-05-12 16:55:00 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-05-12 16:55:00 +0300 |
| commit | 9199fd9b13b603ebcb094419b8e11dd73c5eae88 (patch) | |
| tree | b3680ad359d02fa9b7d52366e6e790a0682715eb /Software/Visual_Studio/PPC | |
| parent | b8358b92b56ef5c17636aec6a0cf48186528ea23 (diff) | |
| download | Tango-9199fd9b13b603ebcb094419b8e11dd73c5eae88.tar.gz Tango-9199fd9b13b603ebcb094419b8e11dd73c5eae88.zip | |
UPdated BIT definitions and UI.
Diffstat (limited to 'Software/Visual_Studio/PPC')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/BitResultsView.xaml | 20 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Images/bit.png | bin | 0 -> 1494 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj | 1 |
3 files changed, 17 insertions, 4 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/BitResultsView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/BitResultsView.xaml index 59bff14eb..a2e42ac3f 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/BitResultsView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/BitResultsView.xaml @@ -6,7 +6,7 @@ xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch" xmlns:local="clr-namespace:Tango.PPC.UI.Dialogs" mc:Ignorable="d" - Background="{StaticResource TangoPrimaryBackgroundBrush}" Width="700" Height="1000" d:DataContext="{d:DesignInstance Type=local:BitResultsViewVM, IsDesignTimeCreatable=False}"> + Background="{StaticResource TangoPrimaryBackgroundBrush}" Width="750" Height="1000" d:DataContext="{d:DesignInstance Type=local:BitResultsViewVM, IsDesignTimeCreatable=False}"> <Grid Margin="20"> <DockPanel> @@ -15,7 +15,10 @@ </Grid> <StackPanel DockPanel.Dock="Top" HorizontalAlignment="Center"> - <Image Source="../Images/machine.png" Stretch="Uniform" Width="100" RenderOptions.BitmapScalingMode="Fant" /> + <Grid Width="100"> + <Image Source="../Images/machine.png" Stretch="Uniform" RenderOptions.BitmapScalingMode="Fant" /> + <Image Source="../Images/bit.png" Stretch="None" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 -20 -5" /> + </Grid> <TextBlock VerticalAlignment="Center" Margin="0 10 0 0" FontSize="{StaticResource TangoHeaderFontSize}">Machine BIT Results</TextBlock> </StackPanel> @@ -90,8 +93,17 @@ </DataTemplate> </DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn> - <DataGridTextColumn Header="Test" Width="250" Binding="{Binding BitType.Name}" /> - <DataGridTextColumn Header="Subject" Width="100" Binding="{Binding BitType.Subject}" /> + <DataGridTemplateColumn Header="Test" Width="360"> + <DataGridTemplateColumn.CellTemplate> + <DataTemplate> + <TextBlock TextTrimming="CharacterEllipsis"> + <Run>#</Run><Run Text="{Binding BitType.Code,Mode=OneWay}"></Run> + <Run Text="{Binding BitType.Description,Mode=OneWay}"></Run> + </TextBlock> + </DataTemplate> + </DataGridTemplateColumn.CellTemplate> + </DataGridTemplateColumn> + <!--<DataGridTextColumn Header="Subject" Width="100" Binding="{Binding BitType.Subject}" />--> <DataGridTextColumn Header="Description" Width="1*" Binding="{Binding BitResult.Description}" /> </DataGrid.Columns> </touch:TouchSimpleDataGrid> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/bit.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/bit.png Binary files differnew file mode 100644 index 000000000..246be3c17 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/bit.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj index fcffb0dcc..6d2c3ff44 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj @@ -484,6 +484,7 @@ <Resource Include="Images\ThreadLoading\NewThread\ReadyForLoading\arc\6.JPG" /> <Resource Include="Images\ThreadLoading\NewThread\ReadyForLoading\arc\7.jpg" /> <Resource Include="Images\ThreadLoading\NewThread\machine_full.jpg" /> + <Resource Include="Images\bit.png" /> <Content Include="Manifests\release.xml" /> <Content Include="Manifests\debug.xml" /> <None Include="firmware_package.tfp"> |
