Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

22 files changed, 272 insertions, 338 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Graph/WpfGraphController.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Graph/WpfGraphController.cs
deleted file mode 100644
index 63ce7035e..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Graph/WpfGraphController.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using RealTimeGraphX;
-using RealTimeGraphX.DataPoints;
-using RealTimeGraphX.Renderers;
-using RealTimeGraphX.WPF.DataSeries;
-using RealTimeGraphX.WPF.Painters;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Media;
-
-namespace Tango.MachineStudio.ColorCapture.Graph
-{
-    public class WpfGraphController : GraphControllerBase<WpfDataSeries, DoubleDataPoint, DoubleDataPoint>
-    {
-        public WpfGraphController(int refreshRate = 50)
-        {
-            AddDataSeries(new WpfDataSeries()
-            {
-                 StrokeThickness = 1,
-                 Stroke = Colors.DodgerBlue,
-            });
-
-            var renderer = new GraphScrollingRenderer<WpfDataSeries, DoubleDataPoint, DoubleDataPoint>()
-            {
-                RefreshRate = TimeSpan.FromMilliseconds(refreshRate)
-            };
-
-            var painter = new WpfScrollingGraphPainter();
-
-            ConnectOutput(renderer);
-            renderer.ConnectOutput(painter);
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Tango.MachineStudio.ColorCapture.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Tango.MachineStudio.ColorCapture.csproj
index c30520f13..b399d9971 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Tango.MachineStudio.ColorCapture.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Tango.MachineStudio.ColorCapture.csproj
@@ -100,7 +100,6 @@
     <Compile Include="ColorLabModule.cs" />
     <Compile Include="Controls\ColorMatrixControl.cs" />
     <Compile Include="Controls\IndexedUniformGrid.cs" />
-    <Compile Include="Graph\WpfGraphController.cs" />
     <Compile Include="Models\BenchmarkItem.cs" />
     <Compile Include="Models\CaptureConfig.cs" />
     <Compile Include="Models\CaptureItem.cs" />
@@ -139,12 +138,12 @@
       <Project>{37e4ceab-b54b-451f-b535-04cf7da9c459}</Project>
       <Name>ColorMine</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\SideChains\RealTimeGraphX.WPF\RealTimeGraphX.WPF.csproj">
-      <Project>{99d233c5-fee7-418e-9c25-d4584cb52e28}</Project>
+    <ProjectReference Include="..\..\..\SideChains\RealTimeGraphX-master\RealTimeGraphX.WPF\RealTimeGraphX.WPF.csproj">
+      <Project>{6b9774f7-960d-438e-ad81-c6b9be328d50}</Project>
       <Name>RealTimeGraphX.WPF</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\SideChains\RealTimeGraphX\RealTimeGraphX.csproj">
-      <Project>{6d55a3b8-46d3-493a-a143-aebd2b98d683}</Project>
+    <ProjectReference Include="..\..\..\SideChains\RealTimeGraphX-master\RealTimeGraphX\RealTimeGraphX.csproj">
+      <Project>{f13a489c-80ee-4cd0-bdd4-92d959215646}</Project>
       <Name>RealTimeGraphX</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.BL\Tango.BL.csproj">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs
index 5ea5747d5..31eec0871 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs
@@ -2,6 +2,8 @@
 using ColorMine.ColorSpaces.Comparisons;
 using Microsoft.Win32;
 using Microsoft.WindowsAPICodePack.Dialogs;
+using RealTimeGraphX.DataPoints;
+using RealTimeGraphX.WPF;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -16,7 +18,6 @@ using Tango.Core;
 using Tango.Core.Commands;
 using Tango.CSV;
 using Tango.Logging;
-using Tango.MachineStudio.ColorCapture.Graph;
 using Tango.MachineStudio.ColorCapture.Models;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Notifications;
@@ -106,7 +107,7 @@ namespace Tango.MachineStudio.ColorCapture.ViewModels
 
         public double DeltaE { get; set; }
 
-        public WpfGraphController CaptureDeltaEController { get; set; }
+        public WpfGraphController<DoubleDataPoint, DoubleDataPoint> CaptureDeltaEController { get; set; }
 
         public RelayCommand ToggleCameraCommand { get; set; }
 
@@ -169,7 +170,11 @@ namespace Tango.MachineStudio.ColorCapture.ViewModels
             Benchmarks = new ObservableCollection<BenchmarkItem>();
             _cardDetector = new CardDetector();
             ToggleCameraCommand = new RelayCommand(ToggleCamera);
-            CaptureDeltaEController = new WpfGraphController();
+            CaptureDeltaEController = new WpfGraphController<DoubleDataPoint, DoubleDataPoint>();
+            CaptureDeltaEController.DataSeriesCollection.Add(new WpfGraphDataSeries()
+            {
+                Stroke = System.Windows.Media.Colors.DodgerBlue,
+            });
             CaptureDeltaEController.Range.AutoY = true;
             CaptureDeltaEController.Range.MaximumX = 1000;
 
@@ -461,6 +466,11 @@ namespace Tango.MachineStudio.ColorCapture.ViewModels
                 }
             }
 
+            if (double.IsInfinity(DeltaE))
+            {
+                DeltaE = 0;
+            }
+
             CaptureDeltaEController.PushData(_sampleCounter++, DeltaE);
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml
index ba8e3f281..afdac7e18 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml
@@ -9,12 +9,11 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:vm="clr-namespace:Tango.MachineStudio.ColorCapture.ViewModels"
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:graphX="clr-namespace:RealTimeGraphX.WPF.Surfaces;assembly=RealTimeGraphX.WPF"
-             xmlns:componentsX="clr-namespace:RealTimeGraphX.WPF.Components;assembly=RealTimeGraphX.WPF"
+             xmlns:commonControls="clr-namespace:Tango.MachineStudio.Common.Controls;assembly=Tango.MachineStudio.Common"
              xmlns:controls="clr-namespace:Tango.MachineStudio.ColorCapture.Controls"
              xmlns:sharedControls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:tcc="clr-namespace:Tango.TCC.BL;assembly=Tango.TCC.BL"
-             xmlns:realtimeGraphX="clr-namespace:RealTimeGraphX.WPF.Surfaces;assembly=RealTimeGraphX.WPF"
+             xmlns:realtimeGraphX="clr-namespace:RealTimeGraphX.WPF;assembly=RealTimeGraphX.WPF"
              xmlns:global="clr-namespace:Tango.MachineStudio.ColorCapture"
              xmlns:local="clr-namespace:Tango.MachineStudio.ColorCapture.Views"
              mc:Ignorable="d" 
@@ -435,14 +434,14 @@
                                             </Grid.ColumnDefinitions>
 
                                             <Border Margin="0 1 0 2">
-                                                <componentsX:GraphAxisControl Orientation="Vertical" Foreground="{StaticResource Accent}" FontSize="12" Surface="{Binding ElementName=Graph}" StringFormat="Δ 0.00;-#" />
+                                                <realtimeGraphX:WpfGraphAxisControl Orientation="Vertical" Foreground="{StaticResource Accent}" FontSize="12" Controller="{Binding CaptureDeltaEController}" StringFormat="Δ 0.00;-#" />
                                             </Border>
                                             <Border Grid.Column="1" BorderThickness="1" BorderBrush="{StaticResource Accent}" Margin="1 0 0 0" Background="{StaticResource LightBackground}">
                                                 <Grid>
 
-                                                    <componentsX:GraphGridLines Foreground="#3E3E3E" />
+                                                    <realtimeGraphX:WpfGraphGridLines Foreground="#3E3E3E" />
 
-                                                    <graphX:WpfGraphSurface x:Name="Graph"></graphX:WpfGraphSurface>
+                                                    <realtimeGraphX:WpfGraphSurface Controller="{Binding CaptureDeltaEController}"></realtimeGraphX:WpfGraphSurface>
                                                 </Grid>
                                             </Border>
                                         </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs
index 05b5daf7e..aa7ff5d49 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs
@@ -29,7 +29,6 @@ namespace Tango.MachineStudio.ColorCapture.Views
             Loaded += (_, __) => 
             {
                 _vm = DataContext as MainViewVM;
-                _vm.CaptureDeltaEController.Output.Output.ConnectOutput(Graph);
             };
         }
     }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
