Optimized accuracy of CSV recordings!

2 files changed, 20 insertions, 8 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/MultiTechRecordingData.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/MultiTechRecordingData.cs
index ad3ea1352..c6fe67ed6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/MultiTechRecordingData.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/MultiTechRecordingData.cs
@@ -21,10 +21,9 @@ namespace Tango.MachineStudio.Technician.Models
             Init();
         }
 
-        public void PushData(List<List<double>> data)
+        public void PushData(List<List<double>> data, TimeSpan deltabase, TimeSpan delta)
         {
-            TimeSpan delta_base = DateTime.Now - _start_time;
-            double delta_mili = (DateTime.Now - _last_time).TotalMilliseconds;
+            double delta_mili = delta.TotalMilliseconds;
 
             _last_time = DateTime.Now;
 
@@ -37,7 +36,7 @@ namespace Tango.MachineStudio.Technician.Models
 
                     for (int row = 0; row < height; row++)
                     {
-                        String time = (delta_base.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * row))).ToString(@"hh\:mm\:ss\.fff");
+                        String time = (deltabase.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * row))).ToString(@"hh\:mm\:ss\.fff");
 
                         List<double> row_values = new List<double>();
 
@@ -52,6 +51,13 @@ namespace Tango.MachineStudio.Technician.Models
             });
         }
 
+        public void PushData(List<List<double>> data)
+        {
+            TimeSpan delta_base = DateTime.Now - _start_time;
+            TimeSpan delta = (DateTime.Now - _last_time);
+            PushData(data, delta_base, delta);
+        }
+
         protected override List<string> GetColumnNames()
         {
             return Enumerable.Range(1, ChannelCount).Select(x => Name + " " + x).ToList();
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/SingleTechRecordingData.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/SingleTechRecordingData.cs
index 8b480bbf3..56691504b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/SingleTechRecordingData.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/SingleTechRecordingData.cs
@@ -14,10 +14,9 @@ namespace Tango.MachineStudio.Technician.Models
             Init();
         }
 
-        public void PushData(List<double> data)
+        public void PushData(List<double> data, TimeSpan deltabase, TimeSpan delta)
         {
-            TimeSpan delta_base = DateTime.Now - _start_time;
-            double delta_mili = (DateTime.Now - _last_time).TotalMilliseconds;
+            double delta_mili = delta.TotalMilliseconds;
 
             _last_time = DateTime.Now;
 
@@ -27,12 +26,19 @@ namespace Tango.MachineStudio.Technician.Models
                 {
                     for (int i = 0; i < data.Count; i++)
                     {
-                        CsvFile.Append(new SingleTechRecordingValue((delta_base.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * i))).ToString(@"hh\:mm\:ss\.fff"), data[i]));
+                        CsvFile.Append(new SingleTechRecordingValue((deltabase.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * i))).ToString(@"hh\:mm\:ss\.fff"), data[i]));
                     }
                 }
             });
         }
 
+        public void PushData(List<double> data)
+        {
+            TimeSpan delta_base = DateTime.Now - _start_time;
+            double delta_mili = (DateTime.Now - _last_time).TotalMilliseconds;
+            PushData(data, delta_base, DateTime.Now - _last_time);
+        }
+
         protected override List<string> GetColumnNames()
         {
             return new List<string>() { Name };