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

1 files changed, 17 insertions, 16 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 85b32437b..605ab8105 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
@@ -398,7 +398,8 @@ namespace Tango.MachineStudio.Technician.ViewModels
         private void PopulateDiagnosticsData(StartDiagnosticsResponse data)
         {
             TimeSpan delta_base = DateTime.Now - _start_time;
-            double delta_mili = (DateTime.Now - _last_time).TotalMilliseconds;
+            TimeSpan delta = (DateTime.Now - _last_time);
+            double delta_mili = delta.TotalMilliseconds;
             _last_time = DateTime.Now;
 
             if (DateTime.Now > _lastDiagnosticsResponseUpdate.AddMilliseconds(MIN_DIAGNOSTICS_UPDATE_MILI))
@@ -417,7 +418,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                 if (prop != null)
                 {
                     var points = GetDataArray(techMonitor, prop.GetValue(data.Monitors));
-                    sr.PushData(points);
+                    sr.PushData(points, delta_base, delta);
                 }
             }
 
@@ -430,7 +431,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                 if (prop != null)
                 {
                     var points = GetDataMatrix(techMonitor, prop.GetValue(data.Monitors));
-                    mr.PushData(points);
+                    mr.PushData(points, delta_base, delta);
                 }
             }
 
@@ -495,7 +496,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                                 var _graph_recording = _single_graphs_recordings.SingleOrDefault(x => x.Tag == graphItem);
                                 if (_graph_recording != null)
                                 {
-                                    _graph_recording.PushData(points);
+                                    _graph_recording.PushData(points, delta_base, delta);
                                 }
                             }
                         }
@@ -537,7 +538,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                                 var _graph_recording = _multi_graph_recordings.SingleOrDefault(x => x.Tag == graphItem);
                                 if (_graph_recording != null)
                                 {
-                                    _graph_recording.PushData(points);
+                                    _graph_recording.PushData(points, delta_base, delta);
                                 }
                             }
                         }
@@ -1125,11 +1126,11 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         if (!monitor.MultiChannel)
                         {
-                            _single_monitors_recordings.Add(new SingleTechRecordingData(monitor.Name, dlg.FileName + "\\" + monitor.Description + ".csv") { Tag = monitor });
+                            _single_monitors_recordings.Add(new SingleTechRecordingData(monitor.Description, dlg.FileName + "\\" + monitor.Description + ".csv") { Tag = monitor });
                         }
                         else
                         {
-                            _multi_monitors_recordings.Add(new MultiTechRecordingData(monitor.Name, monitor.ChannelCount, dlg.FileName + "\\" + monitor.Description + ".csv") { Tag = monitor });
+                            _multi_monitors_recordings.Add(new MultiTechRecordingData(monitor.Description, monitor.ChannelCount, dlg.FileName + "\\" + monitor.Description + ".csv") { Tag = monitor });
                         }
                         item.StartRecording();
                     }
@@ -1280,19 +1281,19 @@ namespace Tango.MachineStudio.Technician.ViewModels
                             item.HomingMaximumProgress = response.MaxProgress;
                             item.HomingProgress = response.Progress;
 
-                        },(ex) => 
-                        {
+                        }, (ex) =>
+                         {
 
-                            item.IsHoming = false;
-                            item.IsHomingCompleted = true;
+                             item.IsHoming = false;
+                             item.IsHomingCompleted = true;
 
-                        }, () =>
-                        {
+                         }, () =>
+                         {
 
-                            item.IsHoming = false;
-                            item.IsHomingCompleted = true;
+                             item.IsHoming = false;
+                             item.IsHomingCompleted = true;
 
-                        });
+                         });
                     }
                     else if (action == MotorActionType.HomingStopped)
                     {