index 190e8d0fe..cd00557b1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
@@ -196,10 +196,6 @@
       <Project>{37e4ceab-b54b-451f-b535-04cf7da9c459}</Project>
       <Name>ColorMine</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\SideChains\RealTimeGraphEx\RealTimeGraphEx.csproj">
-      <Project>{b9ae25d6-be35-492f-9079-21a7f3e6f7cc}</Project>
-      <Name>RealTimeGraphEx</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\SideChains\Tango.AutoComplete\Tango.AutoComplete.csproj">
       <Project>{BB2ABB74-BA58-4812-83AA-EC8171F42DF4}</Project>
       <Name>Tango.AutoComplete</Name>
@@ -361,7 +357,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml
index 22fd8eaa8..9b9334355 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml
@@ -32,7 +32,7 @@
         <!--Content-->
         <Grid>
             <!--<Viewbox Stretch="Fill">-->
-            <controls:RealTimeGraphControl x:Name="InnerGraph" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}" x:FieldModifier="public"  DisplayName="{Binding TechMonitor.Description}" DisplayUnits="{Binding TechMonitor.Units}" StringFormat="{Binding DecimalPlaces,Converter={StaticResource DecimalPlacesToStringFormatConverter}}" />
+            <controls:WpfGraphControl x:Name="InnerGraph" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}" x:FieldModifier="public"  DisplayName="{Binding TechMonitor.Description}" DisplayUnits="{Binding TechMonitor.Units}" StringFormat="{Binding DecimalPlaces,Converter={StaticResource DecimalPlacesToStringFormatConverter}}" />
             <!--</Viewbox>-->
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml
index ca2481de6..622ddfa8b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml
@@ -32,9 +32,9 @@
         <!--Content-->
         <Grid>
             <!--<Viewbox Stretch="Fill">-->
-            <controls:RealTimeGraphControl x:Name="InnerGraph" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}" x:FieldModifier="public" DisplayName="{Binding TechMonitor.Description}" DisplayUnits="{Binding TechMonitor.Units}" StringFormat="{Binding DecimalPlaces,Converter={StaticResource DecimalPlacesToStringFormatConverter}}">
+            <controls:WpfGraphControl x:Name="InnerGraph" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}" x:FieldModifier="public" DisplayName="{Binding TechMonitor.Description}" DisplayUnits="{Binding TechMonitor.Units}" StringFormat="{Binding DecimalPlaces,Converter={StaticResource DecimalPlacesToStringFormatConverter}}">
 
