From 08238766b0228450a79e257e7753bd09cdedda13 Mon Sep 17 00:00:00 2001
From: PhilJollans <phil@jollans.com>
Date: Sat, 20 Nov 2021 23:22:40 +0100
Subject: [PATCH 01/15] Fix configuration error

Add Debug to the <Configurations> tag.
This fixes an error message "Current solution contains incorrect configurations mappings" on opening Visual Studio.
---
 RealTimeGraphX.UWP.Demo/RealTimeGraphX.UWP.Demo.csproj | 2 +-
 RealTimeGraphX.UWP/RealTimeGraphX.UWP.csproj           | 2 +-
 RealTimeGraphX/RealTimeGraphX.csproj                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RealTimeGraphX.UWP.Demo/RealTimeGraphX.UWP.Demo.csproj b/RealTimeGraphX.UWP.Demo/RealTimeGraphX.UWP.Demo.csproj
index 35a4a01..a51fdb6 100644
--- a/RealTimeGraphX.UWP.Demo/RealTimeGraphX.UWP.Demo.csproj
+++ b/RealTimeGraphX.UWP.Demo/RealTimeGraphX.UWP.Demo.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>RealTimeGraphX.UWP.Demo</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
diff --git a/RealTimeGraphX.UWP/RealTimeGraphX.UWP.csproj b/RealTimeGraphX.UWP/RealTimeGraphX.UWP.csproj
index 65d5daa..52802ad 100644
--- a/RealTimeGraphX.UWP/RealTimeGraphX.UWP.csproj
+++ b/RealTimeGraphX.UWP/RealTimeGraphX.UWP.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>RealTimeGraphX.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
diff --git a/RealTimeGraphX/RealTimeGraphX.csproj b/RealTimeGraphX/RealTimeGraphX.csproj
index 3dc4555..672b49f 100644
--- a/RealTimeGraphX/RealTimeGraphX.csproj
+++ b/RealTimeGraphX/RealTimeGraphX.csproj
@@ -12,7 +12,7 @@
     <PackageTags>Chart;Graph;Plotting;RealTime;WPF;UWP</PackageTags>
     <Authors>Roy Ben Shabat</Authors>
     <Company>Roy Ben Shabat</Company>
-    <Configurations>Release</Configurations>
+    <Configurations>Release;Debug</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

From ea29428730b3878d988fd2825e5c08ae036e984d Mon Sep 17 00:00:00 2001
From: PhilJollans <phil@jollans.com>
Date: Sat, 20 Nov 2021 23:40:58 +0100
Subject: [PATCH 02/15] Revert "Fix configuration error"

This reverts commit 08238766b0228450a79e257e7753bd09cdedda13.
---
 RealTimeGraphX.UWP.Demo/RealTimeGraphX.UWP.Demo.csproj | 2 +-
 RealTimeGraphX.UWP/RealTimeGraphX.UWP.csproj           | 2 +-
 RealTimeGraphX/RealTimeGraphX.csproj                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RealTimeGraphX.UWP.Demo/RealTimeGraphX.UWP.Demo.csproj b/RealTimeGraphX.UWP.Demo/RealTimeGraphX.UWP.Demo.csproj
index a51fdb6..35a4a01 100644
--- a/RealTimeGraphX.UWP.Demo/RealTimeGraphX.UWP.Demo.csproj
+++ b/RealTimeGraphX.UWP.Demo/RealTimeGraphX.UWP.Demo.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>RealTimeGraphX.UWP.Demo</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17134.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
diff --git a/RealTimeGraphX.UWP/RealTimeGraphX.UWP.csproj b/RealTimeGraphX.UWP/RealTimeGraphX.UWP.csproj
index 52802ad..65d5daa 100644
--- a/RealTimeGraphX.UWP/RealTimeGraphX.UWP.csproj
+++ b/RealTimeGraphX.UWP/RealTimeGraphX.UWP.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>RealTimeGraphX.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17134.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
diff --git a/RealTimeGraphX/RealTimeGraphX.csproj b/RealTimeGraphX/RealTimeGraphX.csproj
index 672b49f..3dc4555 100644
--- a/RealTimeGraphX/RealTimeGraphX.csproj
+++ b/RealTimeGraphX/RealTimeGraphX.csproj
@@ -12,7 +12,7 @@
     <PackageTags>Chart;Graph;Plotting;RealTime;WPF;UWP</PackageTags>
     <Authors>Roy Ben Shabat</Authors>
     <Company>Roy Ben Shabat</Company>
-    <Configurations>Release;Debug</Configurations>
+    <Configurations>Release</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

From 72a71bf5ee8428dccb308f075591e4655e17f416 Mon Sep 17 00:00:00 2001
From: PhilJollans <phil@jollans.com>
Date: Sat, 20 Nov 2021 23:45:03 +0100
Subject: [PATCH 03/15] Fix configuration error

Add Debug to the <Configurations> tag.
This fixes an error message "Current solution contains incorrect configurations mappings" on opening Visual Studio.
---
 RealTimeGraphX/RealTimeGraphX.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RealTimeGraphX/RealTimeGraphX.csproj b/RealTimeGraphX/RealTimeGraphX.csproj
index 3dc4555..672b49f 100644
--- a/RealTimeGraphX/RealTimeGraphX.csproj
+++ b/RealTimeGraphX/RealTimeGraphX.csproj
@@ -12,7 +12,7 @@
     <PackageTags>Chart;Graph;Plotting;RealTime;WPF;UWP</PackageTags>
     <Authors>Roy Ben Shabat</Authors>
     <Company>Roy Ben Shabat</Company>
-    <Configurations>Release</Configurations>
+    <Configurations>Release;Debug</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

From 1294f425b47b53ecf035f1dc0579ab1ec30d5a75 Mon Sep 17 00:00:00 2001
From: PhilJollans <phil@jollans.com>
Date: Sun, 21 Nov 2021 00:13:23 +0100
Subject: [PATCH 04/15] Modify the target platform version in the two UWP
 projects.

I do not have version 10.0.17134.0 installed on my machine, so I have switched to 10.0.17763.0, which I do have installed.
This change is purely for my own convenience.
---
 RealTimeGraphX.UWP.Demo/RealTimeGraphX.UWP.Demo.csproj | 2 +-
 RealTimeGraphX.UWP/RealTimeGraphX.UWP.csproj           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RealTimeGraphX.UWP.Demo/RealTimeGraphX.UWP.Demo.csproj b/RealTimeGraphX.UWP.Demo/RealTimeGraphX.UWP.Demo.csproj
index 35a4a01..a51fdb6 100644
--- a/RealTimeGraphX.UWP.Demo/RealTimeGraphX.UWP.Demo.csproj
+++ b/RealTimeGraphX.UWP.Demo/RealTimeGraphX.UWP.Demo.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>RealTimeGraphX.UWP.Demo</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
diff --git a/RealTimeGraphX.UWP/RealTimeGraphX.UWP.csproj b/RealTimeGraphX.UWP/RealTimeGraphX.UWP.csproj
index 65d5daa..52802ad 100644
--- a/RealTimeGraphX.UWP/RealTimeGraphX.UWP.csproj
+++ b/RealTimeGraphX.UWP/RealTimeGraphX.UWP.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>RealTimeGraphX.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>

From d6a98e80e8b02b60e6f3936e580f74ce8c564d5f Mon Sep 17 00:00:00 2001
From: PhilJollans <phil@jollans.com>
Date: Sun, 21 Nov 2021 00:15:24 +0100
Subject: [PATCH 05/15] Move WpfGraphControl into the project
 RealTimeGraphX.WPF

In my opinion, the control WpfGraphControl  belongs in the core DLL RealTimeGraphX.WPF and not in the demo project.
---
 RealTimeGraphX.WPF.Demo/MainWindow.xaml       |  8 +-
 .../RealTimeGraphX.WPF.Demo.csproj            |  5 --
 RealTimeGraphX.WPF.Demo/Themes/Generic.xaml   | 55 --------------
 RealTimeGraphX.WPF.Demo/WpfGraphControl.cs    | 73 -------------------
 RealTimeGraphX.WPF/RealTimeGraphX.WPF.csproj  |  1 +
 RealTimeGraphX.WPF/Themes/Generic.xaml        | 51 ++++++++++++-
 RealTimeGraphX.WPF/WpfGraphControl.cs         | 73 +++++++++++++++++++
 7 files changed, 128 insertions(+), 138 deletions(-)
 delete mode 100644 RealTimeGraphX.WPF.Demo/Themes/Generic.xaml
 delete mode 100644 RealTimeGraphX.WPF.Demo/WpfGraphControl.cs
 create mode 100644 RealTimeGraphX.WPF/WpfGraphControl.cs

diff --git a/RealTimeGraphX.WPF.Demo/MainWindow.xaml b/RealTimeGraphX.WPF.Demo/MainWindow.xaml
index b194b28..d755543 100644
--- a/RealTimeGraphX.WPF.Demo/MainWindow.xaml
+++ b/RealTimeGraphX.WPF.Demo/MainWindow.xaml
@@ -38,7 +38,7 @@
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="200"/>
                     </Grid.ColumnDefinitions>
-                    <local:WpfGraphControl x:Name="graph" Margin="10" Controller="{Binding Controller}" />
+                    <realTimeGraphX:WpfGraphControl x:Name="graph" Margin="10" Controller="{Binding Controller}" />
 
                     <Border Grid.Column="1" Margin="10" BorderBrush="Gray" BorderThickness="1" CornerRadius="5" Padding="5">
                         <StackPanel>
@@ -80,7 +80,7 @@
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="200"/>
                     </Grid.ColumnDefinitions>
-                    <local:WpfGraphControl Margin="10" Controller="{Binding MultiController}" />
+                    <realTimeGraphX:WpfGraphControl Margin="10" Controller="{Binding MultiController}" />
 
                     <Border Grid.Column="1" Margin="10" BorderBrush="Gray" BorderThickness="1" CornerRadius="5" Padding="5">
                         <StackPanel>
@@ -139,7 +139,7 @@
                         </ListBox.ItemTemplate>
                     </ListBox>
 
-                    <local:WpfGraphControl Grid.Column="2" Margin="10" Controller="{Binding ElementName=listItems,Path=SelectedItem.Controller}" StringFormatX="{Binding ElementName=listItems,Path=SelectedItem.StringFormat}" />
+                    <realTimeGraphX:WpfGraphControl Grid.Column="2" Margin="10" Controller="{Binding ElementName=listItems,Path=SelectedItem.Controller}" StringFormatX="{Binding ElementName=listItems,Path=SelectedItem.StringFormat}" />
                 </Grid>
             </TabItem>
 
@@ -192,7 +192,7 @@
                         </ItemsControl.ItemContainerStyle>
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
-                                <local:WpfGraphControl Grid.Column="2" Margin="10" Controller="{Binding Controller}" StringFormatX="{Binding StringFormat}" />
+                                <realTimeGraphX:WpfGraphControl Grid.Column="2" Margin="10" Controller="{Binding Controller}" StringFormatX="{Binding StringFormat}" />
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
diff --git a/RealTimeGraphX.WPF.Demo/RealTimeGraphX.WPF.Demo.csproj b/RealTimeGraphX.WPF.Demo/RealTimeGraphX.WPF.Demo.csproj
index 352ea02..684db45 100644
--- a/RealTimeGraphX.WPF.Demo/RealTimeGraphX.WPF.Demo.csproj
+++ b/RealTimeGraphX.WPF.Demo/RealTimeGraphX.WPF.Demo.csproj
@@ -58,7 +58,6 @@
     </ApplicationDefinition>
     <Compile Include="Converters\ObjectEqualityConverter.cs" />
     <Compile Include="ListGraphItemVM.cs" />
-    <Compile Include="WpfGraphControl.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -71,10 +70,6 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainWindowVM.cs" />
diff --git a/RealTimeGraphX.WPF.Demo/Themes/Generic.xaml b/RealTimeGraphX.WPF.Demo/Themes/Generic.xaml
deleted file mode 100644
index 1174e5b..0000000
--- a/RealTimeGraphX.WPF.Demo/Themes/Generic.xaml
+++ /dev/null
@@ -1,55 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:realTimeGraphX="clr-namespace:RealTimeGraphX.WPF;assembly=RealTimeGraphX.WPF"
-    xmlns:local="clr-namespace:RealTimeGraphX.WPF.Demo">
-
-
-    <Style TargetType="{x:Type local:WpfGraphControl}">
-        <Setter Property="StringFormatX" Value="0.0"></Setter>
-        <Setter Property="StringFormatY" Value="hh\:mm\:ss"></Setter>
-        <Setter Property="BorderThickness" Value="1"></Setter>
-        <Setter Property="BorderBrush" Value="#FF2E2E2E"></Setter>
-        <Setter Property="Padding" Value="20 20 30 20"></Setter>
-        <Setter Property="FontSize" Value="11"></Setter>
-        <Setter Property="Foreground" Value="DodgerBlue"></Setter>
-        <Setter Property="Background">
-            <Setter.Value>
-                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0" >
-                    <GradientStop Color="Black"/>
-                    <GradientStop Color="#FF333333" Offset="1"/>
-                </LinearGradientBrush>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:WpfGraphControl}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="5"
-                            Padding="{TemplateBinding Padding}">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="1*"/>
-                                <RowDefinition Height="35"/>
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="70"/>
-                                <ColumnDefinition Width="1*"/>
-                            </Grid.ColumnDefinitions>
-
-                            <Grid Grid.Column="1">
-                                <realTimeGraphX:WpfGraphGridLines Controller="{TemplateBinding Controller}" Foreground="#FF2E2E2E" />
-                                <realTimeGraphX:WpfGraphSurface x:Name="surface" Controller="{TemplateBinding Controller}" DisplayToolTip="{TemplateBinding DisplayToolTip}" BorderThickness="1 0 0 1" BorderBrush="{TemplateBinding Foreground}" />
-                            </Grid>
-
-                            <realTimeGraphX:WpfGraphAxisControl Orientation="Vertical" Controller="{TemplateBinding Controller}" StringFormat="{TemplateBinding StringFormatX}" />
-                            <realTimeGraphX:WpfGraphAxisControl Orientation="Horizontal" Controller="{TemplateBinding Controller}" Grid.Column="1" Grid.Row="1" StringFormat="{TemplateBinding StringFormatY}"/>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
diff --git a/RealTimeGraphX.WPF.Demo/WpfGraphControl.cs b/RealTimeGraphX.WPF.Demo/WpfGraphControl.cs
deleted file mode 100644
index cbace56..0000000
--- a/RealTimeGraphX.WPF.Demo/WpfGraphControl.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace RealTimeGraphX.WPF.Demo
-{
-    public class WpfGraphControl : Control
-    {
-        /// <summary>
-        /// Gets or sets the graph controller.
-        /// </summary>
-        public IGraphController Controller
-        {
-            get { return (IGraphController)GetValue(ControllerProperty); }
-            set { SetValue(ControllerProperty, value); }
-        }
-        public static readonly DependencyProperty ControllerProperty =
-            DependencyProperty.Register("Controller", typeof(IGraphController), typeof(WpfGraphControl), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to display a tool tip with the current cursor value.
-        /// </summary>
-        public bool DisplayToolTip
-        {
-            get { return (bool)GetValue(DisplayToolTipProperty); }
-            set { SetValue(DisplayToolTipProperty, value); }
-        }
-        public static readonly DependencyProperty DisplayToolTipProperty =
-            DependencyProperty.Register("DisplayToolTip", typeof(bool), typeof(WpfGraphControl), new PropertyMetadata(false));
-
-        /// <summary>
-        /// Gets or sets the string format for the X Axis.
-        /// </summary>
-        public String StringFormatX
-        {
-            get { return (String)GetValue(StringFormatXProperty); }
-            set { SetValue(StringFormatXProperty, value); }
-        }
-        public static readonly DependencyProperty StringFormatXProperty =
-            DependencyProperty.Register("StringFormatX", typeof(String), typeof(WpfGraphControl), new PropertyMetadata("0.0"));
-
-        /// <summary>
-        /// Gets or sets the string format for the Y Axis.
-        /// </summary>
-        public String StringFormatY
-        {
-            get { return (String)GetValue(StringFormatYProperty); }
-            set { SetValue(StringFormatYProperty, value); }
-        }
-        public static readonly DependencyProperty StringFormatYProperty =
-            DependencyProperty.Register("StringFormatY", typeof(String), typeof(WpfGraphControl), new PropertyMetadata("hh\\:mm\\:ss"));
-
-
-        /// <summary>
-        /// Initializes the <see cref="WpfGraphControl"/> class.
-        /// </summary>
-        static WpfGraphControl()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(WpfGraphControl), new FrameworkPropertyMetadata(typeof(WpfGraphControl)));
-        }
-    }
-}
diff --git a/RealTimeGraphX.WPF/RealTimeGraphX.WPF.csproj b/RealTimeGraphX.WPF/RealTimeGraphX.WPF.csproj
index 6287cae..6127f07 100644
--- a/RealTimeGraphX.WPF/RealTimeGraphX.WPF.csproj
+++ b/RealTimeGraphX.WPF/RealTimeGraphX.WPF.csproj
@@ -57,6 +57,7 @@
     <Compile Include="WpfGraphAxisControl.cs" />
     <Compile Include="WpfGraphAxisPanel.cs" />
     <Compile Include="WpfGraphAxisTickData.cs" />
+    <Compile Include="WpfGraphControl.cs" />
     <Compile Include="WpfGraphGridLines.cs" />
     <Compile Include="WpfGraphComponentBase.cs" />
     <Compile Include="WpfGraphDataSeries.cs" />
