diff options
| author | Roy <Roy.mail.net@gmail.com> | 2023-07-16 12:04:04 +0300 |
|---|---|---|
| committer | Roy <Roy.mail.net@gmail.com> | 2023-07-16 12:04:04 +0300 |
| commit | a353bf2a5fae2eb8d81c342a5c5dce0e3de2b086 (patch) | |
| tree | 3d2bb5fbeb57240cc6f4239ebf6400d120510b83 /Software/Visual_Studio/PPC/Tango.PPC.UI | |
| parent | e7c258f93782a5ddc1ba2b228b5a72bb06d0d001 (diff) | |
| parent | 754be25c42cd16c3bd478373fec20b6b3b53620a (diff) | |
| download | Tango-a353bf2a5fae2eb8d81c342a5c5dce0e3de2b086.tar.gz Tango-a353bf2a5fae2eb8d81c342a5c5dce0e3de2b086.zip | |
Merge branch 'eureka' of https://twinetfs.visualstudio.com/Tango/_git/Tango into eureka
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')
3 files changed, 12 insertions, 2 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Graphs/RealTimeGraph.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Graphs/RealTimeGraph.cs index 303b18892..7e653f351 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Graphs/RealTimeGraph.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Graphs/RealTimeGraph.cs @@ -106,6 +106,16 @@ namespace Tango.PPC.UI.Graphs public static readonly DependencyProperty HorizontalAxisVisibilityProperty = DependencyProperty.Register("HorizontalAxisVisibility", typeof(Visibility), typeof(RealTimeGraph), new PropertyMetadata(Visibility.Visible)); + public double AxisLabelAngle + { + get { return (double)GetValue(AxisLabelAngleProperty); } + set { SetValue(AxisLabelAngleProperty, value); } + } + + // Using a DependencyProperty as the backing store for AxisLabelAngle. This enables animation, styling, binding, etc... + public static readonly DependencyProperty AxisLabelAngleProperty = + DependencyProperty.Register("AxisLabelAngle", typeof(double), typeof(RealTimeGraph), new PropertyMetadata(-30.0)); + public Visibility VerticalAxisVisibility { get { return (Visibility)GetValue(VerticalAxisVisibilityProperty); } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Graphs/RealTimeGraph.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Graphs/RealTimeGraph.xaml index 8844f9627..6d50c4969 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Graphs/RealTimeGraph.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Graphs/RealTimeGraph.xaml @@ -84,7 +84,7 @@ </Grid> <realTimeGraphX:WpfGraphAxisControl Width="30" Visibility="{TemplateBinding VerticalAxisVisibility}" Orientation="Vertical" Controller="{TemplateBinding Controller}" StringFormat="{TemplateBinding StringFormat}" Ticks="{TemplateBinding VerticalTicks}" /> - <realTimeGraphX:WpfGraphAxisControl Height="38" Visibility="{TemplateBinding HorizontalAxisVisibility}" Orientation="Horizontal" Controller="{TemplateBinding Controller}" Grid.Column="1" Grid.Row="1" Ticks="{TemplateBinding HorizontalTicks}" StringFormat="hh\:mm"/> + <realTimeGraphX:WpfGraphAxisControl Height="38" Visibility="{TemplateBinding HorizontalAxisVisibility}" Orientation="Horizontal" Controller="{TemplateBinding Controller}" Grid.Column="1" Grid.Row="1" Ticks="{TemplateBinding HorizontalTicks}" StringFormat="hh\:mm" AxisLabelAngle="{TemplateBinding AxisLabelAngle}"/> </Grid> </Border> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml index 4dec7d481..5f5612fb6 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml @@ -1263,7 +1263,7 @@ <Grid Grid.Column="2" x:Name="StatGrid" Margin="0,30,0.4,0"> <Grid Visibility="{Binding SelectedStatisticTab,Converter={StaticResource StatisticTabToVisibilityConverter},ConverterParameter='Productiondata'}"> <graphs:RealTimeGraph Style="{StaticResource PPC_RealTimeGraph_Flat}" Controller="{Binding JobController}" Background="Transparent" StringFormat="0" GridLinesBrush="{StaticResource Tango_RealTimeGraph_ForegroundBrush}" BorderBrush="Transparent" - VerticalAxisVisibility="Visible" HorizontalAxisVisibility="Visible" VerticalTicks =" 5"/> + VerticalAxisVisibility="Visible" HorizontalAxisVisibility="Visible" VerticalTicks =" 5" AxisLabelAngle="0.0"/> </Grid> </Grid> </Grid> |