-            </controls:RealTimeGraphControl>
+            </controls:WpfGraphControl>
             <!--</Viewbox>-->
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
index 7e6f4e111..ff45bcbf9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
@@ -522,16 +522,12 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\SideChains\RealTimeGraphEx\RealTimeGraphEx.csproj">
-      <Project>{b9ae25d6-be35-492f-9079-21a7f3e6f7cc}</Project>
-      <Name>RealTimeGraphEx</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\SideChains\RealTimeGraphX.WPF\RealTimeGraphX.WPF.csproj">
-      <Project>{99d233c5-fee7-418e-9c25-d4584cb52e28}</Project>
+    <ProjectReference Include="..\..\..\SideChains\RealTimeGraphX-master\RealTimeGraphX.WPF\RealTimeGraphX.WPF.csproj">
+      <Project>{6b9774f7-960d-438e-ad81-c6b9be328d50}</Project>
       <Name>RealTimeGraphX.WPF</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\SideChains\RealTimeGraphX\RealTimeGraphX.csproj">
-      <Project>{6d55a3b8-46d3-493a-a143-aebd2b98d683}</Project>
+    <ProjectReference Include="..\..\..\SideChains\RealTimeGraphX-master\RealTimeGraphX\RealTimeGraphX.csproj">
+      <Project>{f13a489c-80ee-4cd0-bdd4-92d959215646}</Project>
       <Name>RealTimeGraphX</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.BL\Tango.BL.csproj">
@@ -728,7 +724,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechGraphController.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechGraphController.cs
index 28c75f79f..ca132095c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechGraphController.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechGraphController.cs
@@ -1,8 +1,7 @@
 using RealTimeGraphX;
 using RealTimeGraphX.DataPoints;
 using RealTimeGraphX.Renderers;