diff --git a/RealTimeGraphX.WPF/Themes/Generic.xaml b/RealTimeGraphX.WPF/Themes/Generic.xaml
index a309fc0..bfecd99 100644
--- a/RealTimeGraphX.WPF/Themes/Generic.xaml
+++ b/RealTimeGraphX.WPF/Themes/Generic.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:RealTimeGraphX.WPF">
@@ -171,4 +171,53 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+  <Style TargetType="{x:Type local:WpfGraphControl}">
+    <Setter Property="StringFormatX" Value="0.0"></Setter>
+    <Setter Property="StringFormatY" Value="hh\:mm\:ss"></Setter>
+    <Setter Property="BorderThickness" Value="1"></Setter>
+    <Setter Property="BorderBrush" Value="#FF2E2E2E"></Setter>
+    <Setter Property="Padding" Value="20 20 30 20"></Setter>
+    <Setter Property="FontSize" Value="11"></Setter>
+    <Setter Property="Foreground" Value="DodgerBlue"></Setter>
+    <Setter Property="Background">
+      <Setter.Value>
+        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0" >
+          <GradientStop Color="Black"/>
+          <GradientStop Color="#FF333333" Offset="1"/>
+        </LinearGradientBrush>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:WpfGraphControl}">
+          <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="5"
+                            Padding="{TemplateBinding Padding}">
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="35"/>
+              </Grid.RowDefinitions>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="70"/>
+                <ColumnDefinition Width="1*"/>
+              </Grid.ColumnDefinitions>
+
+              <Grid Grid.Column="1">
+                <local:WpfGraphGridLines Controller="{TemplateBinding Controller}" Foreground="#FF2E2E2E" />
+                <local:WpfGraphSurface x:Name="surface" Controller="{TemplateBinding Controller}" DisplayToolTip="{TemplateBinding DisplayToolTip}" BorderThickness="1 0 0 1" BorderBrush="{TemplateBinding Foreground}" />
+              </Grid>
+
+              <local:WpfGraphAxisControl Orientation="Vertical" Controller="{TemplateBinding Controller}" StringFormat="{TemplateBinding StringFormatX}" />
+              <local:WpfGraphAxisControl Orientation="Horizontal" Controller="{TemplateBinding Controller}" Grid.Column="1" Grid.Row="1" StringFormat="{TemplateBinding StringFormatY}"/>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
 </ResourceDictionary>
diff --git a/RealTimeGraphX.WPF/WpfGraphControl.cs b/RealTimeGraphX.WPF/WpfGraphControl.cs
new file mode 100644
index 0000000..085180b
--- /dev/null
+++ b/RealTimeGraphX.WPF/WpfGraphControl.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace RealTimeGraphX.WPF
+{
+  public class WpfGraphControl : Control
+  {
+    /// <summary>
+    /// Gets or sets the graph controller.
+    /// </summary>
+    public IGraphController Controller
+    {
+      get { return (IGraphController)GetValue(ControllerProperty); }
+      set { SetValue(ControllerProperty, value); }
+    }
+    public static readonly DependencyProperty ControllerProperty =
+        DependencyProperty.Register("Controller", typeof(IGraphController), typeof(WpfGraphControl), new PropertyMetadata(null));
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to display a tool tip with the current cursor value.
+    /// </summary>
+    public bool DisplayToolTip
+    {
+      get { return (bool)GetValue(DisplayToolTipProperty); }
+      set { SetValue(DisplayToolTipProperty, value); }
+    }
+    public static readonly DependencyProperty DisplayToolTipProperty =
+        DependencyProperty.Register("DisplayToolTip", typeof(bool), typeof(WpfGraphControl), new PropertyMetadata(false));
+
+    /// <summary>
+    /// Gets or sets the string format for the X Axis.
+    /// </summary>
+    public String StringFormatX
+    {
+      get { return (String)GetValue(StringFormatXProperty); }
+      set { SetValue(StringFormatXProperty, value); }
+    }
+    public static readonly DependencyProperty StringFormatXProperty =
+        DependencyProperty.Register("StringFormatX", typeof(String), typeof(WpfGraphControl), new PropertyMetadata("0.0"));
+
+    /// <summary>
+    /// Gets or sets the string format for the Y Axis.
+    /// </summary>
+    public String StringFormatY
+    {
+      get { return (String)GetValue(StringFormatYProperty); }
+      set { SetValue(StringFormatYProperty, value); }
+    }
+    public static readonly DependencyProperty StringFormatYProperty =
+        DependencyProperty.Register("StringFormatY", typeof(String), typeof(WpfGraphControl), new PropertyMetadata("hh\\:mm\\:ss"));
+
+
+    /// <summary>
+    /// Initializes the <see cref="WpfGraphControl"/> class.
+    /// </summary>
+    static WpfGraphControl()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata(typeof(WpfGraphControl), new FrameworkPropertyMetadata(typeof(WpfGraphControl)));
+    }
+  }
+}

From 7da507cca6caa4b91f93f167bdffc70b25b78d51 Mon Sep 17 00:00:00 2001
From: PhilJollans <phil@jollans.com>
Date: Sun, 21 Nov 2021 09:27:48 +0100
Subject: [PATCH 06/15] Add properties AxisCaptionX and AxisCaptionY

Define two new properties on the WpfGraphControl:
- AxisCaptionX
- AxisCaptionY
In the control template for WpfGraphControl, define a grid column for the Y caption and a row for the X caption and show the captions using TextBlock controls.
The new column and row auto size, and collapse to zero width or height respectively if the caption is empty.
---
 RealTimeGraphX.WPF.Demo/MainWindow.xaml |  2 +-
 RealTimeGraphX.WPF/Themes/Generic.xaml  | 33 ++++++++++++++++++++++---
 RealTimeGraphX.WPF/WpfGraphControl.cs   | 22 +++++++++++++++++
 3 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/RealTimeGraphX.WPF.Demo/MainWindow.xaml b/RealTimeGraphX.WPF.Demo/MainWindow.xaml
index d755543..51ebda1 100644
--- a/RealTimeGraphX.WPF.Demo/MainWindow.xaml
+++ b/RealTimeGraphX.WPF.Demo/MainWindow.xaml
@@ -38,7 +38,7 @@
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="200"/>
                     </Grid.ColumnDefinitions>
-                    <realTimeGraphX:WpfGraphControl x:Name="graph" Margin="10" Controller="{Binding Controller}" />
+                    <realTimeGraphX:WpfGraphControl x:Name="graph" Margin="10" Controller="{Binding Controller}" AxisCaptionX="Time [s]" AxisCaptionY="Voltage [V]"/>
 
                     <Border Grid.Column="1" Margin="10" BorderBrush="Gray" BorderThickness="1" CornerRadius="5" Padding="5">
                         <StackPanel>
diff --git a/RealTimeGraphX.WPF/Themes/Generic.xaml b/RealTimeGraphX.WPF/Themes/Generic.xaml
index bfecd99..e0c1abd 100644
--- a/RealTimeGraphX.WPF/Themes/Generic.xaml
+++ b/RealTimeGraphX.WPF/Themes/Generic.xaml
@@ -3,6 +3,23 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:RealTimeGraphX.WPF">
 
+    <Style x:Key="AxisCaptionStyle" TargetType="TextBlock">
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Margin" Value="10"/>
+        <!-- These triggers hide the TextBlock if the text is empty. 
+             I have placed the captions in a grid column/row with Width/Height = "Auto", 
+             so they should collapse completely if there is no caption. -->
+        <Style.Triggers>
+            <Trigger Property="Text" Value="">
+                <Setter Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="Text" Value="{x:Null}">
+                <Setter Property="Visibility" Value="Collapsed" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
     <Style TargetType="{x:Type local:WpfGraphSurface}">
         <Setter Property="ToolTipTemplate">
             <Setter.Value>
@@ -200,19 +217,29 @@
               <Grid.RowDefinitions>
                 <RowDefinition Height="1*"/>
                 <RowDefinition Height="35"/>
+                <RowDefinition Height="Auto"/>
               </Grid.RowDefinitions>
               <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="70"/>
                 <ColumnDefinition Width="1*"/>
               </Grid.ColumnDefinitions>
 
-              <Grid Grid.Column="1">
+              <TextBlock Grid.Row="0" Grid.Column="0" Text="{TemplateBinding AxisCaptionY}" Style="{StaticResource AxisCaptionStyle}">
+                <TextBlock.LayoutTransform>
+                  <RotateTransform Angle="-90"/>
+                </TextBlock.LayoutTransform>
+              </TextBlock>
+
+              <Grid Grid.Column="2">
                 <local:WpfGraphGridLines Controller="{TemplateBinding Controller}" Foreground="#FF2E2E2E" />
                 <local:WpfGraphSurface x:Name="surface" Controller="{TemplateBinding Controller}" DisplayToolTip="{TemplateBinding DisplayToolTip}" BorderThickness="1 0 0 1" BorderBrush="{TemplateBinding Foreground}" />
               </Grid>
 
-              <local:WpfGraphAxisControl Orientation="Vertical" Controller="{TemplateBinding Controller}" StringFormat="{TemplateBinding StringFormatX}" />
-              <local:WpfGraphAxisControl Orientation="Horizontal" Controller="{TemplateBinding Controller}" Grid.Column="1" Grid.Row="1" StringFormat="{TemplateBinding StringFormatY}"/>
+              <local:WpfGraphAxisControl Orientation="Vertical" Controller="{TemplateBinding Controller}" Grid.Column="1" Grid.Row="0" StringFormat="{TemplateBinding StringFormatX}" />
+              <local:WpfGraphAxisControl Orientation="Horizontal" Controller="{TemplateBinding Controller}" Grid.Column="2" Grid.Row="1" StringFormat="{TemplateBinding StringFormatY}"/>
+              <TextBlock Grid.Column="2" Grid.Row="2" Text="{TemplateBinding AxisCaptionX}" Style="{StaticResource AxisCaptionStyle}"/>
+
             </Grid>
           </Border>
         </ControlTemplate>
diff --git a/RealTimeGraphX.WPF/WpfGraphControl.cs b/RealTimeGraphX.WPF/WpfGraphControl.cs
index 085180b..0849b1d 100644
--- a/RealTimeGraphX.WPF/WpfGraphControl.cs
+++ b/RealTimeGraphX.WPF/WpfGraphControl.cs
@@ -62,6 +62,28 @@ public String StringFormatY
         DependencyProperty.Register("StringFormatY", typeof(String), typeof(WpfGraphControl), new PropertyMetadata("hh\\:mm\\:ss"));
 
 
+    /// <summary>
+    /// Gets or sets the caption of the Y axis
+    /// </summary>
+    public String AxisCaptionY
+    {
+      get { return (String)GetValue(AxisCaptionYProperty); }
+      set { SetValue(AxisCaptionYProperty, value); }
+    }
+    public static readonly DependencyProperty AxisCaptionYProperty =
+        DependencyProperty.Register("AxisCaptionY", typeof(String), typeof(WpfGraphControl), new PropertyMetadata(null));
+
+    /// <summary>
+    /// Gets or sets the caption of the X axis
+    /// </summary>
+    public String AxisCaptionX
+    {
+      get { return (String)GetValue(AxisCaptionXProperty); }
+      set { SetValue(AxisCaptionXProperty, value); }
+    }
+    public static readonly DependencyProperty AxisCaptionXProperty =
+        DependencyProperty.Register("AxisCaptionX", typeof(String), typeof(WpfGraphControl), new PropertyMetadata(null));
+
     /// <summary>
     /// Initializes the <see cref="WpfGraphControl"/> class.
     /// </summary>

From d098991322e9c13b9d7424dc4a900e80c09b0c44 Mon Sep 17 00:00:00 2001
From: PhilJollans <phil@jollans.com>
Date: Sun, 21 Nov 2021 13:17:05 +0100
Subject: [PATCH 07/15] Add property GridLinesBrush

In WpfGraphControl
  - Define a new property GridLinesBrush
In Generic.xaml
  - Use the property GridLinesBrush to set the Foreground property on the WpfGraphGridLines control
  - Set the BorderThickness of WpfGraphSurface to 1 on all four sides, so that box has the same colour on all four sides, in particular if the GridLinesBrush property is set to a different colour.
---
 RealTimeGraphX.WPF/Themes/Generic.xaml |  8 ++++----
 RealTimeGraphX.WPF/WpfGraphControl.cs  | 11 +++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/RealTimeGraphX.WPF/Themes/Generic.xaml b/RealTimeGraphX.WPF/Themes/Generic.xaml
index e0c1abd..a2d0ff0 100644
--- a/RealTimeGraphX.WPF/Themes/Generic.xaml
+++ b/RealTimeGraphX.WPF/Themes/Generic.xaml
@@ -196,7 +196,7 @@
     <Setter Property="BorderBrush" Value="#FF2E2E2E"></Setter>
     <Setter Property="Padding" Value="20 20 30 20"></Setter>
     <Setter Property="FontSize" Value="11"></Setter>
-    <Setter Property="Foreground" Value="DodgerBlue"></Setter>
+    <!--<Setter Property="Foreground" Value="DodgerBlue"></Setter>
     <Setter Property="Background">
       <Setter.Value>
         <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0" >
@@ -204,7 +204,7 @@
           <GradientStop Color="#FF333333" Offset="1"/>
         </LinearGradientBrush>
       </Setter.Value>
-    </Setter>
+    </Setter>-->
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type local:WpfGraphControl}">
@@ -232,8 +232,8 @@
               </TextBlock>
 
               <Grid Grid.Column="2">
-                <local:WpfGraphGridLines Controller="{TemplateBinding Controller}" Foreground="#FF2E2E2E" />
-                <local:WpfGraphSurface x:Name="surface" Controller="{TemplateBinding Controller}" DisplayToolTip="{TemplateBinding DisplayToolTip}" BorderThickness="1 0 0 1" BorderBrush="{TemplateBinding Foreground}" />
+                <local:WpfGraphGridLines Controller="{TemplateBinding Controller}" Foreground="{TemplateBinding GridLinesBrush}" />
+                <local:WpfGraphSurface x:Name="surface" Controller="{TemplateBinding Controller}" DisplayToolTip="{TemplateBinding DisplayToolTip}" BorderThickness="1" BorderBrush="{TemplateBinding Foreground}" />
               </Grid>
 
               <local:WpfGraphAxisControl Orientation="Vertical" Controller="{TemplateBinding Controller}" Grid.Column="1" Grid.Row="0" StringFormat="{TemplateBinding StringFormatX}" />
diff --git a/RealTimeGraphX.WPF/WpfGraphControl.cs b/RealTimeGraphX.WPF/WpfGraphControl.cs
index 0849b1d..9e9ce73 100644
--- a/RealTimeGraphX.WPF/WpfGraphControl.cs
+++ b/RealTimeGraphX.WPF/WpfGraphControl.cs
@@ -84,6 +84,17 @@ public String AxisCaptionX
     public static readonly DependencyProperty AxisCaptionXProperty =
         DependencyProperty.Register("AxisCaptionX", typeof(String), typeof(WpfGraphControl), new PropertyMetadata(null));
 
+    /// <summary>
+    /// Gets or sets the brush used for the grid lines
+    /// </summary>
+    public Brush GridLinesBrush
+    {
+      get { return (Brush)GetValue(GridLinesBrushProperty); }
+      set { SetValue(GridLinesBrushProperty, value); }
+    }
+    public static readonly DependencyProperty GridLinesBrushProperty =
+        DependencyProperty.Register( "GridLinesBrush", typeof(Brush), typeof(WpfGraphControl), new PropertyMetadata((SolidColorBrush)new BrushConverter().ConvertFrom("#FF2E2E2E")) ) ;
+
     /// <summary>
     /// Initializes the <see cref="WpfGraphControl"/> class.
     /// </summary>

From f45ab1e0b2c5801f8b6ef59253788c6e15ce2eed Mon Sep 17 00:00:00 2001
From: PhilJollans <phil@jollans.com>
Date: Sun, 21 Nov 2021 13:28:41 +0100
Subject: [PATCH 08/15] Minor changes to WPF demo

---
 RealTimeGraphX.WPF.Demo/MainWindow.xaml | 12 +++++++++---
 RealTimeGraphX.WPF.Demo/MainWindowVM.cs |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/RealTimeGraphX.WPF.Demo/MainWindow.xaml b/RealTimeGraphX.WPF.Demo/MainWindow.xaml
index 51ebda1..022df90 100644
--- a/RealTimeGraphX.WPF.Demo/MainWindow.xaml
+++ b/RealTimeGraphX.WPF.Demo/MainWindow.xaml
@@ -38,9 +38,15 @@
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="200"/>
                     </Grid.ColumnDefinitions>
-                    <realTimeGraphX:WpfGraphControl x:Name="graph" Margin="10" Controller="{Binding Controller}" AxisCaptionX="Time [s]" AxisCaptionY="Voltage [V]"/>
-
-                    <Border Grid.Column="1" Margin="10" BorderBrush="Gray" BorderThickness="1" CornerRadius="5" Padding="5">
+          <realTimeGraphX:WpfGraphControl x:Name="graph" Margin="10" 
+                                                    Controller="{Binding Controller}" 
+                                                    AxisCaptionX="Time [s]" 
+                                                    AxisCaptionY="Voltage [V]"
+                                                    Background="White"
+                                                    Foreground="Black"
+                                                    GridLinesBrush="LightGray"/>
+
+          <Border Grid.Column="1" Margin="10" BorderBrush="Gray" BorderThickness="1" CornerRadius="5" Padding="5">
                         <StackPanel>
                             <TextBlock FontSize="10">Duration</TextBlock>
                             <TextBox Margin="0 5 0 0" Text="{Binding Controller.Range.MaximumX,Mode=TwoWay}"></TextBox>
