diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-03-16 14:36:17 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-03-16 14:36:17 +0200 |
| commit | e13899b90debdde8eceeea76c21a18ccc915d36c (patch) | |
| tree | ebaa38019453d061720de57338069e5f5b49a59a /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml | |
| parent | adabe4e1b99bc57f0381fb0a5bb3192ac0fdff18 (diff) | |
| parent | 1e563685f9c74fc7cfc204b714a1401002eba5fd (diff) | |
| download | Tango-e13899b90debdde8eceeea76c21a18ccc915d36c.tar.gz Tango-e13899b90debdde8eceeea76c21a18ccc915d36c.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml index 4790402d5..057647858 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml @@ -552,15 +552,26 @@ <ItemsControl.ItemTemplate> <DataTemplate> <StackPanel Orientation="Horizontal"> - <TextBlock Text="{Binding Name}"/> + <TextBlock Text="{Binding Name}" FontWeight="SemiBold"/> <TextBlock Text=": "/> - <TextBlock Text="{Binding Value, StringFormat={}{0:0.0}}"/> + <TextBlock Text="{Binding Value, StringFormat={}{0:0.00}}"/> <TextBlock Text="{Binding Unit}"/> </StackPanel> </DataTemplate> </ItemsControl.ItemTemplate> </ItemsControl> - <TextBlock Margin="0 10 0 0">Total Thread Consumption per thread:</TextBlock> + <TextBlock Margin="0 10 0 0" Text="Total Thread Consumption per thread:" FontWeight="SemiBold"> + <TextBlock.Style> + <Style TargetType="TextBlock"> + <Setter Property="Visibility" Value="Visible" /> + <Style.Triggers> + <DataTrigger Binding="{Binding StatisticsValueCollection.ThreadConsumptionPerThreadCollection.Count}" Value="0"> + <Setter Property="Visibility" Value="Collapsed" /> + </DataTrigger> + </Style.Triggers> + </Style> + </TextBlock.Style> + </TextBlock> <ItemsControl ItemsSource="{Binding StatisticsValueCollection.ThreadConsumptionPerThreadCollection}"> <ItemsControl.ItemsPanel> <ItemsPanelTemplate> @@ -570,7 +581,7 @@ <ItemsControl.Resources> <DataTemplate DataType="{x:Type model:StatisticsValue}"> <StackPanel Orientation="Horizontal"> - <TextBlock Text="{Binding Name}"/> + <TextBlock Text="{Binding Name}" FontWeight="SemiBold"/> <TextBlock Text=": "/> <TextBlock Text="{Binding Value, StringFormat={}{0:0.0}}"/> <TextBlock Text="{Binding Unit}"/> @@ -586,7 +597,7 @@ <ItemsControl.ItemTemplate> <DataTemplate> <StackPanel Orientation="Horizontal" Margin="2"> - <TextBlock Margin="5 0 0 0" Text="{Binding Name}"></TextBlock> + <TextBlock Margin="5 0 0 0" Text="{Binding Name}" FontWeight="SemiBold"/> <TextBlock Text=": "/> <TextBlock Text="{Binding Value, StringFormat={}{0:0.0}}"/> <TextBlock Text="{Binding Unit}"/> @@ -655,7 +666,7 @@ </Ellipse.Fill> </Ellipse> <StackPanel Orientation="Vertical" Margin="4"> - <TextBlock Text="{Binding LiquidType,Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock> + <TextBlock Text="{Binding LiquidType,Converter={StaticResource EnumToDescriptionConverter}}" FontWeight="SemiBold"></TextBlock> <TextBlock > <Run Text="{Binding Quantity, Converter={StaticResource NanoLiterToLiterFormatConverter}}"></Run> <Run Text=" liters"></Run> @@ -666,9 +677,19 @@ </ItemsControl.ItemTemplate> </ItemsControl> <TextBlock DockPanel.Dock="Bottom" Margin="4 10 0 0 "> - <Run Text="Total liquid quantities for all: "/> + <Run Text="Total liquid quantities for all: " FontWeight="SemiBold"/> <Run Text="{Binding StatisticsValueCollection.TotalLiquidQuantities, Converter={StaticResource NanoLiterToLiterFormatConverter}}"></Run> <Run Text=" liters"></Run> + <TextBlock.Style> + <Style TargetType="TextBlock"> + <Setter Property="Visibility" Value="Visible" /> + <Style.Triggers> + <DataTrigger Binding="{Binding StatisticsValueCollection.LiquidQuantities.Count}" Value="0"> + <Setter Property="Visibility" Value="Collapsed" /> + </DataTrigger> + </Style.Triggers> + </Style> + </TextBlock.Style> </TextBlock> </DockPanel> </Border> |