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

1 files changed, 5 insertions, 6 deletions

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(),