diff --git a/RealTimeGraphX.WPF.Demo/MainWindowVM.cs b/RealTimeGraphX.WPF.Demo/MainWindowVM.cs
index 5a8a373..3ce09af 100644
--- a/RealTimeGraphX.WPF.Demo/MainWindowVM.cs
+++ b/RealTimeGraphX.WPF.Demo/MainWindowVM.cs
@@ -36,7 +36,7 @@ public MainWindowVM()
             Controller.DataSeriesCollection.Add(new WpfGraphDataSeries()
             {
                 Name = "Series",
-                Stroke = Colors.DodgerBlue,
+                Stroke = Colors.Red,
             });
 
             MultiController = new WpfGraphController<TimeSpanDataPoint, DoubleDataPoint>();

From cbde383f06713ea7b09cdd89870fa87796db68d8 Mon Sep 17 00:00:00 2001
From: Phil Jollans <JP@Messring.de>
Date: Mon, 22 Aug 2022 17:01:51 +0200
Subject: [PATCH 09/15] Add additional formatting properties

Add the properties:
 - CornerRadius
 - ShowAxisX
 - ShowAxisY
 - WidthAxisY

Swap the usage of StringFormatX and StringFormatY, which in my opinion where used incorrectly.
---
 RealTimeGraphX.WPF.Demo/MainWindow.xaml | 387 ++++++++++++------------
 RealTimeGraphX.WPF/Themes/Generic.xaml  |  53 +++-
 RealTimeGraphX.WPF/WpfGraphControl.cs   |  48 ++-
 3 files changed, 281 insertions(+), 207 deletions(-)

diff --git a/RealTimeGraphX.WPF.Demo/MainWindow.xaml b/RealTimeGraphX.WPF.Demo/MainWindow.xaml
index 022df90..69c8a8f 100644
--- a/RealTimeGraphX.WPF.Demo/MainWindow.xaml
+++ b/RealTimeGraphX.WPF.Demo/MainWindow.xaml
@@ -10,200 +10,207 @@
         mc:Ignorable="d"
         Title="RealtimeGraphX WPF Demo" Height="587" Width="1168.5" d:DataContext="{d:DesignData Type=local:MainWindowVM, IsDesignTimeCreatable=False}">
 
-    <Window.Resources>
-
-        <converters:ObjectEqualityConverter x:Key="ObjectEqualityConverter" />
-
-        <collections:ArrayList x:Key="colors">
-            <Color>DodgerBlue</Color>
-            <Color>Red</Color>
-            <Color>Green</Color>
-        </collections:ArrayList>
-
-        <collections:ArrayList x:Key="brushes">
-            <SolidColorBrush Color="Transparent"></SolidColorBrush>
-            <SolidColorBrush Color="#861E90FF"></SolidColorBrush>
-            <LinearGradientBrush>
-                <GradientStop Offset="0" Color="#86FF0000" />
-                <GradientStop Offset="1" Color="#80FFFF00" />
-            </LinearGradientBrush>
-        </collections:ArrayList>
-    </Window.Resources>
-
-    <Grid>
-        <TabControl Background="Transparent" Margin="20">
-            <TabItem Header="Single Series">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="200"/>
-                    </Grid.ColumnDefinitions>
-          <realTimeGraphX:WpfGraphControl x:Name="graph" Margin="10" 
-                                                    Controller="{Binding Controller}" 
-                                                    AxisCaptionX="Time [s]" 
-                                                    AxisCaptionY="Voltage [V]"
-                                                    Background="White"
-                                                    Foreground="Black"
-                                                    GridLinesBrush="LightGray"/>
+  <Window.Resources>
+
+    <converters:ObjectEqualityConverter x:Key="ObjectEqualityConverter" />
+
+    <collections:ArrayList x:Key="colors">
+      <Color>DodgerBlue</Color>
+      <Color>Red</Color>
+      <Color>Green</Color>
+    </collections:ArrayList>
+
+    <collections:ArrayList x:Key="brushes">
+      <SolidColorBrush Color="Transparent"></SolidColorBrush>
+      <SolidColorBrush Color="#861E90FF"></SolidColorBrush>
+      <LinearGradientBrush>
+        <GradientStop Offset="0" Color="#86FF0000" />
+        <GradientStop Offset="1" Color="#80FFFF00" />
+      </LinearGradientBrush>
+    </collections:ArrayList>
+  </Window.Resources>
+
+  <Grid>
+    <TabControl Background="Transparent" Margin="20">
+      <TabItem Header="Single Series">
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="200"/>
+          </Grid.ColumnDefinitions>
+          <realTimeGraphX:WpfGraphControl x:Name="graph" Margin="10"
+                                          Controller="{Binding Controller}"
+                                          AxisCaptionX="Time [s]"
+                                          AxisCaptionY="Voltage [V]"
+                                          Background="White"
+                                          Foreground="Black"
+                                          GridLinesBrush="LightGray"
+                                          ShowAxisX="False"
+                                          ShowAxisY="True"
+                                          CornerRadius="0"
+                                          WidthAxisY="50"
+                                          Padding="5 15"
+                                          StringFormatY="0.000"/>
 
           <Border Grid.Column="1" Margin="10" BorderBrush="Gray" BorderThickness="1" CornerRadius="5" Padding="5">
-                        <StackPanel>
-                            <TextBlock FontSize="10">Duration</TextBlock>
-                            <TextBox Margin="0 5 0 0" Text="{Binding Controller.Range.MaximumX,Mode=TwoWay}"></TextBox>
-
-                            <TextBlock FontSize="10" Margin="0 10 0 0">Refresh Rate</TextBlock>
-                            <TextBox Margin="0 5 0 0" Text="{Binding Controller.RefreshRate,Mode=TwoWay}"></TextBox>
-
-                            <TextBlock FontSize="10" Margin="0 10 0 0">Minimum Y</TextBlock>
-                            <TextBox Margin="0 5 0 0" Text="{Binding Controller.Range.MinimumY,Mode=TwoWay}"></TextBox>
-
-                            <TextBlock FontSize="10" Margin="0 10 0 0">Maximum Y</TextBlock>
-                            <TextBox Margin="0 5 0 0" Text="{Binding Controller.Range.MaximumY,Mode=TwoWay}"></TextBox>
-
-                            <CheckBox Margin="0 5 0 0" IsChecked="{Binding Controller.Range.AutoY,Mode=TwoWay}">Auto Range (Y)</CheckBox>
-
-                            <TextBlock FontSize="10" Margin="0 20 0 0">Stroke</TextBlock>
-                            <ComboBox Margin="0 5 0 0" ItemsSource="{StaticResource colors}" SelectedItem="{Binding Controller.DataSeriesCollection[0].Stroke}"/>
-
-                            <TextBlock FontSize="10" Margin="0 10 0 0">Thickness</TextBlock>
-                            <Slider Margin="0 5 0 0" Minimum="1" Maximum="5" Value="{Binding Controller.DataSeriesCollection[0].StrokeThickness}" IsSnapToTickEnabled="True" TickFrequency="1" />
-
-                            <TextBlock FontSize="10" Margin="0 10 0 0">Fill</TextBlock>
-                            <ComboBox Margin="0 5 0 0" ItemsSource="{StaticResource brushes}" SelectedItem="{Binding Controller.DataSeriesCollection[0].Fill}"/>
-
-                            <CheckBox Margin="0 10 0 0" IsChecked="{Binding ElementName=graph,Path=DisplayToolTip}">Display ToolTip</CheckBox>
-
-                            <CheckBox Margin="0 10 0 0" IsChecked="{Binding Controller.IsPaused,Mode=TwoWay}">Paused</CheckBox>
-
-                            <Button Margin="0 10 0 0" Padding="5" Command="{Binding Controller.ClearCommand}">Clear</Button>
-                        </StackPanel>
-                    </Border>
-                </Grid>
-            </TabItem>
-            <TabItem Header="Multi Series">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="200"/>
-                    </Grid.ColumnDefinitions>
-                    <realTimeGraphX:WpfGraphControl Margin="10" Controller="{Binding MultiController}" />
-
-                    <Border Grid.Column="1" Margin="10" BorderBrush="Gray" BorderThickness="1" CornerRadius="5" Padding="5">
-                        <StackPanel>
-                            <TextBlock FontSize="10">Duration</TextBlock>
-                            <TextBox Margin="0 5 0 0" Text="{Binding MultiController.Range.MaximumX,Mode=TwoWay}"></TextBox>
-
-                            <TextBlock FontSize="10" Margin="0 10 0 0">Refresh Rate</TextBlock>
-                            <TextBox Margin="0 5 0 0" Text="{Binding MultiController.RefreshRate,Mode=TwoWay}"></TextBox>
-
-                            <TextBlock FontSize="10" Margin="0 10 0 0">Minimum Y</TextBlock>
-                            <TextBox Margin="0 5 0 0" Text="{Binding MultiController.Range.MinimumY,Mode=TwoWay}"></TextBox>
-
-                            <TextBlock FontSize="10" Margin="0 10 0 0">Maximum Y</TextBlock>
-                            <TextBox Margin="0 5 0 0" Text="{Binding MultiController.Range.MaximumY,Mode=TwoWay}"></TextBox>
-
-                            <CheckBox Margin="0 5 0 0" IsChecked="{Binding MultiController.Range.AutoY,Mode=TwoWay}">Auto Range (Y)</CheckBox>
-
-                            <ListBox ItemsSource="{Binding MultiController.DataSeriesCollection}" Height="120" Margin="0 20">
-                                <ListBox.ItemTemplate>
-                                    <DataTemplate>
-                                        <StackPanel>
-                                            <CheckBox Content="{Binding Name}" IsChecked="{Binding IsVisible}" />
-                                        </StackPanel>
-                                    </DataTemplate>
-                                </ListBox.ItemTemplate>
-                            </ListBox>
-
-                            <Button Margin="0 10 0 0" Padding="5" Command="{Binding MultiController.ClearCommand}">Clear</Button>
-                        </StackPanel>
-                    </Border>
-                </Grid>
-            </TabItem>
-
-            <TabItem Header="List Binding (Same Surface)">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="250"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <ListBox x:Name="listItems" ItemsSource="{Binding ListItems}" SelectedIndex="0">
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel>
-                                    <TextBlock Text="{Binding Name}" FontWeight="SemiBold">
-                                        <TextBlock.Foreground>
-                                            <SolidColorBrush Color="{Binding Color}" />
-                                        </TextBlock.Foreground>
-                                    </TextBlock>
-                                    <TextBlock Foreground="DimGray" FontSize="11">
+            <StackPanel>
+              <TextBlock FontSize="10">Duration</TextBlock>
+              <TextBox Margin="0 5 0 0" Text="{Binding Controller.Range.MaximumX,Mode=TwoWay}"></TextBox>
+
+              <TextBlock FontSize="10" Margin="0 10 0 0">Refresh Rate</TextBlock>
+              <TextBox Margin="0 5 0 0" Text="{Binding Controller.RefreshRate,Mode=TwoWay}"></TextBox>
+
+              <TextBlock FontSize="10" Margin="0 10 0 0">Minimum Y</TextBlock>
+              <TextBox Margin="0 5 0 0" Text="{Binding Controller.Range.MinimumY,Mode=TwoWay}"></TextBox>
+
+              <TextBlock FontSize="10" Margin="0 10 0 0">Maximum Y</TextBlock>
+              <TextBox Margin="0 5 0 0" Text="{Binding Controller.Range.MaximumY,Mode=TwoWay}"></TextBox>
+
+              <CheckBox Margin="0 5 0 0" IsChecked="{Binding Controller.Range.AutoY,Mode=TwoWay}">Auto Range (Y)</CheckBox>
+
+              <TextBlock FontSize="10" Margin="0 20 0 0">Stroke</TextBlock>
+              <ComboBox Margin="0 5 0 0" ItemsSource="{StaticResource colors}" SelectedItem="{Binding Controller.DataSeriesCollection[0].Stroke}"/>
+
+              <TextBlock FontSize="10" Margin="0 10 0 0">Thickness</TextBlock>
+              <Slider Margin="0 5 0 0" Minimum="1" Maximum="5" Value="{Binding Controller.DataSeriesCollection[0].StrokeThickness}" IsSnapToTickEnabled="True" TickFrequency="1" />
+
+              <TextBlock FontSize="10" Margin="0 10 0 0">Fill</TextBlock>
+              <ComboBox Margin="0 5 0 0" ItemsSource="{StaticResource brushes}" SelectedItem="{Binding Controller.DataSeriesCollection[0].Fill}"/>
+
+              <CheckBox Margin="0 10 0 0" IsChecked="{Binding ElementName=graph,Path=DisplayToolTip}">Display ToolTip</CheckBox>
+
+              <CheckBox Margin="0 10 0 0" IsChecked="{Binding Controller.IsPaused,Mode=TwoWay}">Paused</CheckBox>
+
+              <Button Margin="0 10 0 0" Padding="5" Command="{Binding Controller.ClearCommand}">Clear</Button>
+            </StackPanel>
+          </Border>
+        </Grid>
+      </TabItem>
+      <TabItem Header="Multi Series">
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="51*"/>
+            <ColumnDefinition Width="872*"/>
+            <ColumnDefinition Width="200"/>
+          </Grid.ColumnDefinitions>
+          <realTimeGraphX:WpfGraphControl Margin="10,10,10,10" Controller="{Binding MultiController}" Grid.ColumnSpan="2" />
+
+          <Border Grid.Column="2" Margin="10,10,10,10" BorderBrush="Gray" BorderThickness="1" CornerRadius="5" Padding="5">
+            <StackPanel>
+              <TextBlock FontSize="10">Duration</TextBlock>
+              <TextBox Margin="0 5 0 0" Text="{Binding MultiController.Range.MaximumX,Mode=TwoWay}"></TextBox>
+
+              <TextBlock FontSize="10" Margin="0 10 0 0">Refresh Rate</TextBlock>
+              <TextBox Margin="0 5 0 0" Text="{Binding MultiController.RefreshRate,Mode=TwoWay}"></TextBox>
+
+              <TextBlock FontSize="10" Margin="0 10 0 0">Minimum Y</TextBlock>
+              <TextBox Margin="0 5 0 0" Text="{Binding MultiController.Range.MinimumY,Mode=TwoWay}"></TextBox>
+
+              <TextBlock FontSize="10" Margin="0 10 0 0">Maximum Y</TextBlock>
+              <TextBox Margin="0 5 0 0" Text="{Binding MultiController.Range.MaximumY,Mode=TwoWay}"></TextBox>
+
+              <CheckBox Margin="0 5 0 0" IsChecked="{Binding MultiController.Range.AutoY,Mode=TwoWay}">Auto Range (Y)</CheckBox>
+
+              <ListBox ItemsSource="{Binding MultiController.DataSeriesCollection}" Height="120" Margin="0 20">
+                <ListBox.ItemTemplate>
+                  <DataTemplate>
+                    <StackPanel>
+                      <CheckBox Content="{Binding Name}" IsChecked="{Binding IsVisible}" />
+                    </StackPanel>
+                  </DataTemplate>
+                </ListBox.ItemTemplate>
+              </ListBox>
+
+              <Button Margin="0 10 0 0" Padding="5" Command="{Binding MultiController.ClearCommand}">Clear</Button>
+            </StackPanel>
+          </Border>
+        </Grid>
+      </TabItem>
+
+      <TabItem Header="List Binding (Same Surface)">
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="250"/>
+            <ColumnDefinition Width="1*"/>
+          </Grid.ColumnDefinitions>
+
+          <ListBox x:Name="listItems" ItemsSource="{Binding ListItems}" SelectedIndex="0">
+            <ListBox.ItemTemplate>
+              <DataTemplate>
+                <StackPanel>
+                  <TextBlock Text="{Binding Name}" FontWeight="SemiBold">
+                    <TextBlock.Foreground>
+                      <SolidColorBrush Color="{Binding Color}" />
+                    </TextBlock.Foreground>
+                  </TextBlock>
+                  <TextBlock Foreground="DimGray" FontSize="11">
                                         <Run>Format:</Run>
                                         <Run Text="{Binding StringFormat,Mode=OneWay}"></Run>
-                                    </TextBlock>
-                                </StackPanel>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-
-                    <realTimeGraphX:WpfGraphControl Grid.Column="2" Margin="10" Controller="{Binding ElementName=listItems,Path=SelectedItem.Controller}" StringFormatX="{Binding ElementName=listItems,Path=SelectedItem.StringFormat}" />
-                </Grid>
-            </TabItem>
-
-            <TabItem Header="List Binding (DIfferent Surfaces)">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="250"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <ListBox x:Name="listItems2" ItemsSource="{Binding ListItems2}" SelectedIndex="0">
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel>
-                                    <TextBlock Text="{Binding Name}" FontWeight="SemiBold">
-                                        <TextBlock.Foreground>
-                                            <SolidColorBrush Color="{Binding Color}" />
-                                        </TextBlock.Foreground>
-                                    </TextBlock>
-                                    <TextBlock Foreground="DimGray" FontSize="11">
+                  </TextBlock>
+                </StackPanel>
+              </DataTemplate>
+            </ListBox.ItemTemplate>
+          </ListBox>
+
+          <realTimeGraphX:WpfGraphControl Grid.Column="2" Margin="10" Controller="{Binding ElementName=listItems,Path=SelectedItem.Controller}" StringFormatY="{Binding ElementName=listItems,Path=SelectedItem.StringFormat}" />
+        </Grid>
+      </TabItem>
+
+      <TabItem Header="List Binding (DIfferent Surfaces)">
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="250"/>
+            <ColumnDefinition Width="1*"/>
+          </Grid.ColumnDefinitions>
+
+          <ListBox x:Name="listItems2" ItemsSource="{Binding ListItems2}" SelectedIndex="0">
+            <ListBox.ItemTemplate>
+              <DataTemplate>
+                <StackPanel>
+                  <TextBlock Text="{Binding Name}" FontWeight="SemiBold">
+                    <TextBlock.Foreground>
+                      <SolidColorBrush Color="{Binding Color}" />
+                    </TextBlock.Foreground>
+                  </TextBlock>
+                  <TextBlock Foreground="DimGray" FontSize="11">
                                         <Run>Format:</Run>
                                         <Run Text="{Binding StringFormat,Mode=OneWay}"></Run>
