Working on RML module.

Fixed issue with CSV trying to add rows after dispose was called.

1 files changed, 10 insertions, 7 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 9051b5fa9..2ca5aa43b 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
@@ -383,25 +383,28 @@ namespace Tango.MachineStudio.Technician.ViewModels
                 CurrentDiagnosticsResponseSize = data.CalculateSize();
             }
 
-
             foreach (var sr in _single_monitors_recordings)
             {
-                var prop = _diagnoticsMonitorsDataProperties.SingleOrDefault(x => x.Name == (sr.Tag as TechMonitor).Name);
+                var techMonitor = (sr.Tag as TechMonitor);
+
+                var prop = _diagnoticsMonitorsDataProperties.SingleOrDefault(x => x.Name == techMonitor.Name);
 
                 if (prop != null)
                 {
-                    var points = GetDataArray((sr.Tag as TechMonitor), prop.GetValue(data.Monitors));
+                    var points = GetDataArray(techMonitor, prop.GetValue(data.Monitors));
                     sr.PushData(points);
                 }
             }
 
             foreach (var mr in _multi_monitors_recordings)
             {
-                var prop = _diagnoticsMonitorsDataProperties.SingleOrDefault(x => x.Name == (mr.Tag as TechMonitor).Name);
+                var techMonitor = (mr.Tag as TechMonitor);
+
+                var prop = _diagnoticsMonitorsDataProperties.SingleOrDefault(x => x.Name == techMonitor.Name);
 
                 if (prop != null)
                 {
-                    var points = GetDataMatrix((mr.Tag as TechMonitor), prop.GetValue(data.Monitors));
+                    var points = GetDataMatrix(techMonitor, prop.GetValue(data.Monitors));
                     mr.PushData(points);
                 }
             }
@@ -1035,11 +1038,11 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         if (!monitor.MultiChannel)
                         {
-                            _single_monitors_recordings.Add(new SingleTechRecordingData(monitor.Name, dlg.FileName + "\\" + monitor.Name + ".csv") { Tag = monitor });
+                            _single_monitors_recordings.Add(new SingleTechRecordingData(monitor.Name, dlg.FileName + "\\" + monitor.Description + ".csv") { Tag = monitor });
                         }
                         else
                         {
-                            _multi_monitors_recordings.Add(new MultiTechRecordingData(monitor.Name, monitor.ChannelCount, dlg.FileName + "\\" + monitor.Name + ".csv") { Tag = monitor });
+                            _multi_monitors_recordings.Add(new MultiTechRecordingData(monitor.Name, monitor.ChannelCount, dlg.FileName + "\\" + monitor.Description + ".csv") { Tag = monitor });
                         }
                         item.StartRecording();
                     }