aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-11-13 09:37:40 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-11-13 09:37:40 +0200
commit996422d12e0a40aa408757989232f0225dc29a28 (patch)
tree2b0cc51b925a35c8959e0cc0571c61558a6a9447 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels
parentfc1f93d66a43c5d304eeb32238cc186d14598c84 (diff)
downloadTango-996422d12e0a40aa408757989232f0225dc29a28.tar.gz
Tango-996422d12e0a40aa408757989232f0225dc29a28.zip
Fixed issue with CSV monitor recorder.
Machine Studio v3.5.65
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs7
1 files changed, 6 insertions, 1 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 4b362688f..85b32437b 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
@@ -962,7 +962,8 @@ namespace Tango.MachineStudio.Technician.ViewModels
}
else if (item is MonitorRecorderItem)
{
- CreateElement<MonitorRecorderElementEditor>(item);
+ var editor = CreateElement<MonitorRecorderElementEditor>(item);
+ InitMonitorRecorderItem(editor.MonitorRecorderItem);
}
}
@@ -1880,6 +1881,10 @@ namespace Tango.MachineStudio.Technician.ViewModels
{
(item as MotorGroupItem).TechMotors = ObservablesStaticCollections.Instance.HardwareMotorTypes.Where(x => (item as MotorGroupItem).ItemsGuids.Contains(x.Guid)).ToObservableCollection();
}
+ else if (item is MonitorRecorderItem)
+ {
+ (item as MonitorRecorderItem).SetSelectedMonitors(ObservablesStaticCollections.Instance.TechMonitors.Where(x => (item as MonitorRecorderItem).SelectedMonitorsGuids.Contains(x.Guid)).ToList());
+ }
AddTechItem(item);
}