-                                    </TextBlock>
-                                </StackPanel>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-
-                    <ItemsControl ItemsSource="{Binding ListItems2}" Grid.Column="1" Style="{x:Null}" BorderThickness="0">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <Grid></Grid>
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemContainerStyle>
-                            <Style TargetType="FrameworkElement">
-                                <Setter Property="Visibility" Value="Hidden"></Setter>
-                                <Style.Triggers>
-                                    <DataTrigger Value="True">
-                                        <DataTrigger.Binding>
-                                            <MultiBinding Converter="{StaticResource ObjectEqualityConverter}">
-                                                <Binding ElementName="listItems2" Path="SelectedItem" />
-                                                <Binding RelativeSource="{RelativeSource Mode=Self}" Path="DataContext" />
-                                            </MultiBinding>
-                                        </DataTrigger.Binding>
-                                        <Setter Property="Visibility" Value="Visible"></Setter>
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </ItemsControl.ItemContainerStyle>
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <realTimeGraphX:WpfGraphControl Grid.Column="2" Margin="10" Controller="{Binding Controller}" StringFormatX="{Binding StringFormat}" />
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-                </Grid>
-            </TabItem>
-        </TabControl>
-    </Grid>
+                  </TextBlock>
+                </StackPanel>
+              </DataTemplate>
+            </ListBox.ItemTemplate>
+          </ListBox>
+
+          <ItemsControl ItemsSource="{Binding ListItems2}" Grid.Column="1" Style="{x:Null}" BorderThickness="0">
+            <ItemsControl.ItemsPanel>
+              <ItemsPanelTemplate>
+                <Grid></Grid>
+              </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.ItemContainerStyle>
+              <Style TargetType="FrameworkElement">
+                <Setter Property="Visibility" Value="Hidden"></Setter>
+                <Style.Triggers>
+                  <DataTrigger Value="True">
+                    <DataTrigger.Binding>
+                      <MultiBinding Converter="{StaticResource ObjectEqualityConverter}">
+                        <Binding ElementName="listItems2" Path="SelectedItem" />
+                        <Binding RelativeSource="{RelativeSource Mode=Self}" Path="DataContext" />
+                      </MultiBinding>
+                    </DataTrigger.Binding>
+                    <Setter Property="Visibility" Value="Visible"></Setter>
+                  </DataTrigger>
+                </Style.Triggers>
+              </Style>
+            </ItemsControl.ItemContainerStyle>
+            <ItemsControl.ItemTemplate>
+              <DataTemplate>
+                <realTimeGraphX:WpfGraphControl Grid.Column="2" Margin="10" Controller="{Binding Controller}" StringFormatY="{Binding StringFormat}" />
+              </DataTemplate>
+            </ItemsControl.ItemTemplate>
+          </ItemsControl>
+        </Grid>
+      </TabItem>
+    </TabControl>
+  </Grid>
 </Window>
diff --git a/RealTimeGraphX.WPF/Themes/Generic.xaml b/RealTimeGraphX.WPF/Themes/Generic.xaml
index a2d0ff0..8e1be53 100644
--- a/RealTimeGraphX.WPF/Themes/Generic.xaml
+++ b/RealTimeGraphX.WPF/Themes/Generic.xaml
@@ -3,12 +3,15 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:RealTimeGraphX.WPF">
 
+    <!-- Converters -->
+    <BooleanToVisibilityConverter x:Key="BoolToVis" />
+
     <Style x:Key="AxisCaptionStyle" TargetType="TextBlock">
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="Margin" Value="10"/>
-        <!-- These triggers hide the TextBlock if the text is empty. 
-             I have placed the captions in a grid column/row with Width/Height = "Auto", 
+        <!-- These triggers hide the TextBlock if the text is empty.
+             I have placed the captions in a grid column/row with Width/Height = "Auto",
              so they should collapse completely if there is no caption. -->
         <Style.Triggers>
             <Trigger Property="Text" Value="">
@@ -24,9 +27,9 @@
         <Setter Property="ToolTipTemplate">
             <Setter.Value>
                 <DataTemplate>
-                    <Border 
+                    <Border
                         Opacity="0.8"
-                        BorderThickness="1" 
+                        BorderThickness="1"
                         Padding="10 5"
                         CornerRadius="5"
                         BorderBrush="{Binding RelativeSource={RelativeSource AncestorType=local:WpfGraphSurface},Path=BorderBrush}"
@@ -190,8 +193,8 @@
     </Style>
 
   <Style TargetType="{x:Type local:WpfGraphControl}">
-    <Setter Property="StringFormatX" Value="0.0"></Setter>
-    <Setter Property="StringFormatY" Value="hh\:mm\:ss"></Setter>
+    <Setter Property="StringFormatX" Value="hh\:mm\:ss"></Setter>
+    <Setter Property="StringFormatY" Value="0.0"></Setter>
     <Setter Property="BorderThickness" Value="1"></Setter>
     <Setter Property="BorderBrush" Value="#FF2E2E2E"></Setter>
     <Setter Property="Padding" Value="20 20 30 20"></Setter>
@@ -209,35 +212,55 @@
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type local:WpfGraphControl}">
           <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="5"
-                            Padding="{TemplateBinding Padding}">
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  Padding="{TemplateBinding Padding}">
             <Grid>
               <Grid.RowDefinitions>
                 <RowDefinition Height="1*"/>
-                <RowDefinition Height="35"/>
+                <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
               </Grid.RowDefinitions>
               <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition Width="70"/>
+                <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="1*"/>
               </Grid.ColumnDefinitions>
 
+              <!-- Y Caption -->
               <TextBlock Grid.Row="0" Grid.Column="0" Text="{TemplateBinding AxisCaptionY}" Style="{StaticResource AxisCaptionStyle}">
                 <TextBlock.LayoutTransform>
                   <RotateTransform Angle="-90"/>
                 </TextBlock.LayoutTransform>
               </TextBlock>
 
-              <Grid Grid.Column="2">
+              <!-- Plot area -->
+              <Grid Grid.Row="0" Grid.Column="2">
                 <local:WpfGraphGridLines Controller="{TemplateBinding Controller}" Foreground="{TemplateBinding GridLinesBrush}" />
                 <local:WpfGraphSurface x:Name="surface" Controller="{TemplateBinding Controller}" DisplayToolTip="{TemplateBinding DisplayToolTip}" BorderThickness="1" BorderBrush="{TemplateBinding Foreground}" />
               </Grid>
 
-              <local:WpfGraphAxisControl Orientation="Vertical" Controller="{TemplateBinding Controller}" Grid.Column="1" Grid.Row="0" StringFormat="{TemplateBinding StringFormatX}" />
-              <local:WpfGraphAxisControl Orientation="Horizontal" Controller="{TemplateBinding Controller}" Grid.Column="2" Grid.Row="1" StringFormat="{TemplateBinding StringFormatY}"/>
+              <!-- Y Axis -->
+              <!-- For some reason, TemplateBinding on the width does not work. -->
+              <local:WpfGraphAxisControl Orientation="Vertical"
+                                         Controller="{TemplateBinding Controller}"
+                                         Grid.Column="1"
+                                         Grid.Row="0"
+                                         Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=WidthAxisY}"
+                                         Visibility="{TemplateBinding ShowAxisY, Converter={StaticResource BoolToVis}}"
+                                         StringFormat="{TemplateBinding StringFormatY}" />
+
+              <!-- X Axis -->
+              <local:WpfGraphAxisControl Orientation="Horizontal"
+                                         Controller="{TemplateBinding Controller}"
+                                         Grid.Column="2"
+                                         Grid.Row="1"
+                                         Height="35"
+                                         Visibility="{TemplateBinding ShowAxisX, Converter={StaticResource BoolToVis}}"
+                                         StringFormat="{TemplateBinding StringFormatX}"/>
+
+              <!-- X Caption -->
               <TextBlock Grid.Column="2" Grid.Row="2" Text="{TemplateBinding AxisCaptionX}" Style="{StaticResource AxisCaptionStyle}"/>
 
             </Grid>
diff --git a/RealTimeGraphX.WPF/WpfGraphControl.cs b/RealTimeGraphX.WPF/WpfGraphControl.cs
index 9e9ce73..5af9145 100644
--- a/RealTimeGraphX.WPF/WpfGraphControl.cs
+++ b/RealTimeGraphX.WPF/WpfGraphControl.cs
@@ -48,7 +48,7 @@ public String StringFormatX
       set { SetValue(StringFormatXProperty, value); }
     }
     public static readonly DependencyProperty StringFormatXProperty =
-        DependencyProperty.Register("StringFormatX", typeof(String), typeof(WpfGraphControl), new PropertyMetadata("0.0"));
+        DependencyProperty.Register("StringFormatX", typeof(String), typeof(WpfGraphControl), new PropertyMetadata("hh\\:mm\\:ss"));
 
     /// <summary>
     /// Gets or sets the string format for the Y Axis.
@@ -59,7 +59,7 @@ public String StringFormatY
       set { SetValue(StringFormatYProperty, value); }
     }
     public static readonly DependencyProperty StringFormatYProperty =
-        DependencyProperty.Register("StringFormatY", typeof(String), typeof(WpfGraphControl), new PropertyMetadata("hh\\:mm\\:ss"));
+        DependencyProperty.Register("StringFormatY", typeof(String), typeof(WpfGraphControl), new PropertyMetadata("0.0"));
 
 
     /// <summary>
@@ -95,6 +95,50 @@ public Brush GridLinesBrush
     public static readonly DependencyProperty GridLinesBrushProperty =
         DependencyProperty.Register( "GridLinesBrush", typeof(Brush), typeof(WpfGraphControl), new PropertyMetadata((SolidColorBrush)new BrushConverter().ConvertFrom("#FF2E2E2E")) ) ;
 
+    /// <summary>
+    /// Gets or sets the corner radius for the border
+    /// </summary>
+    public CornerRadius CornerRadius
+    {
+      get { return (CornerRadius)GetValue(CornerRadiusProperty); }
+      set { SetValue(CornerRadiusProperty, value); }
+    }
+    public static readonly DependencyProperty CornerRadiusProperty =
+        DependencyProperty.Register( "CornerRadius", typeof(CornerRadius), typeof(WpfGraphControl), new PropertyMetadata(new CornerRadius(5)) ) ;
+
+    /// <summary>
+    /// Boolean property so show or hide the X-Axis
+    /// </summary>
+    public bool ShowAxisX
+    {
+      get { return (bool)GetValue(ShowAxisXProperty); }
+      set { SetValue(ShowAxisXProperty, value); }
+    }
+    public static readonly DependencyProperty ShowAxisXProperty =
+        DependencyProperty.Register("ShowAxisX", typeof(bool), typeof(WpfGraphControl), new PropertyMetadata(true));
+
+    /// <summary>
+    /// Boolean property so show or hide the Y-Axis
+    /// </summary>
+    public bool ShowAxisY
+    {
+      get { return (bool)GetValue(ShowAxisYProperty); }
+      set { SetValue(ShowAxisYProperty, value); }
+    }
+    public static readonly DependencyProperty ShowAxisYProperty =
+        DependencyProperty.Register("ShowAxisY", typeof(bool), typeof(WpfGraphControl), new PropertyMetadata(true));
+
+    /// <summary>
+    /// Width of the Y axis, default 70.
+    /// </summary>
+    public int WidthAxisY
+    {
+      get { return (int)GetValue(WidthAxisYProperty); }
+      set { SetValue(WidthAxisYProperty, value); }
+    }
+    public static readonly DependencyProperty WidthAxisYProperty =
+        DependencyProperty.Register("WidthAxisY", typeof(int), typeof(WpfGraphControl), new PropertyMetadata(70));
+
     /// <summary>
     /// Initializes the <see cref="WpfGraphControl"/> class.
     /// </summary>

From 59744de28a7f7c48d4d4e55eb7c856b7b05d03b9 Mon Sep 17 00:00:00 2001
From: PhilJollans <phil@jollans.com>
Date: Sun, 4 Sep 2022 23:36:35 +0200
Subject: [PATCH 10/15] Add new property Range.XStartBehavior

The property XStartBehavior specifies the behavior before there is enough data to fill up the X axis.
There are three options:
 - Stretch the data, which is the original behavior
 - Fill the diagram from the left and start scrolling left when the diagram is full
 - Show new data on the right hand margin and scroll left from the beginning
---
 RealTimeGraphX.WPF.Demo/MainWindowVM.cs |  2 ++
 RealTimeGraphX/GraphController.cs       | 16 ++++++++++
 RealTimeGraphX/GraphRange.cs            | 42 +++++++++++++++++++++++++
 3 files changed, 60 insertions(+)

diff --git a/RealTimeGraphX.WPF.Demo/MainWindowVM.cs b/RealTimeGraphX.WPF.Demo/MainWindowVM.cs
index 3ce09af..7c73570 100644
--- a/RealTimeGraphX.WPF.Demo/MainWindowVM.cs
+++ b/RealTimeGraphX.WPF.Demo/MainWindowVM.cs
@@ -32,6 +32,7 @@ public MainWindowVM()
             Controller.Range.MaximumX = TimeSpan.FromSeconds(10);
             Controller.Range.AutoY = true;
             Controller.Range.AutoYFallbackMode = GraphRangeAutoYFallBackMode.MinMax;
