From 1b74cee6e9073f3542b4733574ab304f40fc033b Mon Sep 17 00:00:00 2001 From: Roy Date: Thu, 8 Feb 2018 23:53:00 +0200 Subject: Working on MachineTechView.. --- .../ViewModels/MachineTechViewVM.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs') 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 4420aa4c9..2be98e619 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 @@ -101,11 +101,14 @@ namespace Tango.MachineStudio.Technician.ViewModels { MonitorItem monitorItem = item as MonitorItem; - var prop = _diagnoticsDataProperties.SingleOrDefault(x => x.Name == monitorItem.TechMonitor.Name); - - if (prop != null) + if (DateTime.Now > monitorItem.LastUpdateTime.AddMilliseconds(monitorItem.UpdateInterval)) { - monitorItem.Value = GetLastMonitorValue(monitorItem.TechMonitor, prop.GetValue(data)); + var prop = _diagnoticsDataProperties.SingleOrDefault(x => x.Name == monitorItem.TechMonitor.Name); + + if (prop != null) + { + monitorItem.Value = GetLastMonitorValue(monitorItem.TechMonitor, prop.GetValue(data)); + } } } else if (item.GetType() == typeof(SingleGraphItem)) @@ -155,6 +158,7 @@ namespace Tango.MachineStudio.Technician.ViewModels { var monitorItem = new MonitorItem(Adapter.TechMonitors.FirstOrDefault()); MonitorElementEditor editor = new MonitorElementEditor(monitorItem, bounds); + editor.DataContext = monitorItem; Elements.Add(editor); } else if (SelectedTechItem is SingleGraphItem) -- cgit v1.3.1