1 files changed, 8 insertions, 4 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 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)