+            Controller.Range.XStartBehavior = XStartBehavior.slideInFromRight ;
 
             Controller.DataSeriesCollection.Add(new WpfGraphDataSeries()
             {
@@ -44,6 +45,7 @@ public MainWindowVM()
             MultiController.Range.MaximumY = 1080;
             MultiController.Range.MaximumX = TimeSpan.FromSeconds(10);
             MultiController.Range.AutoY = true;
+            MultiController.Range.XStartBehavior = XStartBehavior.fillFromLeft ;
 
             MultiController.DataSeriesCollection.Add(new WpfGraphDataSeries()
             {
diff --git a/RealTimeGraphX/GraphController.cs b/RealTimeGraphX/GraphController.cs
index 19dfd4c..0a399a2 100644
--- a/RealTimeGraphX/GraphController.cs
+++ b/RealTimeGraphX/GraphController.cs
@@ -314,6 +314,22 @@ private void Render()
                 {
                     min_x = _to_render.First().Value.XX.First();
                     max_x = _to_render.First().Value.XX.Last();
+
+                    if ( ( max_x - min_x ) < _range.MaximumX )
+                    {
+                        switch ( _range.XStartBehavior )
+                        {
+                            case XStartBehavior.stretchData:
+                                // Original behavior. No action necessary.
+                                break ;
+                            case XStartBehavior.slideInFromRight:
+                                min_x = max_x - _range.MaximumX ;
+                                break ;
+                            case XStartBehavior.fillFromLeft:
+                                max_x = min_x + _range.MaximumX ;
+                                break ;
+                        }
+                    }
                 }
                 else
                 {
diff --git a/RealTimeGraphX/GraphRange.cs b/RealTimeGraphX/GraphRange.cs
index fa2b850..3490186 100644
--- a/RealTimeGraphX/GraphRange.cs
+++ b/RealTimeGraphX/GraphRange.cs
@@ -6,6 +6,31 @@
 
 namespace RealTimeGraphX
 {
+    /// <summary>
+    /// This enum defines the initial behaviour, when there is not enough new data to fill the X-Axis.
+    /// </summary>
+    public enum XStartBehavior
+    {
+      /// <summary>
+      /// The option strechData means that the initial data will be stretched to fill the
+      /// X-Axis. As new data arrives, the data will be squeezed until the specified range
+      /// for the X-Axis has been reached. After that the data will scroll to the left.
+      /// </summary>
+      stretchData,
+      /// <summary>
+      /// The option slideInFromRight means that the range of the X-Axis is fixed. New
+      /// data will appear at the right of the diagram and scroll to the left. The data
+      /// scrolls from very beginning.
+      /// </summary>
+      slideInFromRight,
+      /// <summary>
+      /// The option fillFromLeft means that the range of the X-Axis is fixed. New Data
+      /// is drawn relative to the left hand side and does not scroll at all until the 
+      /// specified range of the X-Axis is full. After that the data will scroll to the left.
+      /// </summary>
+      fillFromLeft
+    }
+
     /// <summary>
     ///  Represents a graph x/y data points boundaries.
     /// </summary>
@@ -40,6 +65,12 @@ public interface IGraphRange : IGraphComponent
         /// Gets or sets the AutoY fallback margins when <see cref="AutoYFallbackMode"/> is set to Margins.
         /// </summary>
         GraphDataPoint AutoYFallBackMargins { get; set; }
+
+        /// <summary>
+        /// This property defines how data is displayed in the initial period, before the MaximumX has been reached.
+        /// The options are streching the data, sliding the data in from the right, or filling the data from the left.
+        /// </summary>
+        XStartBehavior  XStartBehavior { get; set; }
     }
 
     /// <summary>
@@ -181,5 +212,16 @@ GraphDataPoint IGraphRange.AutoYFallBackMargins
                 AutoYFallbackMargins = (YDataPoint)value;
             }
         }
+
+        private XStartBehavior _xStartBehavior = XStartBehavior.stretchData ;
+        /// <summary>
+        /// This property defines how data is displayed in the initial period, before the MaximumX has been reached.
+        /// The options are streching the data, sliding the data in from the right, or filling the data from the left.
+        /// </summary>
+        public XStartBehavior XStartBehavior 
+        { 
+            get { return _xStartBehavior; }
+            set { _xStartBehavior = value; RaisePropertyChangedAuto(); }
+        }
     }
 }

From f8577275b5aae8b0bc372a6c40264ae0042bcb1b Mon Sep 17 00:00:00 2001
From: PhilJollans <phil@jollans.com>
Date: Mon, 5 Sep 2022 09:08:58 +0200
Subject: [PATCH 11/15] Update RealTimeGraphX.dll and RealTimeGraphX.WPF.dll to
 version 1.0.0.1

---
 RealTimeGraphX.WPF/Properties/AssemblyInfo.cs | 8 ++++----
 RealTimeGraphX/RealTimeGraphX.csproj          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/RealTimeGraphX.WPF/Properties/AssemblyInfo.cs b/RealTimeGraphX.WPF/Properties/AssemblyInfo.cs
index a08459d..b562c0c 100644
--- a/RealTimeGraphX.WPF/Properties/AssemblyInfo.cs
+++ b/RealTimeGraphX.WPF/Properties/AssemblyInfo.cs
@@ -16,8 +16,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.1")]
+[assembly: AssemblyFileVersion("1.0.0.1")]
diff --git a/RealTimeGraphX/RealTimeGraphX.csproj b/RealTimeGraphX/RealTimeGraphX.csproj
index 672b49f..cb80dc8 100644
--- a/RealTimeGraphX/RealTimeGraphX.csproj
+++ b/RealTimeGraphX/RealTimeGraphX.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>1.0.0</Version>
+    <Version>1.0.0.1</Version>
     <Description>RealTimeGraphX is a data type agnostic, high performance plotting library for WPF and UWP.</Description>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/royben/RealTimeGraphX</PackageProjectUrl>

From 759d5c05085e9f1aa73310941c240498c33126ac Mon Sep 17 00:00:00 2001
From: PhilJollans <phil@jollans.com>
Date: Fri, 9 Sep 2022 15:53:08 +0200
Subject: [PATCH 12/15] Replace WpfGraphAxisControl.Ticks with .Divisions and
 add WpfGraphControl.DivisionsX and .DivisionsY

Replace the Ticks property on WpfGraphAxisControl with a Divisions property and define Ticks as Divisions+1. With this change, the Divisions property can have the same numeric value as the Rows and Columns properties on the WpfGraphGridLines control.

Add the properties DivisionsX and DivisionsY to WpfGraphControl.

Add TemplateBindings to the control template in Generic.xaml, to bind the DivisionsX and DivisionsY properties to the Rows and Columns of the WpfGraphGridLines control and to the Divisions properties of the respective WpfGraphAxisControl controls.
---
 RealTimeGraphX.WPF.Demo/MainWindow.xaml   |  4 ++-
 RealTimeGraphX.WPF/Themes/Generic.xaml    |  7 ++++-
 RealTimeGraphX.WPF/WpfGraphAxisControl.cs | 32 +++++++++++++++++------
 RealTimeGraphX.WPF/WpfGraphControl.cs     | 22 ++++++++++++++++
 4 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/RealTimeGraphX.WPF.Demo/MainWindow.xaml b/RealTimeGraphX.WPF.Demo/MainWindow.xaml
index 69c8a8f..eb5849a 100644
--- a/RealTimeGraphX.WPF.Demo/MainWindow.xaml
+++ b/RealTimeGraphX.WPF.Demo/MainWindow.xaml
@@ -45,10 +45,12 @@
                                           Background="White"
                                           Foreground="Black"
                                           GridLinesBrush="LightGray"
-                                          ShowAxisX="False"
+                                          ShowAxisX="True"
                                           ShowAxisY="True"
                                           CornerRadius="0"
                                           WidthAxisY="50"
+                                          DivisionsY="10"
+                                          DivisionsX="12"
                                           Padding="5 15"
                                           StringFormatY="0.000"/>
 
diff --git a/RealTimeGraphX.WPF/Themes/Generic.xaml b/RealTimeGraphX.WPF/Themes/Generic.xaml
index 8e1be53..3b8e94c 100644
--- a/RealTimeGraphX.WPF/Themes/Generic.xaml
+++ b/RealTimeGraphX.WPF/Themes/Generic.xaml
@@ -237,7 +237,10 @@
 
               <!-- Plot area -->
               <Grid Grid.Row="0" Grid.Column="2">
-                <local:WpfGraphGridLines Controller="{TemplateBinding Controller}" Foreground="{TemplateBinding GridLinesBrush}" />
+                <local:WpfGraphGridLines Controller="{TemplateBinding Controller}"
+                                         Foreground="{TemplateBinding GridLinesBrush}"
+                                         Rows="{TemplateBinding DivisionsY}"
+                                         Columns="{TemplateBinding DivisionsX}"/>
                 <local:WpfGraphSurface x:Name="surface" Controller="{TemplateBinding Controller}" DisplayToolTip="{TemplateBinding DisplayToolTip}" BorderThickness="1" BorderBrush="{TemplateBinding Foreground}" />
               </Grid>
 
@@ -248,6 +251,7 @@
                                          Grid.Column="1"
                                          Grid.Row="0"
                                          Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=WidthAxisY}"
+                                         Divisions="{TemplateBinding DivisionsY}"
                                          Visibility="{TemplateBinding ShowAxisY, Converter={StaticResource BoolToVis}}"
                                          StringFormat="{TemplateBinding StringFormatY}" />
 
@@ -257,6 +261,7 @@
                                          Grid.Column="2"
                                          Grid.Row="1"
                                          Height="35"
+                                         Divisions="{TemplateBinding DivisionsX}"
                                          Visibility="{TemplateBinding ShowAxisX, Converter={StaticResource BoolToVis}}"
                                          StringFormat="{TemplateBinding StringFormatX}"/>
 
diff --git a/RealTimeGraphX.WPF/WpfGraphAxisControl.cs b/RealTimeGraphX.WPF/WpfGraphAxisControl.cs
index aa738b2..fe3f7a2 100644
--- a/RealTimeGraphX.WPF/WpfGraphAxisControl.cs
+++ b/RealTimeGraphX.WPF/WpfGraphAxisControl.cs
@@ -68,16 +68,18 @@ internal ObservableCollection<WpfGraphAxisTickData> Items
         public static readonly DependencyProperty ItemsProperty =
             DependencyProperty.Register("Items", typeof(ObservableCollection<WpfGraphAxisTickData>), typeof(WpfGraphAxisControl), new PropertyMetadata(null));
 
+        internal int Ticks => Divisions + 1 ;
+
         /// <summary>
-        /// Gets or sets the number of ticks to display on the control.
+        /// Gets or sets the number of divisions to display on the control.
         /// </summary>
-        public int Ticks
+        public int Divisions
         {
-            get { return (int)GetValue(TicksProperty); }
-            set { SetValue(TicksProperty, value); }
+            get { return (int)GetValue(DivisionsProperty); }
+            set { SetValue(DivisionsProperty, value); }
         }
-        public static readonly DependencyProperty TicksProperty =
-            DependencyProperty.Register("Ticks", typeof(int), typeof(WpfGraphAxisControl), new PropertyMetadata(9, (d, e) => (d as WpfGraphAxisControl).OnTicksChanged()));
+        public static readonly DependencyProperty DivisionsProperty =
+            DependencyProperty.Register("Divisions", typeof(int), typeof(WpfGraphAxisControl), new PropertyMetadata(8, (d, e) => (d as WpfGraphAxisControl).OnDivisionsChanged()));
 
         /// <summary>
         /// Gets or sets the string format which is used to format the ticks value.
@@ -99,13 +101,13 @@ public override void OnApplyTemplate()
 
             _items_control = GetTemplateChild("PART_ItemsControl") as ItemsControl;
 
-            _items_control.Loaded += (x, e) => 
+            _items_control.Loaded += (x, e) =>
             {
                 ItemsPresenter itemsPresenter = GetVisualChild<ItemsPresenter>(_items_control);
                 _axisPanel = VisualTreeHelper.GetChild(itemsPresenter, 0) as WpfGraphAxisPanel;
             };
 
-            OnTicksChanged();
+            OnDivisionsChanged();
         }
 
         private static T GetVisualChild<T>(DependencyObject parent) where T : Visual
@@ -129,6 +131,7 @@ private static T GetVisualChild<T>(DependencyObject parent) where T : Visual
             return child;
         }
 
+#if false
         /// <summary>
         /// Called when the <see cref="Ticks"/> property has changed.
         /// </summary>
@@ -140,6 +143,19 @@ protected virtual void OnTicksChanged()
 
             _axisPanel?.UpdatePanel();
         }
+#endif
+
+        /// <summary>
+        /// Called when the <see cref="Divisions"/> property has changed.
+        /// </summary>
+        protected virtual void OnDivisionsChanged()
+        {
+            Items = new ObservableCollection<WpfGraphAxisTickData>(Enumerable.Range(0, Ticks).Select(x => new WpfGraphAxisTickData()));
+
+            Controller?.RequestVirtualRangeChange();
+
+            _axisPanel?.UpdatePanel();
+        }
 
         protected override void OnControllerChanged(IGraphController oldController, IGraphController newController)
         {
diff --git a/RealTimeGraphX.WPF/WpfGraphControl.cs b/RealTimeGraphX.WPF/WpfGraphControl.cs
index 5af9145..83713df 100644
--- a/RealTimeGraphX.WPF/WpfGraphControl.cs
+++ b/RealTimeGraphX.WPF/WpfGraphControl.cs
@@ -139,6 +139,28 @@ public int WidthAxisY
     public static readonly DependencyProperty WidthAxisYProperty =
         DependencyProperty.Register("WidthAxisY", typeof(int), typeof(WpfGraphControl), new PropertyMetadata(70));
 
+    /// <summary>
+    /// Number of divisions in the Y axis
+    /// </summary>
+    public int DivisionsY
+    {
+      get { return (int)GetValue(DivisionsYProperty); }
+      set { SetValue(DivisionsYProperty, value); }
+    }
+    public static readonly DependencyProperty DivisionsYProperty =
+        DependencyProperty.Register("DivisionsY", typeof(int), typeof(WpfGraphControl), new PropertyMetadata(8));
+
+    /// <summary>
+    /// Number of divisions in the X axis
+    /// </summary>
+    public int DivisionsX
+    {
+      get { return (int)GetValue(DivisionsXProperty); }
+      set { SetValue(DivisionsXProperty, value); }
+    }
+    public static readonly DependencyProperty DivisionsXProperty =
+        DependencyProperty.Register("DivisionsX", typeof(int), typeof(WpfGraphControl), new PropertyMetadata(8));
+
     /// <summary>
     /// Initializes the <see cref="WpfGraphControl"/> class.
     /// </summary>

From 0e6440506ef620bf6cc8e9870e43f016d57744b4 Mon Sep 17 00:00:00 2001
From: PhilJollans <phil@jollans.com>
Date: Fri, 9 Sep 2022 15:57:33 +0200
Subject: [PATCH 13/15] Update versions to 1.0.0.2

Update versions to 1.0.0.2
---
 RealTimeGraphX.WPF.Demo/Properties/AssemblyInfo.cs | 4 ++--
 RealTimeGraphX.WPF/Properties/AssemblyInfo.cs      | 4 ++--
 RealTimeGraphX/RealTimeGraphX.csproj               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/RealTimeGraphX.WPF.Demo/Properties/AssemblyInfo.cs b/RealTimeGraphX.WPF.Demo/Properties/AssemblyInfo.cs
index 7e50401..8c3e28c 100644
--- a/RealTimeGraphX.WPF.Demo/Properties/AssemblyInfo.cs
+++ b/RealTimeGraphX.WPF.Demo/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.2")]
+[assembly: AssemblyFileVersion("1.0.0.2")]
diff --git a/RealTimeGraphX.WPF/Properties/AssemblyInfo.cs b/RealTimeGraphX.WPF/Properties/AssemblyInfo.cs
index b562c0c..78aec8b 100644
--- a/RealTimeGraphX.WPF/Properties/AssemblyInfo.cs
+++ b/RealTimeGraphX.WPF/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.1")]
+[assembly: AssemblyVersion("1.0.0.2")]
+[assembly: AssemblyFileVersion("1.0.0.2")]
diff --git a/RealTimeGraphX/RealTimeGraphX.csproj b/RealTimeGraphX/RealTimeGraphX.csproj
index cb80dc8..acad1a6 100644
--- a/RealTimeGraphX/RealTimeGraphX.csproj
+++ b/RealTimeGraphX/RealTimeGraphX.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>1.0.0.1</Version>
+    <Version>1.0.0.2</Version>
     <Description>RealTimeGraphX is a data type agnostic, high performance plotting library for WPF and UWP.</Description>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/royben/RealTimeGraphX</PackageProjectUrl>

From 833e2c643949835bb66cf65460798fca06fa90eb Mon Sep 17 00:00:00 2001
From: PhilJollans <phil@jollans.com>
Date: Tue, 4 Oct 2022 20:52:32 +0200
Subject: [PATCH 14/15] Add a margin for AutoY scaling.

Add a new abstract method ExpandRange to GraphDataPoint to expand the min and max values by a factor applied to the difference between the two values, i.e.
    min = min - factor * ( max - min )
    max = max + factor * ( max - min )

This will be used with the AutoY scaling option.

Obviously, it would be nice to make the factor configurable, but in this version it is hard coded as 0.05.

Note that the method ExpandRange works like a static method, in that it does not use the "this" reference at all.
It is not static, because it is abstract.
---
 .../DataPoints/DateTimeDataPoint.cs           |   16 +
 RealTimeGraphX/DataPoints/DoubleDataPoint.cs  |   16 +
 RealTimeGraphX/DataPoints/FloatDataPoint.cs   |   16 +
 RealTimeGraphX/DataPoints/Int32DataPoint.cs   |   16 +
 .../DataPoints/TimeSpanDataPoint.cs           |   16 +
 RealTimeGraphX/GraphController.cs             | 1369 +++++++++--------
 RealTimeGraphX/GraphDataPoint.cs              |    8 +
 7 files changed, 775 insertions(+), 682 deletions(-)

diff --git a/RealTimeGraphX/DataPoints/DateTimeDataPoint.cs b/RealTimeGraphX/DataPoints/DateTimeDataPoint.cs
index 86f8099..eb39470 100644
--- a/RealTimeGraphX/DataPoints/DateTimeDataPoint.cs
+++ b/RealTimeGraphX/DataPoints/DateTimeDataPoint.cs
@@ -184,5 +184,21 @@ protected override DateTimeDataPoint OnGetDefaultMargins()
         {
             return new DateTimeDataPoint(new DateTime(1, 1, 1, 1, 1, 1));
         }
+
+        /// <summary>
+        /// Expands the range by adding factor * ( max - min ) to the max and subtracting the same value from the min.
+        /// </summary>
+        /// <param name="min"></param>
+        /// <param name="max"></param>
+        /// <param name="factor"></param>
+        public override void ExpandRange ( ref GraphDataPoint min, ref GraphDataPoint max, double factor )
+        {
+            DateTime dMin   = min as DateTimeDataPoint;
+            DateTime dMax   = max as DateTimeDataPoint;
+            long     delta  = dMax.Ticks - dMin.Ticks ;
+            long     margin = (long)(factor * delta) ;
+            max = new DateTimeDataPoint ( new DateTime ( dMax.Ticks + margin ) ) ;
+            min = new DateTimeDataPoint ( new DateTime ( dMin.Ticks - margin ) ) ;
+        }
     }
 }
diff --git a/RealTimeGraphX/DataPoints/DoubleDataPoint.cs b/RealTimeGraphX/DataPoints/DoubleDataPoint.cs
index 14f4a9b..0455a38 100644
--- a/RealTimeGraphX/DataPoints/DoubleDataPoint.cs
+++ b/RealTimeGraphX/DataPoints/DoubleDataPoint.cs
@@ -184,5 +184,21 @@ protected override DoubleDataPoint OnGetDefaultMargins()
         {
             return new DoubleDataPoint(0.5);
         }
+
+        /// <summary>
+        /// Expands the range by adding factor * ( max - min ) to the max and subtracting the same value from the min.
+        /// </summary>
+        /// <param name="min"></param>
+        /// <param name="max"></param>
+        /// <param name="factor"></param>
+        public override void ExpandRange ( ref GraphDataPoint min, ref GraphDataPoint max, double factor )
+        {
+            double minimum = (double)min.GetValue();
+            double maximum = (double)max.GetValue();
+            double delta   = maximum - minimum ;
+            double margin  = factor * delta ;
+            max = new DoubleDataPoint ( (max as DoubleDataPoint).Value + margin ) ;
+            min = new DoubleDataPoint ( (min as DoubleDataPoint).Value - margin ) ;
+        }
     }
 }
diff --git a/RealTimeGraphX/DataPoints/FloatDataPoint.cs b/RealTimeGraphX/DataPoints/FloatDataPoint.cs
index 146a700..09923fe 100644
--- a/RealTimeGraphX/DataPoints/FloatDataPoint.cs
+++ b/RealTimeGraphX/DataPoints/FloatDataPoint.cs
@@ -184,5 +184,21 @@ protected override FloatDataPoint OnGetDefaultMargins()
         {
             return new FloatDataPoint(0.5f);
         }
+
+        /// <summary>
+        /// Expands the range by adding factor * ( max - min ) to the max and subtracting the same value from the min.
+        /// </summary>
+        /// <param name="min"></param>
+        /// <param name="max"></param>
+        /// <param name="factor"></param>
+        public override void ExpandRange ( ref GraphDataPoint min, ref GraphDataPoint max, double factor )
+        {
+            float minimum = (float)min.GetValue();
+            float maximum = (float)max.GetValue();
+            float delta   = maximum - minimum ;
+            float margin  = (float)(factor * delta) ;
+            max = new FloatDataPoint ( (max as FloatDataPoint).Value + margin ) ;
+            min = new FloatDataPoint ( (min as FloatDataPoint).Value - margin ) ;
+        }
     }
 }
