From af885a34781d8af8f8f38f884d169d036ea1d0d4 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 28 Aug 2018 11:20:36 +0300 Subject: Fixed issue with dispenser/motor homing animation. Improved monitor item + monitor decimal places. --- .../ViewModels/MachineTechViewVM.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (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 9ecfa2312..370f52d00 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 @@ -339,7 +339,7 @@ namespace Tango.MachineStudio.Technician.ViewModels if (prop != null) { - monitorItem.Value = GetDataLastValue(monitorItem.TechMonitor, prop.GetValue(data.Monitors)); + monitorItem.Value = GetDataLastValue(monitorItem.TechMonitor, prop.GetValue(data.Monitors)) * 0.232345; } } } @@ -975,6 +975,10 @@ namespace Tango.MachineStudio.Technician.ViewModels } catch (Exception ex) { + item.IsHomingCompleted = true; + item.IsHoming = false; + item.HomingProgress = 0; + item.HomingMaximumProgress = 0; LogManager.Log(ex, String.Format("Error executing technician command '{0}' on item '{1}'.", action, item.TechName)); _eventLogger.Log(ex, String.Format("Error executing technician command '{0}' on item '{1}'.", action, item.TechName)); } @@ -1062,6 +1066,10 @@ namespace Tango.MachineStudio.Technician.ViewModels } catch (Exception ex) { + item.IsHomingCompleted = true; + item.IsHoming = false; + item.HomingProgress = 0; + item.HomingMaximumProgress = 0; LogManager.Log(ex, String.Format("Error executing technician command '{0}' on item '{1}'.", action, item.TechName)); _eventLogger.Log(ex, String.Format("Error executing technician command '{0}' on item '{1}'.", action, item.TechName)); } -- cgit v1.3.1