-using RealTimeGraphX.WPF.DataSeries;
-using RealTimeGraphX.WPF.Painters;
+using RealTimeGraphX.WPF;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,19 +10,11 @@ using System.Threading.Tasks;
 
 namespace Tango.MachineStudio.Technician
 {
-    public class TechGraphController : GraphControllerBase<WpfDataSeries, TimeSpanDataPoint, DoubleDataPoint>
+    public class TechGraphController : WpfGraphController<TimeSpanDataPoint, DoubleDataPoint>
     {
         public TechGraphController(int refreshRate = 50)
         {
-            var renderer = new GraphScrollingRenderer<WpfDataSeries, TimeSpanDataPoint, DoubleDataPoint>()
-            {
-                RefreshRate = TimeSpan.FromMilliseconds(refreshRate)
-            };
-
-            var painter = new WpfScrollingGraphPainter();
-
-            ConnectOutput(renderer);
-            renderer.ConnectOutput(painter);
+            RefreshRate = TimeSpan.FromMilliseconds(50);
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs
index 377738d09..1412175a0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs
@@ -1,4 +1,5 @@
 using RealTimeGraphX.DataPoints;
+using RealTimeGraphX.WPF;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -213,7 +214,7 @@ namespace Tango.MachineStudio.Technician.TechItems
         {
             if (Editor != null)
             {
-                var controller = Editor.InnerGraph.Controller;
+                var controller = Editor.InnerGraph.Controller as WpfGraphController<TimeSpanDataPoint,DoubleDataPoint>;
 
                 controller.Range.MaximumX = new TimeSpanDataPoint(TimeSpan.FromSeconds(_duration));
                 controller.Range.MinimumY = new DoubleDataPoint(_min);
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs
index 808dadb68..8ccd5e718 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs
@@ -1,4 +1,5 @@
 using RealTimeGraphX.DataPoints;
+using RealTimeGraphX.WPF;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -217,7 +218,7 @@ namespace Tango.MachineStudio.Technician.TechItems
         {
             if (Editor != null)
             {
-                var controller = Editor.InnerGraph.Controller;
+                var controller = Editor.InnerGraph.Controller as WpfGraphController<TimeSpanDataPoint, DoubleDataPoint>; ;
 
                 controller.Range.MaximumX = new TimeSpanDataPoint(TimeSpan.FromSeconds(_duration));
                 controller.Range.MinimumY = new DoubleDataPoint(_min);
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index e78047563..72e43d7b0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -1,6 +1,5 @@
 using Google.Protobuf.Collections;
 using Microsoft.Win32;
-using RealTimeGraphEx.Controllers;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -36,9 +35,9 @@ using Tango.MachineStudio.Technician.Models;
 using Tango.Logging;
 using Microsoft.WindowsAPICodePack.Dialogs;
 using RealTimeGraphX;
-using RealTimeGraphX.WPF.DataSeries;
 using RealTimeGraphX.DataPoints;
 using Tango.MachineStudio.Technician.Views;
+using RealTimeGraphX.WPF;
 
 namespace Tango.MachineStudio.Technician.ViewModels
 {
@@ -1024,7 +1023,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     var editor = element as SingleGraphElementEditor;
 
                     TechGraphController controller = new TechGraphController();
-                    controller.AddDataSeries(new WpfDataSeries()
+                    controller.DataSeriesCollection.Add(new WpfGraphDataSeries()
                     {
                         Stroke = Colors.DodgerBlue,
                     });
@@ -1043,7 +1042,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
                     for (int i = 0; i < graphItem.TechMonitor.ChannelCount; i++)
                     {
-                        controller.AddDataSeries(new WpfDataSeries()
+                        controller.DataSeriesCollection.Add(new WpfGraphDataSeries()
                         {
                             Stroke = ColorHelper.GetRandomColor(),
                             Name = graphItem.TechMonitor.Name.First() + (i + 1).ToString(),
@@ -1437,7 +1436,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
             controller.Range.MaximumY = item.TechMonitor.Max;
             controller.Range.MaximumX = TimeSpan.FromSeconds(10);
 
-            controller.AddDataSeries(new WpfDataSeries()
+            controller.DataSeriesCollection.Add(new WpfGraphDataSeries()
             {
                 Stroke = Colors.DodgerBlue,
             });
@@ -1498,7 +1497,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
             for (int i = 0; i < item.TechMonitor.ChannelCount; i++)
             {
-                controller.AddDataSeries(new WpfDataSeries()
+                controller.DataSeriesCollection.Add(new WpfGraphDataSeries()
                 {
                     Stroke = ColorHelper.GetRandomColor(),
                     Name = item.TechMonitor.Name.First() + (i + 1).ToString(),
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
index 92e2b292a..8820fcd4d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
@@ -26,9 +26,9 @@
         <localConverters:SecondsToTimeSpanConverter x:Key="SecondsToTimeSpanConverter" />
 
         <DataTemplate x:Key="TabTemplate">
-            <Grid>
-                <Grid.Style>
-                    <Style TargetType="Grid">
+            <Border IsVisibleChanged="Border_IsVisibleChanged">
+                <Border.Style>
+                    <Style TargetType="Border">
                         <Setter Property="Visibility" Value="Visible"></Setter>
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding IsSelected}" Value="False">
@@ -36,12 +36,13 @@
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
-                </Grid.Style>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <editors:ElementsEditor 
+                </Border.Style>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <editors:ElementsEditor 
                         x:Name="editor"
                         Elements="{Binding Elements}"
                         Loaded="Editor_Loaded"
@@ -61,63 +62,64 @@
                         BorderBrush="#1EA9FF" 
                         BorderThickness="1">
 
-                    <editors:ElementsEditor.Style>
-                        <Style TargetType="editors:ElementsEditor">
-                            <Setter Property="IsEditable" Value="True"></Setter>
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding ElementName=listMode,Path=SelectedIndex}" Value="1">
-                                    <Setter Property="IsEditable" Value="False"></Setter>
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </editors:ElementsEditor.Style>
+                        <editors:ElementsEditor.Style>
+                            <Style TargetType="editors:ElementsEditor">
+                                <Setter Property="IsEditable" Value="True"></Setter>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding ElementName=listMode,Path=SelectedIndex}" Value="1">
+                                        <Setter Property="IsEditable" Value="False"></Setter>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </editors:ElementsEditor.Style>
 
-                    <editors:ElementsEditor.ContextMenu>
-                        <ContextMenu DataContext="{Binding Path=PlacementTarget, RelativeSource={RelativeSource Self}}">
-                            <MenuItem Header="Cut (Ctrl+X)" Command="{Binding CutCommand}" MinWidth="210">
-                                <MenuItem.Icon>
-                                    <fa:ImageAwesome Icon="Cut" Width="16" />
-                                </MenuItem.Icon>
-                            </MenuItem>
-                            <MenuItem Header="Copy (Ctrl+C)" Command="{Binding CopyCommand}">
-                                <MenuItem.Icon>
-                                    <fa:ImageAwesome Icon="Copy" Width="16" />
-                                </MenuItem.Icon>
-                            </MenuItem>
-                            <MenuItem Header="Paste (Ctrl+V)" Command="{Binding PasteCommand}">
-                                <MenuItem.Icon>
-                                    <fa:ImageAwesome Icon="Paste" Width="16" />
-                                </MenuItem.Icon>
-                            </MenuItem>
-                            <Separator/>
-                            <MenuItem Header="Undo (Ctrl+Z)" Command="{Binding UndoCommand}">
-                                <MenuItem.Icon>
-                                    <fa:ImageAwesome Icon="Undo" Width="16" />
-                                </MenuItem.Icon>
-                            </MenuItem>
-                            <MenuItem Header="Redo (Ctrl+Y)" Command="{Binding RedoCommand}">
-                                <MenuItem.Icon>
-                                    <fa:ImageAwesome Icon="RotateRight" Width="16"></fa:ImageAwesome>
-                                </MenuItem.Icon>
-                            </MenuItem>
-                            <Separator/>
-                            <MenuItem Header="Delete (DELETE)" Command="{Binding DeleteCommand}">
-                                <MenuItem.Icon>
-                                    <fa:ImageAwesome Icon="Recycle" Width="16" />
-                                </MenuItem.Icon>
-                            </MenuItem>
-                            <Separator/>
-                            <MenuItem Header="Select All (Ctrl+A)" Command="{Binding SelectAllCommand}">
-                                <MenuItem.Icon>
-                                    <fa:ImageAwesome Icon="Th" Width="16" />
-                                </MenuItem.Icon>
-                            </MenuItem>
-                        </ContextMenu>
-                    </editors:ElementsEditor.ContextMenu>
-                </editors:ElementsEditor>
+                        <editors:ElementsEditor.ContextMenu>
+                            <ContextMenu DataContext="{Binding Path=PlacementTarget, RelativeSource={RelativeSource Self}}">
+                                <MenuItem Header="Cut (Ctrl+X)" Command="{Binding CutCommand}" MinWidth="210">
+                                    <MenuItem.Icon>
+                                        <fa:ImageAwesome Icon="Cut" Width="16" />
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="Copy (Ctrl+C)" Command="{Binding CopyCommand}">
+                                    <MenuItem.Icon>
+                                        <fa:ImageAwesome Icon="Copy" Width="16" />
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="Paste (Ctrl+V)" Command="{Binding PasteCommand}">
+                                    <MenuItem.Icon>
+                                        <fa:ImageAwesome Icon="Paste" Width="16" />
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <Separator/>
+                                <MenuItem Header="Undo (Ctrl+Z)" Command="{Binding UndoCommand}">
+                                    <MenuItem.Icon>
+                                        <fa:ImageAwesome Icon="Undo" Width="16" />
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Header="Redo (Ctrl+Y)" Command="{Binding RedoCommand}">
+                                    <MenuItem.Icon>
+                                        <fa:ImageAwesome Icon="RotateRight" Width="16"></fa:ImageAwesome>
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <Separator/>
+                                <MenuItem Header="Delete (DELETE)" Command="{Binding DeleteCommand}">
+                                    <MenuItem.Icon>
+                                        <fa:ImageAwesome Icon="Recycle" Width="16" />
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <Separator/>
+                                <MenuItem Header="Select All (Ctrl+A)" Command="{Binding SelectAllCommand}">
+                                    <MenuItem.Icon>
+                                        <fa:ImageAwesome Icon="Th" Width="16" />
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                            </ContextMenu>
+                        </editors:ElementsEditor.ContextMenu>
+                    </editors:ElementsEditor>
 
-                <Slider Grid.Column="1" Orientation="Vertical" Margin="5" Maximum="3" Minimum="0.2" Value="{Binding ElementName=editor,Path=ScaleFactor}"></Slider>
-            </Grid>
+                    <Slider Grid.Column="1" Orientation="Vertical" Margin="5" Maximum="3" Minimum="0.2" Value="{Binding ElementName=editor,Path=ScaleFactor}"></Slider>
+                </Grid>
+            </Border>
         </DataTemplate>
     </UserControl.Resources>
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml.cs
index 694debd26..e4ebe2424 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml.cs
@@ -23,11 +23,14 @@ namespace Tango.MachineStudio.Technician.Views
     public partial class MachineTechView : UserControl
     {
         private MachineTechViewVM _vm;
+        private Dictionary<Border, UIElement> _tabs_content;
 
         public MachineTechView()
         {
             InitializeComponent();
 
+            _tabs_content = new Dictionary<Border, UIElement>();
+
             this.Loaded += (x, y) => 
             {
                 _vm = DataContext as MachineTechViewVM;
@@ -67,5 +70,22 @@ namespace Tango.MachineStudio.Technician.Views
 
             (editor.UndoRedoStatesProvider as ElementsEditorUndoRedoStatesProvider).StateExecuted += MachineTechView_StateExecuted;
         }
+
+        private void Border_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            Border border = sender as Border;
+            if (border.Visibility != Visibility.Visible)
+            {
+                _tabs_content[border] = border.Child;
+                border.Child = null;
+            }
+            else
+            {
+                if (_tabs_content.ContainsKey(border))
+                {
+                    border.Child = _tabs_content[border];
+                }
+            }
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/IRealTimeGraph.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/IRealTimeGraph.cs
deleted file mode 100644
index dcf2cdf81..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/IRealTimeGraph.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using RealTimeGraphEx;
-using RealTimeGraphEx.Controllers;
-using RealTimeGraphX;
-using RealTimeGraphX.WPF.DataSeries;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Tango.MachineStudio.Common.Controls
-{
-    public interface IRealTimeGraph
-    {
-        /// <summary>
-        /// Gets or sets the name of the sensor.
-        /// </summary>
-        String DisplayName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tag.
-        /// </summary>
-        Object Tag { get; set; }
-
-        /// <summary>
-        /// Gets or sets the sensor units.
-        /// </summary>
-        String DisplayUnits { get; set; }
-
-        /// <summary>
-        /// Gets or sets the inner graph controller.
-        /// </summary>
-        IGraphController<WpfDataSeries> Controller { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphControl.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphControl.xaml
deleted file mode 100644
index b5e809a3e..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphControl.xaml
+++ /dev/null
@@ -1,65 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.Common.Controls.RealTimeGraphControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:graphEx="clr-namespace:RealTimeGraphEx.FastGraphs;assembly=RealTimeGraphEx"
-             xmlns:graphX="clr-namespace:RealTimeGraphX.WPF.Surfaces;assembly=RealTimeGraphX.WPF"
-             xmlns:componentsX="clr-namespace:RealTimeGraphX.WPF.Components;assembly=RealTimeGraphX.WPF"
-             xmlns:components="clr-namespace:RealTimeGraphEx.Components;assembly=RealTimeGraphEx"
-             xmlns:converters="clr-namespace:Tango.MachineStudio.Common.Converters"
-             xmlns:local="clr-namespace:Tango.MachineStudio.Common.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="150" d:DesignWidth="300">
-
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Resources/MaterialDesign.xaml"></ResourceDictionary>
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </UserControl.Resources>
-
-    <Grid >
-        <Border Background="{DynamicResource graphBackground}" Padding="20" CornerRadius="5" BorderThickness="1" BorderBrush="DodgerBlue">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="41*"/>
-                <RowDefinition Height="30"/>
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="55"/>
-                <ColumnDefinition Width="438*"/>
-            </Grid.ColumnDefinitions>
-
-            <Border BorderBrush="{StaticResource AccentColorBrush}" Margin="0 1 0 2">
-                    <componentsX:GraphAxisControl Foreground="DodgerBlue" Orientation="Vertical" FontSize="10" Surface="{Binding ElementName=Graph}" StringFormat="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=StringFormat}" />
-            </Border>
-            <Border Grid.Column="1" BorderThickness="1" BorderBrush="#43A0E7FF" Margin="1 0 0 0">
-                <Grid>
-
-                    <componentsX:GraphGridLines Foreground="#9B545454" />
-
-                    <graphX:WpfGraphSurface x:Name="Graph" x:FieldModifier="public">
-
-                    </graphX:WpfGraphSurface>
-
-                    <Grid>
-                        <Label Style="{StaticResource graphLabel}">
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Foreground="Gainsboro" FontSize="11" VerticalAlignment="Center" Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DisplayName,FallbackValue='Dispenser Motor'}"></TextBlock>
-                                <TextBlock Foreground="Gray" Margin="10 0 0 0" FontSize="11" FontFamily="Sylfaen Regular" VerticalAlignment="Center" Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DisplayUnits,FallbackValue='(hz)'}"></TextBlock>
-                            </StackPanel>
-                        </Label>
-                    </Grid>
-                </Grid>
-            </Border>
-
-            <Border BorderBrush="{StaticResource AccentColorBrush}" Grid.Row="1" Grid.Column="1" Margin="3 0 2 0">
-                    <componentsX:GraphAxisControl Foreground="DodgerBlue" Orientation="Horizontal" FontSize="10" Surface="{Binding ElementName=Graph}" StringFormat="hh\:mm\:ss" />
-            </Border>
-        </Grid>
-        </Border>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphControl.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/WpfGraphControl.cs
index f82196fed..68db76cd5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphControl.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/WpfGraphControl.cs
@@ -1,6 +1,6 @@
-using System;
+using RealTimeGraphX;
+using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -10,68 +10,79 @@ using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using RealTimeGraphEx;
-using RealTimeGraphEx.Controllers;
-using RealTimeGraphX;
-using RealTimeGraphX.WPF.DataSeries;
 
 namespace Tango.MachineStudio.Common.Controls
 {
-    /// <summary>
-    /// Interaction logic for RealTimeGraphControl.xaml
-    /// </summary>
-    public partial class RealTimeGraphControl : UserControl, IRealTimeGraph
+    public class WpfGraphControl : Control
     {
-        #region Properties
-
-        public String DisplayName
+        /// <summary>
+        /// Gets or sets the graph controller.
+        /// </summary>
+        public IGraphController Controller
         {
-            get { return (String)GetValue(DisplayNameProperty); }
-            set { SetValue(DisplayNameProperty, value); }
+            get { return (IGraphController)GetValue(ControllerProperty); }
+            set { SetValue(ControllerProperty, value); }
         }
-        public static readonly DependencyProperty DisplayNameProperty =
-            DependencyProperty.Register("DisplayName", typeof(String), typeof(RealTimeGraphControl), new PropertyMetadata(null));
+        public static readonly DependencyProperty ControllerProperty =
+            DependencyProperty.Register("Controller", typeof(IGraphController), typeof(WpfGraphControl), new PropertyMetadata(null));
 
-        public String DisplayUnits
-        {
-            get { return (String)GetValue(DisplayUnitsProperty); }
-            set { SetValue(DisplayUnitsProperty, value); }
-        }
-        public static readonly DependencyProperty DisplayUnitsProperty =
-            DependencyProperty.Register("DisplayUnits", typeof(String), typeof(RealTimeGraphControl), new PropertyMetadata(null));
 
+        /// <summary>
+        /// Gets or sets the string format of the y-axis.
+        /// </summary>
         public String StringFormat
         {
             get { return (String)GetValue(StringFormatProperty); }
             set { SetValue(StringFormatProperty, value); }
         }
         public static readonly DependencyProperty StringFormatProperty =
-            DependencyProperty.Register("StringFormat", typeof(String), typeof(RealTimeGraphControl), new PropertyMetadata("0.0"));
+            DependencyProperty.Register("StringFormat", typeof(String), typeof(WpfGraphControl), new PropertyMetadata("0.0"));
 
 
+        /// <summary>
+        /// Gets or sets the display name.
+        /// </summary>
+        public String DisplayName
+        {
+            get { return (String)GetValue(DisplayNameProperty); }
+            set { SetValue(DisplayNameProperty, value); }
+        }
+        public static readonly DependencyProperty DisplayNameProperty =
+            DependencyProperty.Register("DisplayName", typeof(String), typeof(WpfGraphControl), new PropertyMetadata(null));
+
 
-        public IGraphController<WpfDataSeries> Controller
+        /// <summary>
+        /// Gets or sets the display units.
+        /// </summary>
+        public String DisplayUnits
         {
-            get { return (IGraphController<WpfDataSeries>)GetValue(ControllerProperty); }
-            set { SetValue(ControllerProperty, value); }
+            get { return (String)GetValue(DisplayUnitsProperty); }
+            set { SetValue(DisplayUnitsProperty, value); }
         }
-        public static readonly DependencyProperty ControllerProperty =
-            DependencyProperty.Register("Controller", typeof(IGraphController<WpfDataSeries>), typeof(RealTimeGraphControl), new PropertyMetadata(null,(d,e) => (d as RealTimeGraphControl).OnControllerChanged()));
+        public static readonly DependencyProperty DisplayUnitsProperty =
+            DependencyProperty.Register("DisplayUnits", typeof(String), typeof(WpfGraphControl), new PropertyMetadata(null));
 
-        private void OnControllerChanged()
+        /// <summary>
+        /// Gets or sets the graph label visibility.
+        /// </summary>
+        public Visibility GraphLabelVisibility
         {
-            Controller.Output.Output.ConnectOutput(Graph);
+            get { return (Visibility)GetValue(GraphLabelVisibilityProperty); }
+            set { SetValue(GraphLabelVisibilityProperty, value); }
         }
+        public static readonly DependencyProperty GraphLabelVisibilityProperty =
+            DependencyProperty.Register("GraphLabelVisibility", typeof(Visibility), typeof(WpfGraphControl), new PropertyMetadata(Visibility.Visible));
 
-        #endregion
 
-        public RealTimeGraphControl()
+        /// <summary>
+        /// Initializes the <see cref="WpfGraphControl"/> class.
+        /// </summary>
+        static WpfGraphControl()
         {
-            InitializeComponent();
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(WpfGraphControl), new FrameworkPropertyMetadata(typeof(WpfGraphControl)));
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
index 2f65fe817..d90d03545 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
@@ -235,39 +235,12 @@
                 <GradientStop Color="#FF333333" Offset="1"/>
             </LinearGradientBrush>
 
-            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphLabelBackground" Opacity="0.7">
-                <GradientStop Color="#252525"/>
-                <GradientStop Color="#FF4E4E4E" Offset="1"/>
-            </LinearGradientBrush>
 
-            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphLegendBackground" Opacity="0.7">
-                <GradientStop Color="#FF848484"/>
-                <GradientStop Color="#FF282828" Offset="1"/>
-            </LinearGradientBrush>
 
             <SolidColorBrush Color="#FFF1F1F1" x:Key="topBarBackgroundBrush"></SolidColorBrush>
             <!--Brushes-->
 
-            <!--Graph Label-->
-            <Style x:Key="graphLabel" TargetType="Label">
-                <Style.Setters>
-                    <Setter Property="IsHitTestVisible" Value="False"></Setter>
-                    <Setter Property="Margin" Value="-1 -1 0 0"></Setter>
-                    <Setter Property="HorizontalAlignment" Value="Left"></Setter>
-                    <Setter Property="VerticalAlignment" Value="Top"></Setter>
-                    <Setter Property="Padding" Value="0"></Setter>
-                    <Setter Property="ContentTemplate">
-                        <Setter.Value>
-                            <DataTemplate>
-                                <Border Width="Auto" Padding="0 0 20 0" Height="25" BorderBrush="{StaticResource AccentColorBrush}" BorderThickness="1" CornerRadius="0 0 30 0" Background="{StaticResource graphLabelBackground}" >
-                                    <Label Margin="5 0 0 0"  HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="12" Content="{Binding}"></Label>
-                                </Border>
-                            </DataTemplate>
-                        </Setter.Value>
-                    </Setter>
-                </Style.Setters>
-            </Style>
-            <!--Graph Label-->
+
 
 
             <!--Graph Ticks Template-->
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index 4cf1855ca..e2bf7792d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -60,6 +60,7 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Speech" />
@@ -87,6 +88,7 @@
     <Compile Include="Controls\MachineView.xaml.cs">
       <DependentUpon>MachineView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Controls\WpfGraphControl.cs" />
     <Compile Include="Converters\UserRoleToBooleanConverter.cs" />
     <Compile Include="Converters\UserRoleToVisibilityConverter.cs" />
     <Compile Include="Web\LoginRequest.cs" />
@@ -100,11 +102,7 @@
     <Compile Include="Controls\HiveComboControl.xaml.cs">
       <DependentUpon>HiveComboControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\IRealTimeGraph.cs" />
     <Compile Include="Controls\LoadingPanel.cs" />
-    <Compile Include="Controls\RealTimeGraphControl.xaml.cs">
-      <DependentUpon>RealTimeGraphControl.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Controls\TableGrid.cs" />
     <Compile Include="Converters\PermissionToVisibilityConverter.cs" />
     <None Include="Converters\SecondsToGraphPointsConverter.cs" />
@@ -177,10 +175,6 @@
     <Compile Include="Navigation\INavigationManager.cs" />
     <Compile Include="Navigation\NavigationView.cs" />
     <Compile Include="Notifications\INotificationProvider.cs" />
-    <Page Include="Controls\RealTimeGraphControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Resources\GradientOffsetSlider.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -223,16 +217,12 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\SideChains\RealTimeGraphEx\RealTimeGraphEx.csproj">
-      <Project>{b9ae25d6-be35-492f-9079-21a7f3e6f7cc}</Project>
-      <Name>RealTimeGraphEx</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\SideChains\RealTimeGraphX.WPF\RealTimeGraphX.WPF.csproj">
-      <Project>{99d233c5-fee7-418e-9c25-d4584cb52e28}</Project>
+    <ProjectReference Include="..\..\SideChains\RealTimeGraphX-master\RealTimeGraphX.WPF\RealTimeGraphX.WPF.csproj">
+      <Project>{6b9774f7-960d-438e-ad81-c6b9be328d50}</Project>
       <Name>RealTimeGraphX.WPF</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\SideChains\RealTimeGraphX\RealTimeGraphX.csproj">
-      <Project>{6d55a3b8-46d3-493a-a143-aebd2b98d683}</Project>
+    <ProjectReference Include="..\..\SideChains\RealTimeGraphX-master\RealTimeGraphX\RealTimeGraphX.csproj">
+      <Project>{f13a489c-80ee-4cd0-bdd4-92d959215646}</Project>
       <Name>RealTimeGraphX</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\SideChains\Tango.AutoComplete\Tango.AutoComplete.csproj">
@@ -386,7 +376,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/Generic.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/Generic.xaml
index 9cc398753..79245745e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/Generic.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/Generic.xaml
@@ -2,6 +2,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mahApps="http://metro.mahapps.com/winfx/xaml/controls"
+    xmlns:realTimeGraphX="clr-namespace:RealTimeGraphX.WPF;assembly=RealTimeGraphX.WPF"
     xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
     xmlns:local="clr-namespace:Tango.MachineStudio.Common.Controls">
 
@@ -28,4 +29,90 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphLabelBackground" Opacity="0.7">
+        <GradientStop Color="#252525"/>
+        <GradientStop Color="#FF4E4E4E" Offset="1"/>
+    </LinearGradientBrush>
+
+    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphLegendBackground" Opacity="0.7">
+        <GradientStop Color="#FF848484"/>
+        <GradientStop Color="#FF282828" Offset="1"/>
+    </LinearGradientBrush>
+
+    <!--Graph Label-->
+    <Style x:Key="graphLabel" TargetType="Label">
+        <Style.Setters>
+            <Setter Property="IsHitTestVisible" Value="False"></Setter>
+            <Setter Property="Margin" Value="-1 -1 0 0"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Left"></Setter>
+            <Setter Property="VerticalAlignment" Value="Top"></Setter>
+            <Setter Property="Padding" Value="0"></Setter>
+            <Setter Property="ContentTemplate">
+                <Setter.Value>
+                    <DataTemplate>
+                        <Border Width="Auto" Padding="0 0 20 0" Height="25" BorderBrush="DodgerBlue" BorderThickness="1" CornerRadius="0 0 30 0" Background="{StaticResource graphLabelBackground}" >
+                            <Label Margin="5 0 0 0"  HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="12" Content="{Binding}"></Label>
+                        </Border>
+                    </DataTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+    <!--Graph Label-->
+
+    <Style TargetType="{x:Type local:WpfGraphControl}">
+        <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}" BorderThickness="1 0 0 1" BorderBrush="{TemplateBinding Foreground}" />
+
+                                <Grid IsHitTestVisible="False" Visibility="{TemplateBinding GraphLabelVisibility}">
+                                    <Label Style="{StaticResource graphLabel}">
+                                        <StackPanel Orientation="Horizontal">
+                                            <TextBlock Foreground="Gainsboro" FontSize="11" VerticalAlignment="Center" Text="{TemplateBinding DisplayName}"></TextBlock>
+                                            <TextBlock Foreground="Gray" Margin="10 0 0 0" FontSize="11" FontFamily="Sylfaen Regular" VerticalAlignment="Center" Text="{TemplateBinding DisplayUnits}"></TextBlock>
+                                        </StackPanel>
+                                    </Label>
+                                </Grid>
+                            </Grid>
+
+                            <realTimeGraphX:WpfGraphAxisControl Orientation="Vertical" Controller="{TemplateBinding Controller}" StringFormat="{TemplateBinding StringFormat}" />
+                            <realTimeGraphX:WpfGraphAxisControl Orientation="Horizontal" Controller="{TemplateBinding Controller}" Grid.Column="1" Grid.Row="1" StringFormat="hh\:mm\:ss"/>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index 8d9255926..8416758fa 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -356,10 +356,6 @@
     <Resource Include="design.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\SideChains\RealTimeGraphEx\RealTimeGraphEx.csproj">
-      <Project>{b9ae25d6-be35-492f-9079-21a7f3e6f7cc}</Project>
-      <Name>RealTimeGraphEx</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SideChains\Tango.AutoComplete\Tango.AutoComplete.csproj">
       <Project>{bb2abb74-ba58-4812-83aa-ec8171f42df4}</Project>
       <Name>Tango.AutoComplete</Name>
@@ -614,7 +610,7 @@ copy /Y "$(SolutionDir)Referenced Assemblies\Microsoft.WITDataStore32.dll" "$(Ta
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_UpdateFileVersion="True" BuildVersion_DetectChanges="True" BuildVersion_UseGlobalSettings="False" />
+      <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file