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

1 files changed, 23 insertions, 3 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 f6b8a35df..ac54a714a 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
@@ -79,6 +79,9 @@ namespace Tango.MachineStudio.Technician.ViewModels
         private DateTime _last_time = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 0, 0, 0);
         private Machine _machine;
         private List<PackColor> _packsColors;
+        private int _diagnostics_index = 0;
+        private DateTime _diagnosticsStartTime;
+        private DateTime _diagnosticsNowTime;
 
         #region Properties
 
@@ -411,7 +414,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                             PackColor pc = new PackColor();
                             pc.Index = pack.PackIndex;
                             pc.Name = pack.LiquidType.Name;
-                            
+
                             if (pack.LiquidType.LiquidTypeColor == Colors.Black)
                             {
                                 pc.Color = Colors.Gray;
@@ -456,13 +459,30 @@ namespace Tango.MachineStudio.Technician.ViewModels
         /// <param name="data">The data.</param>
         private void PopulateDiagnosticsData(StartDiagnosticsResponse data)
         {
-            if (data.Monitors == null) return;
+            if (data.Monitors == null || _machineOperator == null || _machineOperator.DeviceInformation == null) return;
+
+            _diagnostics_index++;
+            uint interval = _machineOperator.DeviceInformation.DiagnosticsInterval;
 
             TimeSpan delta_base = DateTime.Now - _start_time;
             TimeSpan delta = (DateTime.Now - _last_time);
-            double delta_mili = delta.TotalMilliseconds;
             _last_time = DateTime.Now;
 
+            if (data.ElapsedMilli > 0)
+            {
+                _diagnosticsNowTime = DateTime.ParseExact(data.DateTime, "MM/dd/yyyy HH:mm:ss.fff", null); //_diagnosticsNowTime.Add(TimeSpan.FromMilliseconds(data.ElapsedMilli));
+                //var now = _diagnosticsStartTime.Add(TimeSpan.FromMilliseconds(interval * _diagnostics_index));
+                //Debug.WriteLine("DeltaBase Before: " + delta_base);
+                delta_base = _diagnosticsNowTime - _start_time;
+                //Debug.WriteLine("DeltaBase After: " + delta_base);
+
+                //Debug.WriteLine("Delta Before: " + delta);
+                delta = TimeSpan.FromMilliseconds(data.ElapsedMilli);
+                //Debug.WriteLine("Delta After: " + delta);
+            }
+
+            double delta_mili = delta.TotalMilliseconds;
+
             if (DateTime.Now > _lastDiagnosticsResponseUpdate.AddMilliseconds(MIN_DIAGNOSTICS_UPDATE_MILI))
             {
                 CurrentDiagnosticsResponse = data;