Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 18 insertions, 2 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 a02e09e9a..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);
             }
         }
 
@@ -1276,10 +1277,15 @@ namespace Tango.MachineStudio.Technician.ViewModels
                         })
                         .Subscribe((response) =>
                         {
-
                             item.HomingMaximumProgress = response.MaxProgress;
                             item.HomingProgress = response.Progress;
 
+                        },(ex) => 
+                        {
+
+                            item.IsHoming = false;
+                            item.IsHomingCompleted = true;
+
                         }, () =>
                         {
 
@@ -1372,6 +1378,12 @@ namespace Tango.MachineStudio.Technician.ViewModels
                             item.HomingMaximumProgress = response.MaxProgress;
                             item.HomingProgress = response.Progress;
 
+                        }, (ex) =>
+                        {
+
+                            item.IsHoming = false;
+                            item.IsHomingCompleted = true;
+
                         }, () =>
                         {
 
@@ -1869,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);
                     }