diff --git a/RealTimeGraphX/DataPoints/Int32DataPoint.cs b/RealTimeGraphX/DataPoints/Int32DataPoint.cs
index 9e9ad26..90f89b7 100644
--- a/RealTimeGraphX/DataPoints/Int32DataPoint.cs
+++ b/RealTimeGraphX/DataPoints/Int32DataPoint.cs
@@ -189,5 +189,21 @@ protected override Int32DataPoint OnGetDefaultMargins()
         {
             return new Int32DataPoint(1);
         }
+
+        /// <summary>
+        /// Expands the range by adding factor * ( max - min ) to the max and subtracting the same value from the min.
+        /// </summary>
+        /// <param name="min"></param>
+        /// <param name="max"></param>
+        /// <param name="factor"></param>
+        public override void ExpandRange ( ref GraphDataPoint min, ref GraphDataPoint max, double factor )
+        {
+            int minimum = (int)min.GetValue();
+            int maximum = (int)max.GetValue();
+            int delta   = maximum - minimum ;
+            int margin  = (int)(factor * delta) ;
+            max = new Int32DataPoint ( (max as Int32DataPoint).Value + margin ) ;
+            min = new Int32DataPoint ( (min as Int32DataPoint).Value - margin ) ;
+        }
     }
 }
diff --git a/RealTimeGraphX/DataPoints/TimeSpanDataPoint.cs b/RealTimeGraphX/DataPoints/TimeSpanDataPoint.cs
index e026c7b..5a62547 100644
--- a/RealTimeGraphX/DataPoints/TimeSpanDataPoint.cs
+++ b/RealTimeGraphX/DataPoints/TimeSpanDataPoint.cs
@@ -186,5 +186,21 @@ protected override TimeSpanDataPoint OnGetDefaultMargins()
         {
             return new TimeSpanDataPoint(TimeSpan.FromSeconds(1));
         }
+
+        /// <summary>
+        /// Expands the range by adding factor * ( max - min ) to the max and subtracting the same value from the min.
+        /// </summary>
+        /// <param name="min"></param>
+        /// <param name="max"></param>
+        /// <param name="factor"></param>
+        public override void ExpandRange ( ref GraphDataPoint min, ref GraphDataPoint max, double factor )
+        {
+            double minimum = ((TimeSpan)min.GetValue()).TotalMilliseconds;
+            double maximum = ((TimeSpan)max.GetValue()).TotalMilliseconds;
+            double delta   = maximum - minimum ;
+            double margin  = factor * delta ;
+            max = new TimeSpanDataPoint ( TimeSpan.FromMilliseconds ( maximum + margin ) ) ;
+            min = new TimeSpanDataPoint ( TimeSpan.FromMilliseconds ( minimum - margin ) ) ;
+        }
     }
 }
