Machine Studio v2.7

3 files changed, 22 insertions, 13 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 d6acd3873..e9471fa74 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
@@ -30,21 +30,24 @@ namespace Tango.MachineStudio.Technician.Models
 
             Task.Factory.StartNew(() =>
             {
-                var width = data.Count;
-                var height = data.First().Count;
-
-                for (int row = 0; row < height; row++)
+                if (_initialized)
                 {
-                    String time = (delta_base.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * row))).ToString(@"hh\:mm\:ss\.fff");
-
-                    List<double> row_values = new List<double>();
+                    var width = data.Count;
+                    var height = data.First().Count;
 
-                    for (int column = 0; column < width; column++)
+                    for (int row = 0; row < height; row++)
                     {
-                        row_values.Add(data[column][row]);
-                    }
+                        String time = (delta_base.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * row))).ToString(@"hh\:mm\:ss\.fff");
 
-                    CsvFile.Append(new MultiTechRecordingValue(time, row_values));
+                        List<double> row_values = new List<double>();
+
+                        for (int column = 0; column < width; column++)
+                        {
+                            row_values.Add(data[column][row]);
+                        }
+
+                        CsvFile.Append(new MultiTechRecordingValue(time, row_values));
+                    }
                 }
             });
         }
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 3c5426ed9..7aa9a2b3f 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
@@ -23,9 +23,12 @@ namespace Tango.MachineStudio.Technician.Models
 
             Task.Factory.StartNew(() =>
             {
-                for (int i = 0; i < data.Count; i++)
+                if (_initialized)
                 {
-                    CsvFile.Append(new SingleTechRecordingValue((delta_base.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * i))).ToString(@"hh\:mm\:ss\.fff"), data[i]));
+                    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]));
+                    }
                 }
             });
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/TechRecordingData.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/TechRecordingData.cs
index cb4b10db1..8024a1375 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/TechRecordingData.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/TechRecordingData.cs
@@ -13,6 +13,8 @@ namespace Tango.MachineStudio.Technician.Models
 {
     public abstract class TechRecordingData<T, TValue> : ExtendedObject, IDisposable where T : TechItem where TValue : TechRecordingValue
     {
+        protected bool _initialized;
+
         protected DateTime _last_time;
         protected DateTime _start_time;
 
@@ -36,6 +38,7 @@ namespace Tango.MachineStudio.Technician.Models
             definition.Columns = new List<String>() { "Time" }.Concat(GetColumnNames());
 
             CsvFile = new CsvFile<TValue>(new CsvDestination(TemporaryFile), definition);
+            _initialized = true;
         }
 
         public void Save(String fileName)