diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-28 11:20:36 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-28 11:20:36 +0300 |
| commit | af885a34781d8af8f8f38f884d169d036ea1d0d4 (patch) | |
| tree | dfdb6d7e2e02a734d40e3247a886520e47a621c8 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs | |
| parent | 9785613e7897747231f0e0f1d02c76ce8407e920 (diff) | |
| download | Tango-af885a34781d8af8f8f38f884d169d036ea1d0d4.tar.gz Tango-af885a34781d8af8f8f38f884d169d036ea1d0d4.zip | |
Fixed issue with dispenser/motor homing animation.
Improved monitor item + monitor decimal places.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs | 10 |
1 files changed, 9 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 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)); } |