diff --git a/RealTimeGraphX/GraphController.cs b/RealTimeGraphX/GraphController.cs
index 0a399a2..4a3e94e 100644
--- a/RealTimeGraphX/GraphController.cs
+++ b/RealTimeGraphX/GraphController.cs
@@ -1,237 +1,237 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Text;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Drawing;
-using RealTimeGraphX.EventArguments;
-using RealTimeGraphX.Renderers;
-using System.Diagnostics;
-
-namespace RealTimeGraphX
-{
-    /// <summary>
-    /// Represents an <see cref="IGraphController{TDataSeries, TXDataPoint, TYDataPoint}"/> base class.
-    /// </summary>
-    /// <typeparam name="TDataSeries">The type of the data series.</typeparam>
-    /// <typeparam name="TXDataPoint">The type of the x data point.</typeparam>
-    /// <typeparam name="TYDataPoint">The type of the y data point.</typeparam>
-    /// <seealso cref="RealTimeGraphX.GraphObject" />
-    /// <seealso cref="RealTimeGraphX.IGraphController{TDataSeries, TXDataPoint, TYDataPoint}" />
-    public abstract class GraphController<TDataSeries, TXDataPoint, TYDataPoint> : GraphObject, IGraphController<TDataSeries, TXDataPoint, TYDataPoint>
-        where TXDataPoint : GraphDataPoint
-        where TYDataPoint : GraphDataPoint
-        where TDataSeries : IGraphDataSeries
-    {
-        private GraphDataQueue<List<PendingSeries>> _pending_series_collection;
-        private Dictionary<TDataSeries, PendingSeries> _to_render;
-        private DateTime _last_render_time;
-        private object _render_lock = new object();
-        private Thread _render_thread;
-        private bool _clear;
-
-        #region Pending Series Class
-
-        protected class PendingSeries
-        {
-            public TDataSeries Series { get; set; }
-            public List<GraphDataPoint> XX { get; set; }
-            public List<GraphDataPoint> YY { get; set; }
-
-            public int NewItemsCount
-            {
-                get { return XX.Count - RenderedItems; }
-            }
-
-            public int RenderedItems { get; set; }
-
-            public bool IsClearSeries { get; set; }
-
-            public bool IsUpdateSeries { get; set; }
-        }
-
-        #endregion
-
-        #region Events
-
-        /// <summary>
-        /// Occurs when the current effective minimum/maximum has changed.
-        /// </summary>
-        public event EventHandler<RangeChangedEventArgs> EffectiveRangeChanged;
-
-        /// <summary>
-        /// Occurs when the current virtual (effective minimum/maximum after transformation) minimum/maximum has changed.
-        /// </summary>
-        public event EventHandler<RangeChangedEventArgs> VirtualRangeChanged;
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets the controller refresh rate.
-        /// Higher rate requires more CPU time.
-        /// </summary>
-        public TimeSpan RefreshRate { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to pause rendering.
-        /// </summary>
-        public bool IsPaused { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to disable the rendering of data.
-        /// </summary>
-        public bool DisableRendering { get; set; }
-
-        /// <summary>
-        /// Gets the data series collection.
-        /// </summary>
-        public ObservableCollection<TDataSeries> DataSeriesCollection { get; }
-
-        private IGraphRenderer<TDataSeries> _renderer;
-        /// <summary>
-        /// Gets or sets the graph renderer.
-        /// </summary>
-        public IGraphRenderer<TDataSeries> Renderer
-        {
-            get
-            {
-                return _renderer;
-            }
-            set
-            {
-                _renderer = value; RaisePropertyChangedAuto();
-            }
-        }
-
-        private IGraphSurface<TDataSeries> _surface;
-        /// <summary>
-        /// Gets or sets the rendering surface.
-        /// </summary>
-        public IGraphSurface<TDataSeries> Surface
-        {
-            get { return _surface; }
-            set
-            {
-                var previous = _surface;
-                _surface = value;
-                RequestVirtualRangeChange();
-                OnSurfaceChanged(previous, _surface);
-            }
-        }
-
-        private GraphRange<TXDataPoint, TYDataPoint> _range;
-        /// <summary>
-        /// Gets or sets the graph range (data point boundaries).
-        /// </summary>
-        public GraphRange<TXDataPoint, TYDataPoint> Range
-        {
-            get
-            {
-                return _range;
-            }
-            set
-            {
-                _range = value; RaisePropertyChangedAuto();
-            }
-        }
-
-        /// <summary>
-        /// Gets the current effective x-axis minimum.
-        /// </summary>
-        public GraphDataPoint EffectiveMinimumX { get; private set; }
-
-        /// <summary>
-        /// Gets the current effective x-axis maximum.
-        /// </summary>
-        public GraphDataPoint EffectiveMaximumX { get; private set; }
-
-        /// <summary>
-        /// Gets the current effective y-axis minimum.
-        /// </summary>
-        public GraphDataPoint EffectiveMinimumY { get; private set; }
-
-        /// <summary>
-        /// Gets the current effective y-axis maximum.
-        /// </summary>
-        public GraphDataPoint EffectiveMaximumY { get; private set; }
-
-        /// <summary>
-        /// Gets the current virtual (effective minimum/maximum after transformation) x-axis minimum.
-        /// </summary>
-        public GraphDataPoint VirtualMinimumX { get; private set; }
-
-        /// <summary>
-        /// Gets the current virtual (effective minimum/maximum after transformation) x-axis maximum.
-        /// </summary>
-        public GraphDataPoint VirtualMaximumX { get; private set; }
-
-        /// <summary>
-        /// Gets the current virtual (effective minimum/maximum after transformation) y-axis minimum.
-        /// </summary>
-        public GraphDataPoint VirtualMinimumY { get; private set; }
-
-        /// <summary>
-        /// Gets the current virtual (effective minimum/maximum after transformation) y-axis maximum.
-        /// </summary>
-        public GraphDataPoint VirtualMaximumY { get; private set; }
-
-        #endregion
-
-        #region Commands
-
-        /// <summary>
-        /// Gets the clear command.
-        /// </summary>
-        public GraphCommand ClearCommand { get; private set; }
-
-        #endregion
-
-        #region Constructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GraphController{TDataSeries, TXDataPoint, TYDataPoint}"/> class.
-        /// </summary>
-        public GraphController()
-        {
-            Renderer = new ScrollingLineRenderer<TDataSeries>();
-
-            DataSeriesCollection = new ObservableCollection<TDataSeries>();
-            Range = new GraphRange<TXDataPoint, TYDataPoint>();
-
-            _last_render_time = DateTime.Now;
-            _to_render = new Dictionary<TDataSeries, PendingSeries>();
-            _pending_series_collection = new GraphDataQueue<List<PendingSeries>>();
-            RefreshRate = TimeSpan.FromMilliseconds(50);
-
-            ClearCommand = new GraphCommand(Clear);
-
-            _render_thread = new Thread(RenderThreadMethod);
-            _render_thread.IsBackground = true;
-            _render_thread.Priority = ThreadPriority.Highest;
-            _render_thread.Start();
-        }
-
-        #endregion
-
-        #region Render Thread
-
-        /// <summary>
-        /// The rendering thread method.
-        /// </summary>
-        private void RenderThreadMethod()
-        {
-            while (true)
-            {
-                if ((!IsPaused && !DisableRendering) || _clear)
-                {
-                    try
-                    {
-                        List<List<PendingSeries>> pending_lists = new List<List<PendingSeries>>();
-
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Text;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Drawing;
+using RealTimeGraphX.EventArguments;
+using RealTimeGraphX.Renderers;
+using System.Diagnostics;
+
+namespace RealTimeGraphX
+{
+    /// <summary>
+    /// Represents an <see cref="IGraphController{TDataSeries, TXDataPoint, TYDataPoint}"/> base class.
+    /// </summary>
+    /// <typeparam name="TDataSeries">The type of the data series.</typeparam>
+    /// <typeparam name="TXDataPoint">The type of the x data point.</typeparam>
+    /// <typeparam name="TYDataPoint">The type of the y data point.</typeparam>
+    /// <seealso cref="RealTimeGraphX.GraphObject" />
+    /// <seealso cref="RealTimeGraphX.IGraphController{TDataSeries, TXDataPoint, TYDataPoint}" />
+    public abstract class GraphController<TDataSeries, TXDataPoint, TYDataPoint> : GraphObject, IGraphController<TDataSeries, TXDataPoint, TYDataPoint>
+        where TXDataPoint : GraphDataPoint
+        where TYDataPoint : GraphDataPoint
+        where TDataSeries : IGraphDataSeries
+    {
+        private GraphDataQueue<List<PendingSeries>> _pending_series_collection;
+        private Dictionary<TDataSeries, PendingSeries> _to_render;
+        private DateTime _last_render_time;
+        private object _render_lock = new object();
+        private Thread _render_thread;
+        private bool _clear;
+
+        #region Pending Series Class
+
+        protected class PendingSeries
+        {
+            public TDataSeries Series { get; set; }
+            public List<GraphDataPoint> XX { get; set; }
+            public List<GraphDataPoint> YY { get; set; }
+
+            public int NewItemsCount
+            {
+                get { return XX.Count - RenderedItems; }
+            }
+
+            public int RenderedItems { get; set; }
+
+            public bool IsClearSeries { get; set; }
+
+            public bool IsUpdateSeries { get; set; }
+        }
+
+        #endregion
+
+        #region Events
+
+        /// <summary>
+        /// Occurs when the current effective minimum/maximum has changed.
+        /// </summary>
+        public event EventHandler<RangeChangedEventArgs> EffectiveRangeChanged;
+
+        /// <summary>
+        /// Occurs when the current virtual (effective minimum/maximum after transformation) minimum/maximum has changed.
+        /// </summary>
+        public event EventHandler<RangeChangedEventArgs> VirtualRangeChanged;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the controller refresh rate.
+        /// Higher rate requires more CPU time.
+        /// </summary>
+        public TimeSpan RefreshRate { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to pause rendering.
+        /// </summary>
+        public bool IsPaused { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to disable the rendering of data.
+        /// </summary>
+        public bool DisableRendering { get; set; }
+
+        /// <summary>
+        /// Gets the data series collection.
+        /// </summary>
+        public ObservableCollection<TDataSeries> DataSeriesCollection { get; }
+
+        private IGraphRenderer<TDataSeries> _renderer;
+        /// <summary>
+        /// Gets or sets the graph renderer.
+        /// </summary>
+        public IGraphRenderer<TDataSeries> Renderer
+        {
+            get
+            {
+                return _renderer;
+            }
+            set
+            {
+                _renderer = value; RaisePropertyChangedAuto();
+            }
+        }
+
+        private IGraphSurface<TDataSeries> _surface;
+        /// <summary>
+        /// Gets or sets the rendering surface.
+        /// </summary>
+        public IGraphSurface<TDataSeries> Surface
+        {
+            get { return _surface; }
+            set
+            {
+                var previous = _surface;
+                _surface = value;
+                RequestVirtualRangeChange();
+                OnSurfaceChanged(previous, _surface);
+            }
+        }
+
+        private GraphRange<TXDataPoint, TYDataPoint> _range;
+        /// <summary>
+        /// Gets or sets the graph range (data point boundaries).
+        /// </summary>
+        public GraphRange<TXDataPoint, TYDataPoint> Range
+        {
+            get
+            {
+                return _range;
+            }
+            set
+            {
+                _range = value; RaisePropertyChangedAuto();
+            }
+        }
+
+        /// <summary>
+        /// Gets the current effective x-axis minimum.
+        /// </summary>
+        public GraphDataPoint EffectiveMinimumX { get; private set; }
+
+        /// <summary>
+        /// Gets the current effective x-axis maximum.
+        /// </summary>
+        public GraphDataPoint EffectiveMaximumX { get; private set; }
+
+        /// <summary>
+        /// Gets the current effective y-axis minimum.
+        /// </summary>
+        public GraphDataPoint EffectiveMinimumY { get; private set; }
+
+        /// <summary>
+        /// Gets the current effective y-axis maximum.
+        /// </summary>
+        public GraphDataPoint EffectiveMaximumY { get; private set; }
+
+        /// <summary>
+        /// Gets the current virtual (effective minimum/maximum after transformation) x-axis minimum.
+        /// </summary>
+        public GraphDataPoint VirtualMinimumX { get; private set; }
+
+        /// <summary>
+        /// Gets the current virtual (effective minimum/maximum after transformation) x-axis maximum.
+        /// </summary>
+        public GraphDataPoint VirtualMaximumX { get; private set; }
+
+        /// <summary>
+        /// Gets the current virtual (effective minimum/maximum after transformation) y-axis minimum.
+        /// </summary>
+        public GraphDataPoint VirtualMinimumY { get; private set; }
+
+        /// <summary>
+        /// Gets the current virtual (effective minimum/maximum after transformation) y-axis maximum.
+        /// </summary>
+        public GraphDataPoint VirtualMaximumY { get; private set; }
+
+        #endregion
+
+        #region Commands
+
+        /// <summary>
+        /// Gets the clear command.
+        /// </summary>
+        public GraphCommand ClearCommand { get; private set; }
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GraphController{TDataSeries, TXDataPoint, TYDataPoint}"/> class.
+        /// </summary>
+        public GraphController()
+        {
+            Renderer = new ScrollingLineRenderer<TDataSeries>();
+
+            DataSeriesCollection = new ObservableCollection<TDataSeries>();
+            Range = new GraphRange<TXDataPoint, TYDataPoint>();
+
+            _last_render_time = DateTime.Now;
+            _to_render = new Dictionary<TDataSeries, PendingSeries>();
+            _pending_series_collection = new GraphDataQueue<List<PendingSeries>>();
+            RefreshRate = TimeSpan.FromMilliseconds(50);
+
+            ClearCommand = new GraphCommand(Clear);
+
+            _render_thread = new Thread(RenderThreadMethod);
+            _render_thread.IsBackground = true;
+            _render_thread.Priority = ThreadPriority.Highest;
+            _render_thread.Start();
+        }
+
+        #endregion
+
+        #region Render Thread
+
+        /// <summary>
+        /// The rendering thread method.
+        /// </summary>
+        private void RenderThreadMethod()
+        {
+            while (true)
+            {
+                if ((!IsPaused && !DisableRendering) || _clear)
+                {
+                    try
+                    {
+                        List<List<PendingSeries>> pending_lists = new List<List<PendingSeries>>();
+
                         var pending_list_first = _pending_series_collection.BlockDequeue();
 
                         if (_clear)
@@ -246,76 +246,76 @@ private void RenderThreadMethod()
                                 _pending_series_collection.BlockDequeue();
                             }
                             continue;
-                        }
-
-                        pending_lists.Add(pending_list_first);
-
-                        while (_pending_series_collection.Count > 0)
-                        {
-                            var pending_list = _pending_series_collection.BlockDequeue();
-                            pending_lists.Add(pending_list);
-                        }
-
-                        foreach (var pending_list in pending_lists)
-                        {
-                            foreach (var pending_series in pending_list)
-                            {
-                                if (!pending_series.IsUpdateSeries)
-                                {
-                                    if (_to_render.ContainsKey(pending_series.Series))
-                                    {
-                                        var s = _to_render[pending_series.Series];
-                                        s.XX.AddRange(pending_series.XX);
-                                        s.YY.AddRange(pending_series.YY);
-                                    }
-                                    else
-                                    {
-                                        _to_render[pending_series.Series] = pending_series;
-                                    }
-                                }
-                            }
-                        }
-
+                        }
+
+                        pending_lists.Add(pending_list_first);
+
+                        while (_pending_series_collection.Count > 0)
+                        {
+                            var pending_list = _pending_series_collection.BlockDequeue();
+                            pending_lists.Add(pending_list);
+                        }
+
+                        foreach (var pending_list in pending_lists)
+                        {
+                            foreach (var pending_series in pending_list)
+                            {
+                                if (!pending_series.IsUpdateSeries)
+                                {
+                                    if (_to_render.ContainsKey(pending_series.Series))
+                                    {
+                                        var s = _to_render[pending_series.Series];
+                                        s.XX.AddRange(pending_series.XX);
+                                        s.YY.AddRange(pending_series.YY);
+                                    }
+                                    else
+                                    {
+                                        _to_render[pending_series.Series] = pending_series;
+                                    }
+                                }
+                            }
+                        }
+
                         if (Surface != null)
                         {
                             Render();
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Debug.WriteLine($"Error in RealTimeGraphX:\n{ex.ToString()}");
-                    }
-                }
-                else if (IsPaused && !DisableRendering)
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.WriteLine($"Error in RealTimeGraphX:\n{ex.ToString()}");
+                    }
+                }
+                else if (IsPaused && !DisableRendering)
                 {
                     if (Surface != null)
                     {
                         Render();
-                    }
-                    Thread.Sleep(RefreshRate);
-                }
-                else
-                {
-                    Thread.Sleep(RefreshRate);
-                }
-            }
-        }
-
-        private void Render()
-        {
-            if (_to_render.Count > 0)
-            {
-                GraphDataPoint min_x = _range.MaximumX - _range.MaximumX;
-                GraphDataPoint max_x = _range.MaximumX;
-                GraphDataPoint min_y = _range.MinimumY;
-                GraphDataPoint max_y = _range.MaximumY;
-
-                if (_to_render.Count > 0 && _to_render.First().Value.XX.Count > 0)
-                {
-                    min_x = _to_render.First().Value.XX.First();
-                    max_x = _to_render.First().Value.XX.Last();
-
-                    if ( ( max_x - min_x ) < _range.MaximumX )
+                    }
+                    Thread.Sleep(RefreshRate);
+                }
+                else
+                {
+                    Thread.Sleep(RefreshRate);
+                }
+            }
+        }
+
+        private void Render()
+        {
+            if (_to_render.Count > 0)
+            {
+                GraphDataPoint min_x = _range.MaximumX - _range.MaximumX;
+                GraphDataPoint max_x = _range.MaximumX;
+                GraphDataPoint min_y = _range.MinimumY;
+                GraphDataPoint max_y = _range.MaximumY;
+
+                if (_to_render.Count > 0 && _to_render.First().Value.XX.Count > 0)
+                {
+                    min_x = _to_render.First().Value.XX.First();
+                    max_x = _to_render.First().Value.XX.Last();
+
+                    if ( ( max_x - min_x ) < _range.MaximumX )
                     {
                         switch ( _range.XStartBehavior )
                         {
@@ -329,388 +329,393 @@ private void Render()
                                 max_x = min_x + _range.MaximumX ;
                                 break ;
                         }
-                    }
-                }
-                else
-                {
-                    return;
-                }
-
-                if (_range.AutoY)
-                {
-                    min_y = _to_render.Select(x => x.Value).SelectMany(x => x.YY).Min();
-                    max_y = _to_render.Select(x => x.Value).SelectMany(x => x.YY).Max();
-                }
-
-                if (min_y == max_y)
-                {
-                    if (_range.AutoYFallbackMode == GraphRangeAutoYFallBackMode.MinMax)
-                    {
-                        min_y = _range.MinimumY;
-                        max_y = _range.MaximumY;
-                    }
-                    else if (_range.AutoYFallbackMode == GraphRangeAutoYFallBackMode.Margins)
-                    {
-                        min_y -= _range.AutoYFallbackMargins;
-                        max_y += _range.AutoYFallbackMargins;
-                    }
-                }
-
-                EffectiveMinimumX = min_x;
-                EffectiveMaximumX = max_x;
-                EffectiveMinimumY = min_y;
-                EffectiveMaximumY = max_y;
-
-                VirtualMinimumX = EffectiveMinimumX;
-                VirtualMaximumX = EffectiveMaximumX;
-                VirtualMinimumY = EffectiveMinimumY;
-                VirtualMaximumY = EffectiveMaximumY;
-
-                _last_render_time = DateTime.Now;
-
-                if (Surface != null)
-                {
-                    var surface_size = Surface.GetSize();
-                    var zoom_rect = Surface.GetZoomRect();
-
-                    if (surface_size.Width > 0 && surface_size.Height > 0)
-                    {
-                        Surface.BeginDraw();
-
-                        if (zoom_rect.Width > 0 && zoom_rect.Height > 0)
-                        {
-                            var zoom_rect_top_percentage = zoom_rect.Top / surface_size.Height;
-                            var zoom_rect_bottom_percentage = zoom_rect.Bottom / surface_size.Height;
-                            var zoom_rect_left_percentage = zoom_rect.Left / surface_size.Width;
-                            var zoom_rect_right_percentage = zoom_rect.Right / surface_size.Width;
-
-                            VirtualMinimumY = EffectiveMaximumY - GraphDataPointHelper.ComputeAbsolutePosition(EffectiveMinimumY, EffectiveMaximumY, zoom_rect_bottom_percentage);
-                            VirtualMaximumY = EffectiveMaximumY - GraphDataPointHelper.ComputeAbsolutePosition(EffectiveMinimumY, EffectiveMaximumY, zoom_rect_top_percentage);
-
-                            VirtualMinimumX = GraphDataPointHelper.ComputeAbsolutePosition(EffectiveMinimumX, EffectiveMaximumX, zoom_rect_left_percentage);
-                            VirtualMaximumX = GraphDataPointHelper.ComputeAbsolutePosition(EffectiveMinimumX, EffectiveMaximumX, zoom_rect_right_percentage);
-
-                            GraphTransform transform = new GraphTransform();
-                            var scale_x = (float)(surface_size.Width / zoom_rect.Width);
-                            var scale_y = (float)(surface_size.Height / zoom_rect.Height);
-                            var translate_x = (float)-zoom_rect.Left * scale_x;
-                            var translate_y = (float)-zoom_rect.Top * scale_y;
-
-                            transform = new GraphTransform();
-                            transform.TranslateX = translate_x;
-                            transform.TranslateY = translate_y;
-                            transform.ScaleX = scale_x;
-                            transform.ScaleY = scale_y;
-
-                            Surface.SetTransform(transform);
-                        }
-
-                        List<Tuple<TDataSeries, IEnumerable<PointF>>> to_draw = new List<Tuple<TDataSeries, IEnumerable<PointF>>>();
-
-                        var to_render = _to_render.Select(x => x.Value).ToList();
-
-                        foreach (var item in to_render)
-                        {
-                            if (item.YY.Count > 0)
-                            {
-                                item.Series.CurrentValue = item.YY.Last().GetValue();
-                            }
-
-                            var points = Renderer.Render(Surface, item.Series, _range, item.XX, item.YY, min_x, max_x, min_y, max_y);
-                            to_draw.Add(new Tuple<TDataSeries, IEnumerable<PointF>>(item.Series, points));
-                        }
-
-                        for (int i = 0; i < to_draw.Count; i++)
-                        {
-                            if (to_draw[i].Item2.Count() > 2)
-                            {
-                                if (to_draw[i].Item1.IsVisible)
-                                {
-                                    Renderer.Draw(Surface, to_draw[i].Item1, to_draw[i].Item2, i, to_draw.Count);
-                                }
-                            }
-                        }
-
-                        Surface?.EndDraw();
-                    }
-                }
-
-                OnEffectiveRangeChanged(EffectiveMinimumX, EffectiveMaximumX, EffectiveMinimumY, EffectiveMaximumY);
-                OnVirtualRangeChanged(VirtualMinimumX, VirtualMaximumX, VirtualMinimumY, VirtualMaximumY);
-            }
-        }
-
-        #endregion
-
-        #region Protected Methods
-
-        /// <summary>
-        /// Called when the surface has changed.
-        /// </summary>
-        /// <param name="previous">The previous.</param>
-        /// <param name="surface">The surface.</param>
-        protected virtual void OnSurfaceChanged(IGraphSurface<TDataSeries> previous, IGraphSurface<TDataSeries> surface)
-        {
-            if (previous != null)
-            {
-                previous.SurfaceSizeChanged -= Surface_SurfaceSizeChanged;
-                previous.ZoomRectChanged -= Surface_ZoomRectChanged;
-            }
-
-            if (surface != null)
-            {
-                surface.SurfaceSizeChanged += Surface_SurfaceSizeChanged;
-                surface.ZoomRectChanged += Surface_ZoomRectChanged;
-            }
-        }
-
-        /// <summary>
-        /// Raises the <see cref="EffectiveRangeChanged"/> event.
-        /// </summary>
-        /// <param name="minimumX">The minimum x.</param>
-        /// <param name="maximumX">The maximum x.</param>
-        /// <param name="minimumY">The minimum y.</param>
-        /// <param name="maximumY">The maximum y.</param>
-        protected virtual void OnEffectiveRangeChanged(GraphDataPoint minimumX, GraphDataPoint maximumX, GraphDataPoint minimumY, GraphDataPoint maximumY)
-        {
-            EffectiveRangeChanged?.Invoke(this, new RangeChangedEventArgs(minimumX, maximumX, minimumY, maximumY));
-        }
-
-        /// <summary>
-        /// Raises the <see cref="VirtualRangeChanged"/> event.
-        /// </summary>
-        /// <param name="minimumX">The minimum x.</param>
-        /// <param name="maximumX">The maximum x.</param>
-        /// <param name="minimumY">The minimum y.</param>
-        /// <param name="maximumY">The maximum y.</param>
-        protected virtual void OnVirtualRangeChanged(GraphDataPoint minimumX, GraphDataPoint maximumX, GraphDataPoint minimumY, GraphDataPoint maximumY)
-        {
-            var range = new RangeChangedEventArgs(minimumX, maximumX, minimumY, maximumY);
-            VirtualRangeChanged?.Invoke(this, range);
-        }
-
-        /// <summary>
-        /// Converts the specified relative x position to graph absolute position.
-        /// </summary>
-        /// <param name="x">The relative x position.</param>
-        /// <returns></returns>
-        protected virtual float ConvertXValueToRendererValue(double x)
-        {
-            return (float)(x * Surface.GetSize().Width / 100);
-        }
-
-        /// <summary>
-        /// Converts the specified relative y position to graph absolute position.
-        /// </summary>
-        /// <param name="y">The relative y position.</param>
-        /// <returns></returns>
-        protected virtual float ConvertYValueToRendererValue(double y)
-        {
-            return (float)(Surface.GetSize().Height - (y * Surface.GetSize().Height / 100));
-        }
-
-        #endregion
-
-        #region Surface Event Handlers
-
-        /// <summary>
-        /// Handles the ZoomRectChanged event of the Surface control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
-        private void Surface_ZoomRectChanged(object sender, EventArgs e)
-        {
-            if (!_pending_series_collection.ToList().SelectMany(x => x).ToList().Exists(x => x.IsUpdateSeries))
-            {
-                List<PendingSeries> updateSeries = new List<PendingSeries>();
-
-                foreach (var pending_Series in _to_render)
-                {
-                    updateSeries.Add(new PendingSeries()
-                    {
-                        IsUpdateSeries = true,
-                        Series = pending_Series.Value.Series,
-                        XX = new List<GraphDataPoint>(),
-                        YY = new List<GraphDataPoint>(),
-                    });
-                }
-
-                _pending_series_collection.BlockEnqueue(updateSeries);
-            }
-        }
-
-        /// <summary>
-        /// Handles the SurfaceSizeChanged event of the Surface control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
-        private void Surface_SurfaceSizeChanged(object sender, EventArgs e)
-        {
-            if (!_pending_series_collection.ToList().SelectMany(x => x).ToList().Exists(x => x.IsUpdateSeries))
-            {
-                List<PendingSeries> updateSeries = new List<PendingSeries>();
-
-                foreach (var pending_Series in _to_render)
-                {
-                    updateSeries.Add(new PendingSeries()
-                    {
-                        IsUpdateSeries = true,
-                        Series = pending_Series.Value.Series,
-                        XX = new List<GraphDataPoint>(),
-                        YY = new List<GraphDataPoint>(),
-                    });
-                }
-
-                _pending_series_collection.BlockEnqueue(updateSeries);
-            }
-        }
-
-        #endregion
-
-        #region Public Methods
-
-        /// <summary>
-        /// Submits the specified x and y data points.
-        /// If the controller has more than one data series the data points will be duplicated.
-        /// </summary>
-        /// <param name="x">X data point.</param>
-        /// <param name="y">Y data point.</param>
-        public void PushData(TXDataPoint x, TYDataPoint y)
-        {
-            if (DataSeriesCollection.Count == 0) return;
-
-            List<List<TXDataPoint>> xxxx = new List<List<TXDataPoint>>();
-            List<List<TYDataPoint>> yyyy = new List<List<TYDataPoint>>();
-
-            foreach (var series in DataSeriesCollection.ToList())
-            {
-                xxxx.Add(new List<TXDataPoint>() { x });
-                yyyy.Add(new List<TYDataPoint>() { y });
-            }
-
-            PushData(xxxx, yyyy);
-        }
-
-        /// <summary>
-        /// Submits the specified collections of x and y data points.
-        /// If the controller has more than one data series the data points will be distributed evenly.
-        /// </summary>
-        /// <param name="xx">X data point collection.</param>
-        /// <param name="yy">Y data point collection.</param>
-        public void PushData(IEnumerable<TXDataPoint> xx, IEnumerable<TYDataPoint> yy)
-        {
-            if (DataSeriesCollection.Count == 0) return;
-
-            var xList = xx.ToList();
-            var yList = yy.ToList();
-
-            List<List<TXDataPoint>> xxxx = new List<List<TXDataPoint>>();
-            List<List<TYDataPoint>> yyyy = new List<List<TYDataPoint>>();
-
-            foreach (var series in DataSeriesCollection.ToList())
-            {
-                xxxx.Add(new List<TXDataPoint>());
-                yyyy.Add(new List<TYDataPoint>());
-            }
-
-            int counter = 0;
-
-            for (int i = 0; i < xList.Count; i++)
-            {
-                xxxx[counter].Add(xList[i]);
-                yyyy[counter].Add(yList[i]);
-
-                counter++;
-
-                if (counter >= xxxx.Count)
-                {
-                    counter = 0;
-                }
-            }
-
-            PushData(xxxx, yyyy);
-        }
-
-        /// <summary>
-        /// Submits a matrix of x and y data points. Meaning each data series should process a single collection of x/y data points.
-        /// </summary>
-        /// <param name="xxxx">X matrix.</param>
-        /// <param name="yyyy">Y matrix.</param>
-        public void PushData(IEnumerable<IEnumerable<TXDataPoint>> xxxx, IEnumerable<IEnumerable<TYDataPoint>> yyyy)
-        {
-            if (DataSeriesCollection.Count == 0) return;
-
-            IEnumerable<IEnumerable<GraphDataPoint>> xxxxI = xxxx.Select(x => x.ToList()).ToList();
-            IEnumerable<IEnumerable<GraphDataPoint>> yyyyI = yyyy.Select(x => x.ToList()).ToList();
-
-            List<List<GraphDataPoint>> xxxxList = xxxxI.Select(x => x.ToList()).ToList();
-            List<List<GraphDataPoint>> yyyyList = yyyyI.Select(x => x.ToList()).ToList();
-
-            int first_count_x = xxxxList[0].Count;
-            int first_count_y = yyyyList[0].Count;
-
-
-            bool is_data_valid = true;
-
-            for (int i = 0; i < xxxxList.Count; i++)
-            {
-                if (xxxxList[0].Count != first_count_x)
-                {
-                    is_data_valid = false;
-                    break;
-                }
-
-                if (xxxxList[0].Count != yyyyList[0].Count)
-                {
-                    is_data_valid = false;
-                    break;
-                }
-            }
-
-            if (!is_data_valid)
-            {
-                throw new ArgumentOutOfRangeException("When pushing data to a multi series renderer, each series must contain the same amount of data.");
-            }
-
-            var list = DataSeriesCollection.ToList();
-
-            var pending_list = new List<PendingSeries>();
-
-            for (int i = 0; i < list.Count; i++)
-            {
-                pending_list.Add(new PendingSeries()
-                {
-                    Series = list[i],
-                    XX = xxxxList[i].ToList(),
-                    YY = yyyyList[i].ToList(),
-                });
-            }
-
-            _pending_series_collection.BlockEnqueue(pending_list);
-        }
-
-        /// <summary>
-        /// Clears all data points from this controller.
-        /// </summary>
-        public void Clear()
-        {
+                    }
+                }
+                else
+                {
+                    return;
+                }
+
+                if (_range.AutoY)
+                {
+                    min_y = _to_render.Select(x => x.Value).SelectMany(x => x.YY).Min();
+                    max_y = _to_render.Select(x => x.Value).SelectMany(x => x.YY).Max();
+
+                    // Note: The "this" object to which this method is applied is not used,
+                    // making it like a static method (but abstract). I'm not really happy
+                    // with this structure.
+                    min_y.ExpandRange ( ref min_y, ref max_y, 0.05 ) ;
+                }
+
+                if (min_y == max_y)
+                {
+                    if (_range.AutoYFallbackMode == GraphRangeAutoYFallBackMode.MinMax)
+                    {
+                        min_y = _range.MinimumY;
+                        max_y = _range.MaximumY;
+                    }
+                    else if (_range.AutoYFallbackMode == GraphRangeAutoYFallBackMode.Margins)
+                    {
+                        min_y -= _range.AutoYFallbackMargins;
+                        max_y += _range.AutoYFallbackMargins;
+                    }
+                }
+
+                EffectiveMinimumX = min_x;
+                EffectiveMaximumX = max_x;
+                EffectiveMinimumY = min_y;
+                EffectiveMaximumY = max_y;
+
+                VirtualMinimumX = EffectiveMinimumX;
+                VirtualMaximumX = EffectiveMaximumX;
+                VirtualMinimumY = EffectiveMinimumY;
+                VirtualMaximumY = EffectiveMaximumY;
+
+                _last_render_time = DateTime.Now;
+
+                if (Surface != null)
+                {
+                    var surface_size = Surface.GetSize();
+                    var zoom_rect = Surface.GetZoomRect();
+
+                    if (surface_size.Width > 0 && surface_size.Height > 0)
+                    {
+                        Surface.BeginDraw();
+
+                        if (zoom_rect.Width > 0 && zoom_rect.Height > 0)
+                        {
+                            var zoom_rect_top_percentage = zoom_rect.Top / surface_size.Height;
+                            var zoom_rect_bottom_percentage = zoom_rect.Bottom / surface_size.Height;
+                            var zoom_rect_left_percentage = zoom_rect.Left / surface_size.Width;
+                            var zoom_rect_right_percentage = zoom_rect.Right / surface_size.Width;
+
+                            VirtualMinimumY = EffectiveMaximumY - GraphDataPointHelper.ComputeAbsolutePosition(EffectiveMinimumY, EffectiveMaximumY, zoom_rect_bottom_percentage);
+                            VirtualMaximumY = EffectiveMaximumY - GraphDataPointHelper.ComputeAbsolutePosition(EffectiveMinimumY, EffectiveMaximumY, zoom_rect_top_percentage);
+
+                            VirtualMinimumX = GraphDataPointHelper.ComputeAbsolutePosition(EffectiveMinimumX, EffectiveMaximumX, zoom_rect_left_percentage);
+                            VirtualMaximumX = GraphDataPointHelper.ComputeAbsolutePosition(EffectiveMinimumX, EffectiveMaximumX, zoom_rect_right_percentage);
+
+                            GraphTransform transform = new GraphTransform();
+                            var scale_x = (float)(surface_size.Width / zoom_rect.Width);
+                            var scale_y = (float)(surface_size.Height / zoom_rect.Height);
+                            var translate_x = (float)-zoom_rect.Left * scale_x;
+                            var translate_y = (float)-zoom_rect.Top * scale_y;
+
+                            transform = new GraphTransform();
+                            transform.TranslateX = translate_x;
+                            transform.TranslateY = translate_y;
+                            transform.ScaleX = scale_x;
+                            transform.ScaleY = scale_y;
+
+                            Surface.SetTransform(transform);
+                        }
+
+                        List<Tuple<TDataSeries, IEnumerable<PointF>>> to_draw = new List<Tuple<TDataSeries, IEnumerable<PointF>>>();
+
+                        var to_render = _to_render.Select(x => x.Value).ToList();
+
+                        foreach (var item in to_render)
+                        {
+                            if (item.YY.Count > 0)
+                            {
+                                item.Series.CurrentValue = item.YY.Last().GetValue();
+                            }
+
+                            var points = Renderer.Render(Surface, item.Series, _range, item.XX, item.YY, min_x, max_x, min_y, max_y);
+                            to_draw.Add(new Tuple<TDataSeries, IEnumerable<PointF>>(item.Series, points));
+                        }
+
+                        for (int i = 0; i < to_draw.Count; i++)
+                        {
+                            if (to_draw[i].Item2.Count() > 2)
+                            {
+                                if (to_draw[i].Item1.IsVisible)
+                                {
+                                    Renderer.Draw(Surface, to_draw[i].Item1, to_draw[i].Item2, i, to_draw.Count);
+                                }
+                            }
+                        }
+
+                        Surface?.EndDraw();
+                    }
+                }
+
+                OnEffectiveRangeChanged(EffectiveMinimumX, EffectiveMaximumX, EffectiveMinimumY, EffectiveMaximumY);
+                OnVirtualRangeChanged(VirtualMinimumX, VirtualMaximumX, VirtualMinimumY, VirtualMaximumY);
+            }
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Called when the surface has changed.
+        /// </summary>
+        /// <param name="previous">The previous.</param>
+        /// <param name="surface">The surface.</param>
+        protected virtual void OnSurfaceChanged(IGraphSurface<TDataSeries> previous, IGraphSurface<TDataSeries> surface)
+        {
+            if (previous != null)
+            {
+                previous.SurfaceSizeChanged -= Surface_SurfaceSizeChanged;
+                previous.ZoomRectChanged -= Surface_ZoomRectChanged;
+            }
+
+            if (surface != null)
+            {
+                surface.SurfaceSizeChanged += Surface_SurfaceSizeChanged;
+                surface.ZoomRectChanged += Surface_ZoomRectChanged;
+            }
+        }
+
+        /// <summary>
+        /// Raises the <see cref="EffectiveRangeChanged"/> event.
+        /// </summary>
+        /// <param name="minimumX">The minimum x.</param>
+        /// <param name="maximumX">The maximum x.</param>
+        /// <param name="minimumY">The minimum y.</param>
+        /// <param name="maximumY">The maximum y.</param>
+        protected virtual void OnEffectiveRangeChanged(GraphDataPoint minimumX, GraphDataPoint maximumX, GraphDataPoint minimumY, GraphDataPoint maximumY)
+        {
+            EffectiveRangeChanged?.Invoke(this, new RangeChangedEventArgs(minimumX, maximumX, minimumY, maximumY));
+        }
+
+        /// <summary>
+        /// Raises the <see cref="VirtualRangeChanged"/> event.
+        /// </summary>
+        /// <param name="minimumX">The minimum x.</param>
+        /// <param name="maximumX">The maximum x.</param>
+        /// <param name="minimumY">The minimum y.</param>
+        /// <param name="maximumY">The maximum y.</param>
+        protected virtual void OnVirtualRangeChanged(GraphDataPoint minimumX, GraphDataPoint maximumX, GraphDataPoint minimumY, GraphDataPoint maximumY)
+        {
+            var range = new RangeChangedEventArgs(minimumX, maximumX, minimumY, maximumY);
+            VirtualRangeChanged?.Invoke(this, range);
+        }
+
+        /// <summary>
+        /// Converts the specified relative x position to graph absolute position.
+        /// </summary>
+        /// <param name="x">The relative x position.</param>
+        /// <returns></returns>
+        protected virtual float ConvertXValueToRendererValue(double x)
+        {
+            return (float)(x * Surface.GetSize().Width / 100);
+        }
+
+        /// <summary>
+        /// Converts the specified relative y position to graph absolute position.
+        /// </summary>
+        /// <param name="y">The relative y position.</param>
+        /// <returns></returns>
+        protected virtual float ConvertYValueToRendererValue(double y)
+        {
+            return (float)(Surface.GetSize().Height - (y * Surface.GetSize().Height / 100));
+        }
+
+        #endregion
+
+        #region Surface Event Handlers
+
+        /// <summary>
+        /// Handles the ZoomRectChanged event of the Surface control.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        private void Surface_ZoomRectChanged(object sender, EventArgs e)
+        {
+            if (!_pending_series_collection.ToList().SelectMany(x => x).ToList().Exists(x => x.IsUpdateSeries))
+            {
+                List<PendingSeries> updateSeries = new List<PendingSeries>();
+
+                foreach (var pending_Series in _to_render)
+                {
+                    updateSeries.Add(new PendingSeries()
+                    {
+                        IsUpdateSeries = true,
+                        Series = pending_Series.Value.Series,
+                        XX = new List<GraphDataPoint>(),
+                        YY = new List<GraphDataPoint>(),
+                    });
+                }
+
+                _pending_series_collection.BlockEnqueue(updateSeries);
+            }
+        }
+
+        /// <summary>
+        /// Handles the SurfaceSizeChanged event of the Surface control.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        private void Surface_SurfaceSizeChanged(object sender, EventArgs e)
+        {
+            if (!_pending_series_collection.ToList().SelectMany(x => x).ToList().Exists(x => x.IsUpdateSeries))
+            {
+                List<PendingSeries> updateSeries = new List<PendingSeries>();
+
+                foreach (var pending_Series in _to_render)
+                {
+                    updateSeries.Add(new PendingSeries()
+                    {
+                        IsUpdateSeries = true,
+                        Series = pending_Series.Value.Series,
+                        XX = new List<GraphDataPoint>(),
+                        YY = new List<GraphDataPoint>(),
+                    });
+                }
+
+                _pending_series_collection.BlockEnqueue(updateSeries);
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Submits the specified x and y data points.
+        /// If the controller has more than one data series the data points will be duplicated.
+        /// </summary>
+        /// <param name="x">X data point.</param>
+        /// <param name="y">Y data point.</param>
+        public void PushData(TXDataPoint x, TYDataPoint y)
+        {
+            if (DataSeriesCollection.Count == 0) return;
+
+            List<List<TXDataPoint>> xxxx = new List<List<TXDataPoint>>();
+            List<List<TYDataPoint>> yyyy = new List<List<TYDataPoint>>();
+
+            foreach (var series in DataSeriesCollection.ToList())
+            {
+                xxxx.Add(new List<TXDataPoint>() { x });
+                yyyy.Add(new List<TYDataPoint>() { y });
+            }
+
+            PushData(xxxx, yyyy);
+        }
+
+        /// <summary>
+        /// Submits the specified collections of x and y data points.
+        /// If the controller has more than one data series the data points will be distributed evenly.
+        /// </summary>
+        /// <param name="xx">X data point collection.</param>
+        /// <param name="yy">Y data point collection.</param>
+        public void PushData(IEnumerable<TXDataPoint> xx, IEnumerable<TYDataPoint> yy)
+        {
+            if (DataSeriesCollection.Count == 0) return;
+
+            var xList = xx.ToList();
+            var yList = yy.ToList();
+
+            List<List<TXDataPoint>> xxxx = new List<List<TXDataPoint>>();
+            List<List<TYDataPoint>> yyyy = new List<List<TYDataPoint>>();
+
+            foreach (var series in DataSeriesCollection.ToList())
+            {
+                xxxx.Add(new List<TXDataPoint>());
+                yyyy.Add(new List<TYDataPoint>());
+            }
+
+            int counter = 0;
+
+            for (int i = 0; i < xList.Count; i++)
+            {
+                xxxx[counter].Add(xList[i]);
+                yyyy[counter].Add(yList[i]);
+
+                counter++;
+
+                if (counter >= xxxx.Count)
+                {
+                    counter = 0;
+                }
+            }
+
+            PushData(xxxx, yyyy);
+        }
+
+        /// <summary>
+        /// Submits a matrix of x and y data points. Meaning each data series should process a single collection of x/y data points.
+        /// </summary>
+        /// <param name="xxxx">X matrix.</param>
+        /// <param name="yyyy">Y matrix.</param>
+        public void PushData(IEnumerable<IEnumerable<TXDataPoint>> xxxx, IEnumerable<IEnumerable<TYDataPoint>> yyyy)
+        {
+            if (DataSeriesCollection.Count == 0) return;
+
+            IEnumerable<IEnumerable<GraphDataPoint>> xxxxI = xxxx.Select(x => x.ToList()).ToList();
+            IEnumerable<IEnumerable<GraphDataPoint>> yyyyI = yyyy.Select(x => x.ToList()).ToList();
+
+            List<List<GraphDataPoint>> xxxxList = xxxxI.Select(x => x.ToList()).ToList();
+            List<List<GraphDataPoint>> yyyyList = yyyyI.Select(x => x.ToList()).ToList();
+
+            int first_count_x = xxxxList[0].Count;
+            int first_count_y = yyyyList[0].Count;
+
+
+            bool is_data_valid = true;
+
+            for (int i = 0; i < xxxxList.Count; i++)
+            {
+                if (xxxxList[0].Count != first_count_x)
+                {
+                    is_data_valid = false;
+                    break;
+                }
+
+                if (xxxxList[0].Count != yyyyList[0].Count)
+                {
+                    is_data_valid = false;
+                    break;
+                }
+            }
+
+            if (!is_data_valid)
+            {
+                throw new ArgumentOutOfRangeException("When pushing data to a multi series renderer, each series must contain the same amount of data.");
+            }
+
+            var list = DataSeriesCollection.ToList();
+
+            var pending_list = new List<PendingSeries>();
+
+            for (int i = 0; i < list.Count; i++)
+            {
+                pending_list.Add(new PendingSeries()
+                {
+                    Series = list[i],
+                    XX = xxxxList[i].ToList(),
+                    YY = yyyyList[i].ToList(),
+                });
+            }
+
+            _pending_series_collection.BlockEnqueue(pending_list);
+        }
+
+        /// <summary>
+        /// Clears all data points from this controller.
+        /// </summary>
+        public void Clear()
+        {
             _clear = true;
 
-            _pending_series_collection.BlockEnqueue(new List<PendingSeries>()
-            {
-                  new PendingSeries()
-                  {
-                      IsClearSeries = true
-                  },
-            });
-        }
-
-        /// <summary>
-        /// Requests the controller to invoke a virtual range change event.
-        /// </summary>
-        public void RequestVirtualRangeChange()
-        {
-            OnVirtualRangeChanged(Range.MaximumX, Range.MaximumX, Range.MinimumY, Range.MaximumY);
+            _pending_series_collection.BlockEnqueue(new List<PendingSeries>()
+            {
+                  new PendingSeries()
+                  {
+                      IsClearSeries = true
+                  },
+            });
+        }
+
+        /// <summary>
+        /// Requests the controller to invoke a virtual range change event.
+        /// </summary>
+        public void RequestVirtualRangeChange()
+        {
+            OnVirtualRangeChanged(Range.MaximumX, Range.MaximumX, Range.MinimumY, Range.MaximumY);
         }
 
         /// <summary>
@@ -747,8 +752,8 @@ public IGraphDataPoint TranslateSurfaceY(double surfaceYPosition)
             {
                 return default(IGraphDataPoint);
             }
-        }
-
-        #endregion
-    }
-}
+        }
+
+        #endregion
+    }
+}
diff --git a/RealTimeGraphX/GraphDataPoint.cs b/RealTimeGraphX/GraphDataPoint.cs
index f1bbcfc..99f63fb 100644
--- a/RealTimeGraphX/GraphDataPoint.cs
+++ b/RealTimeGraphX/GraphDataPoint.cs
@@ -256,6 +256,14 @@ public Type Type
         /// <returns></returns>
         public abstract IGraphDataPoint GetDefaultMargins();
 
+        /// <summary>
+        /// Expands the range by adding factor * ( max - min ) to the max and subtracting the same value from the min.
+        /// </summary>
+        /// <param name="min"></param>
+        /// <param name="max"></param>
+        /// <param name="factor"></param>
+        public abstract void ExpandRange ( ref GraphDataPoint min, ref GraphDataPoint max, double factor ) ;
+
         #endregion
     }
 

