Added dispensers support on technician module.

3 files changed, 138 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs
new file mode 100644
index 000000000..3cea8d127
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+using System.Xml.Serialization;
+using Tango.Core.Commands;
+using Tango.Integration.Observables;
+using Tango.SharedUI.Helpers;
+
+namespace Tango.MachineStudio.Technician.TechItems
+{
+    public class DispenserItem : TechItem
+    {
+        public event EventHandler<MotorActionType> ActionExecuted;
+        public event EventHandler HomingCompleted;
+
+        private TechDispenser _techDispenser;
+        [XmlIgnore]
+        public TechDispenser TechDispenser
+        {
+            get { return _techDispenser; }
+            set { _techDispenser = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(Data)); }
+        }
+
+        private bool _isHoming;
+        [XmlIgnore]
+        public bool IsHoming
+        {
+            get { return _isHoming; }
+            set
+            {
+                _isHoming = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+        private bool _isHomingCompleted;
+
+        public bool IsHomingCompleted
+        {
+            get { return _isHomingCompleted; }
+            set
+            {
+                _isHomingCompleted = value;
+                RaisePropertyChangedAuto();
+
+                if (value)
+                {
+                    HomingCompleted?.Invoke(this, new EventArgs());
+                }
+            }
+        }
+
+        private double _homingProgress;
+        [XmlIgnore]
+        public double HomingProgress
+        {
+            get { return _homingProgress; }
+            set
+            {
+                _homingProgress = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+        private double _homingMaximumProgress;
+        [XmlIgnore]
+        public double HomingMaximumProgress
+        {
+            get { return _homingMaximumProgress; }
+            set { _homingMaximumProgress = value; RaisePropertyChangedAuto(); }
+        }
+
+        private bool _isForwardPressed;
+        [XmlIgnore]
+        public bool IsForwardPressed
+        {
+            get { return _isForwardPressed; }
+            set { _isForwardPressed = value; RaisePropertyChangedAuto(); }
+        }
+
+        private bool _isBackwardPressed;
+        [XmlIgnore]
+        public bool IsBackwardPressed
+        {
+            get { return _isBackwardPressed; }
+            set { _isBackwardPressed = value; RaisePropertyChangedAuto(); }
+        }
+
+        private double _speed;
+        public double Speed
+        {
+            get { return _speed; }
+            set { _speed = value; RaisePropertyChangedAuto(); }
+        }
+
+
+        public override object Data => TechDispenser;
+
+        public DispenserItem() : base()
+        {
+            Name = "Dispenser";
+            Description = "Dispenser Controller";
+            Image = ResourceHelper.GetImageFromResources("Images/dispenser-big.png");
+            Color = Colors.White;
+        }
+
+        public DispenserItem(TechDispenser techDispenser) : this()
+        {
+            TechDispenser = techDispenser;
+        }
+
+        public override TechItem Clone()
+        {
+            DispenserItem cloned = base.Clone() as DispenserItem;
+            cloned.TechDispenser = TechDispenser;
+            return cloned;
+        }
+
+        public void RaiseAction(MotorActionType action)
+        {
+            ActionExecuted?.Invoke(this, action);
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MeterItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MeterItem.cs
index 9d4fd9d60..7cc2913eb 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MeterItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MeterItem.cs
@@ -67,7 +67,7 @@ namespace Tango.MachineStudio.Technician.TechItems
         {
             Name = "VU Monitor";
             Description = "VU Meter monitor";
-            Image = ResourceHelper.GetImageFromResources("Images/analog.png");
+            Image = ResourceHelper.GetImageFromResources("Images/volume.png");
             LastUpdateTime = DateTime.Now;
             UpdateInterval = 10;
             LedCount = 14;
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MotorItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MotorItem.cs
index a7088ac3f..272aedf44 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MotorItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MotorItem.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Media;
 using System.Xml.Serialization;
 using Tango.Core.Commands;
 using Tango.Integration.Observables;
@@ -88,6 +89,14 @@ namespace Tango.MachineStudio.Technician.TechItems
             set { _isBackwardPressed = value; RaisePropertyChangedAuto(); }
         }
 
+        private double _speed;
+        public double Speed
+        {
+            get { return _speed; }
+            set { _speed = value; RaisePropertyChangedAuto(); }
+        }
+
+
         public override object Data => TechMotor;
 
         public MotorItem() : base()
@@ -95,6 +104,7 @@ namespace Tango.MachineStudio.Technician.TechItems
             Name = "Motor";
             Description = "Motor Controller";
             Image = ResourceHelper.GetImageFromResources("Images/engine.png");
+            Color = Colors.White;
         }
 
         public MotorItem(TechMotor techMotor) : this()