RealTimeGraph, added property to set angle horizontal axis label.

5 files changed, 27 insertions, 3 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>
diff --git a/Software/Visual_Studio/SideChains/RealTimeGraphX-master/RealTimeGraphX.WPF/Themes/Generic.xaml b/Software/Visual_Studio/SideChains/RealTimeGraphX-master/RealTimeGraphX.WPF/Themes/Generic.xaml
index 64145bcfa..88d22f9e2 100644
--- a/Software/Visual_Studio/SideChains/RealTimeGraphX-master/RealTimeGraphX.WPF/Themes/Generic.xaml
+++ b/Software/Visual_Studio/SideChains/RealTimeGraphX-master/RealTimeGraphX.WPF/Themes/Generic.xaml
@@ -85,7 +85,7 @@
                                 </Rectangle>
                                 <TextBlock VerticalAlignment="Bottom" Text="{Binding DisplayText}" RenderTransformOrigin="0.5,0.5">
                                     <TextBlock.RenderTransform>
-                                        <RotateTransform Angle="-30" />
+                                        <RotateTransform Angle="{Binding RelativeSource={RelativeSource AncestorType=local:WpfGraphAxisControl}, Path=AxisLabelAngle}" />
                                     </TextBlock.RenderTransform>
                                 </TextBlock>
                             </DockPanel>
diff --git a/Software/Visual_Studio/SideChains/RealTimeGraphX-master/RealTimeGraphX.WPF/WpfGraphAxisControl.cs b/Software/Visual_Studio/SideChains/RealTimeGraphX-master/RealTimeGraphX.WPF/WpfGraphAxisControl.cs
index aa738b203..e445d29b9 100644
--- a/Software/Visual_Studio/SideChains/RealTimeGraphX-master/RealTimeGraphX.WPF/WpfGraphAxisControl.cs
+++ b/Software/Visual_Studio/SideChains/RealTimeGraphX-master/RealTimeGraphX.WPF/WpfGraphAxisControl.cs
@@ -46,6 +46,20 @@ namespace RealTimeGraphX.WPF
         public static readonly DependencyProperty OrientationProperty =
             DependencyProperty.Register("Orientation", typeof(Orientation), typeof(WpfGraphAxisControl), new PropertyMetadata(Orientation.Vertical));
 
+
+
+        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(WpfGraphAxisControl), new PropertyMetadata(-30.0));
+
+
+
         /// <summary>
         /// Gets or sets the tick item template.
         /// </summary>