From 06c78dd99e24b48737254fcb0f67b713cce60f6a Mon Sep 17 00:00:00 2001
From: PhilJollans <phil@jollans.com>
Date: Tue, 4 Oct 2022 20:56:01 +0200
Subject: [PATCH 15/15] Update versions to 1.0.0.3

---
 RealTimeGraphX.WPF.Demo/Properties/AssemblyInfo.cs | 4 ++--
 RealTimeGraphX.WPF/Properties/AssemblyInfo.cs      | 4 ++--
 RealTimeGraphX/RealTimeGraphX.csproj               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/RealTimeGraphX.WPF.Demo/Properties/AssemblyInfo.cs b/RealTimeGraphX.WPF.Demo/Properties/AssemblyInfo.cs
index 8c3e28c..9910ab1 100644
--- a/RealTimeGraphX.WPF.Demo/Properties/AssemblyInfo.cs
+++ b/RealTimeGraphX.WPF.Demo/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.2")]
-[assembly: AssemblyFileVersion("1.0.0.2")]
+[assembly: AssemblyVersion("1.0.0.3")]
+[assembly: AssemblyFileVersion("1.0.0.3")]
diff --git a/RealTimeGraphX.WPF/Properties/AssemblyInfo.cs b/RealTimeGraphX.WPF/Properties/AssemblyInfo.cs
index 78aec8b..9b0cc8e 100644
--- a/RealTimeGraphX.WPF/Properties/AssemblyInfo.cs
+++ b/RealTimeGraphX.WPF/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.2")]
-[assembly: AssemblyFileVersion("1.0.0.2")]
+[assembly: AssemblyVersion("1.0.0.3")]
+[assembly: AssemblyFileVersion("1.0.0.3")]
diff --git a/RealTimeGraphX/RealTimeGraphX.csproj b/RealTimeGraphX/RealTimeGraphX.csproj
index acad1a6..c8e847f 100644
--- a/RealTimeGraphX/RealTimeGraphX.csproj
+++ b/RealTimeGraphX/RealTimeGraphX.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>1.0.0.2</Version>
+    <Version>1.0.0.3</Version>
     <Description>RealTimeGraphX is a data type agnostic, high performance plotting library for WPF and UWP.</Description>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/royben/RealTimeGraphX</PackageProjectUrl>