diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-03-16 14:53:45 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-03-16 14:53:45 +0200 |
| commit | 3bc7ddaf3b52eeae095e82e062156dde37e4805b (patch) | |
| tree | f02fc8aefc5559eb273e346eef6aab3d8c592f62 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics | |
| parent | e13899b90debdde8eceeea76c21a18ccc915d36c (diff) | |
| download | Tango-3bc7ddaf3b52eeae095e82e062156dde37e4805b.tar.gz Tango-3bc7ddaf3b52eeae095e82e062156dde37e4805b.zip | |
Minor changes on ms statistics ui.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics')
2 files changed, 8 insertions, 8 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs index 287e09009..eab4eecde 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs @@ -135,9 +135,9 @@ namespace Tango.MachineStudio.Statistics.Models ThreadConsumptionPerThreadCollection = new CompositeCollection(); _pieColors = new List<Color>(); - _pieColors.Add(((SolidColorBrush)Application.Current.Resources["RedBrush100"]).Color); - _pieColors.Add(((SolidColorBrush)Application.Current.Resources["OrangeBrush300"]).Color); - _pieColors.Add(((SolidColorBrush)Application.Current.Resources["GreenBrush300"]).Color); + _pieColors.Add(((SolidColorBrush)Application.Current.Resources["RedBrush500"]).Color); + _pieColors.Add(((SolidColorBrush)Application.Current.Resources["OrangeBrush"]).Color); + _pieColors.Add(((SolidColorBrush)Application.Current.Resources["GreenBrush"]).Color); _pieColors.Add(((SolidColorBrush)Application.Current.Resources["BlueBrush100"]).Color); _pieColors.Add(Color.FromRgb(100, 184, 236));//blue 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 057647858..ecc846903 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 @@ -537,7 +537,7 @@ <TextBlock Margin="10" Text="{Binding SelectedJobName}"></TextBlock> </StackPanel> </Border> - <Border Grid.Row="2" Margin="20, 0, 0, 20" Height="200" BorderBrush="{StaticResource borderBrush}" Background="{StaticResource TransparentBackgroundBrush}" BorderThickness="1"> + <Border Grid.Row="2" Margin="20, 0, 0, 20" Height="200" BorderBrush="{StaticResource borderBrush}" Background="{StaticResource TransparentBackgroundBrush}" BorderThickness="1"> <Grid > <Grid.ColumnDefinitions> <ColumnDefinition Width="*"/> @@ -547,11 +547,11 @@ <ColumnDefinition Width="*"/> </Grid.ColumnDefinitions> <Border Grid.Column="0" BorderBrush="{StaticResource borderBrush}" Padding="5" BorderThickness="1" CornerRadius="5" Margin="10"> - <StackPanel Orientation="Vertical"> + <StackPanel Orientation="Vertical" Margin="5"> <ItemsControl ItemsSource="{Binding StatisticsValueCollection.StatisticsCollection}"> <ItemsControl.ItemTemplate> <DataTemplate> - <StackPanel Orientation="Horizontal"> + <StackPanel Orientation="Horizontal" Margin="0 3"> <TextBlock Text="{Binding Name}" FontWeight="SemiBold"/> <TextBlock Text=": "/> <TextBlock Text="{Binding Value, StringFormat={}{0:0.00}}"/> @@ -560,7 +560,7 @@ </DataTemplate> </ItemsControl.ItemTemplate> </ItemsControl> - <TextBlock Margin="0 10 0 0" Text="Total Thread Consumption per thread:" FontWeight="SemiBold"> + <TextBlock Visibility="Collapsed" Margin="0 10 0 0" Text="Total Thread Consumption per thread:" FontWeight="SemiBold"> <TextBlock.Style> <Style TargetType="TextBlock"> <Setter Property="Visibility" Value="Visible" /> @@ -572,7 +572,7 @@ </Style> </TextBlock.Style> </TextBlock> - <ItemsControl ItemsSource="{Binding StatisticsValueCollection.ThreadConsumptionPerThreadCollection}"> + <ItemsControl Visibility="Collapsed" ItemsSource="{Binding StatisticsValueCollection.ThreadConsumptionPerThreadCollection}"> <ItemsControl.ItemsPanel> <ItemsPanelTemplate> <UniformGrid Rows="3" /> |