Lots of work !!

1 files changed, 9 insertions, 10 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 91c80a41a..4cc1852a6 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
@@ -49,7 +49,6 @@ namespace Tango.MachineStudio.Technician.ViewModels
         private IEventLogger _eventLogger;
         private DateTime _lastDiagnosticsResponseUpdate;
         private const int MIN_DIAGNOSTICS_UPDATE_MILI = 500;
-        private bool _isViewLoaded;
 
         #region Properties
 
@@ -458,7 +457,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
             }
             else if (item is MotorItem)
             {
-                var editor = CreateElement<MotorElementEditor, MotorItem, TechMotor>(bounds, Adapter.TechMotors.FirstOrDefault());
+                var editor = CreateElement<MotorElementEditor, MotorItem, HardwareMotorType>(bounds, Adapter.HardwareMotorTypes.FirstOrDefault());
                 InitMotorItem(editor.MotorItem);
             }
             else if (item is DispenserItem)
@@ -552,7 +551,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
             }
             else if (item is MotorItem)
             {
-                (item as MotorItem).TechMotor = Adapter.TechMotors.FirstOrDefault(x => x.Guid == item.ItemGuid);
+                (item as MotorItem).HardwareMotorType = Adapter.HardwareMotorTypes.FirstOrDefault(x => x.Guid == item.ItemGuid);
                 var editor = CreateElement<MotorElementEditor>(item);
                 InitMotorItem(editor.MotorItem);
             }
@@ -709,7 +708,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StartMotorJogging(new MotorJoggingRequest()
                         {
-                            Code = item.TechMotor.Code,
+                            Code = item.HardwareMotorType.Code,
                             Direction = MotorDirection.Forward,
                         });
                     }
@@ -717,14 +716,14 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StopMotorJogging(new MotorAbortJoggingRequest()
                         {
-                            Code = item.TechMotor.Code,
+                            Code = item.HardwareMotorType.Code,
                         });
                     }
                     else if (action == MotorActionType.BackwardPressed)
                     {
                         await MachineOperator.StartMotorJogging(new MotorJoggingRequest()
                         {
-                            Code = item.TechMotor.Code,
+                            Code = item.HardwareMotorType.Code,
                             Direction = MotorDirection.Backward,
                         });
                     }
@@ -732,7 +731,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StopMotorJogging(new MotorAbortJoggingRequest()
                         {
-                            Code = item.TechMotor.Code,
+                            Code = item.HardwareMotorType.Code,
                         });
                     }
                     else if (action == MotorActionType.HomingStarted)
@@ -743,7 +742,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
                         MachineOperator.StartMotorHoming(new MotorHomingRequest()
                         {
-                            Code = item.TechMotor.Code
+                            Code = item.HardwareMotorType.Code
                         })
                         .Subscribe((response) =>
                         {
@@ -763,7 +762,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StopMotorHoming(new MotorAbortHomingRequest()
                         {
-                            Code = item.TechMotor.Code,
+                            Code = item.HardwareMotorType.Code,
                         });
 
                         item.IsHoming = false;
@@ -1130,7 +1129,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                 {
                     if (item is MotorGroupItem)
                     {
-                        (item as MotorGroupItem).TechMotors = ObservablesEntitiesAdapter.Instance.TechMotors.Where(x => (item as MotorGroupItem).ItemsGuids.Contains(x.Guid)).ToObservableCollection();
+                        (item as MotorGroupItem).TechMotors = ObservablesEntitiesAdapter.Instance.HardwareMotorTypes.Where(x => (item as MotorGroupItem).ItemsGuids.Contains(x.Guid)).ToObservableCollection();
                     }
 
                     AddTechItem(item);