aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-02-13 16:35:28 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-02-13 16:35:28 +0200
commitd5a5fd2813a98d97e0198342bbcc53df454c3e01 (patch)
tree8e3012262ba6417c3236d33a582df2d7ab0cd16a /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems
parent2b1e86aeee219b236ba8cb33c5ebfa8bde89f14f (diff)
downloadTango-d5a5fd2813a98d97e0198342bbcc53df454c3e01.tar.gz
Tango-d5a5fd2813a98d97e0198342bbcc53df454c3e01.zip
Digital out.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DigitalOutItem.cs (renamed from Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/IOItem.cs)29
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs2
2 files changed, 15 insertions, 16 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/IOItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DigitalOutItem.cs
index 60d47b1c0..817cfd9b7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/IOItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DigitalOutItem.cs
@@ -5,21 +5,21 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Media;
using System.Xml.Serialization;
-using Tango.Core;
+using Tango.Integration.Observables;
using Tango.SharedUI.Helpers;
namespace Tango.MachineStudio.Technician.TechItems
{
- public class IOItem : TechItem
+ public class DigitalOutItem : TechItem
{
public event EventHandler<bool> ValueChanged;
- private int _port;
-
- public int Port
+ private TechIo _techIo;
+ [XmlIgnore]
+ public TechIo TechIo
{
- get { return _port; }
- set { _port = value; RaisePropertyChangedAuto(); TechName = "GPIO " + Port; }
+ get { return _techIo; }
+ set { _techIo = value; RaisePropertyChangedAuto(); TechName = _techIo != null ? _techIo.Description : null; ItemGuid = value != null ? value.Guid : null; }
}
private bool _value;
@@ -47,24 +47,23 @@ namespace Tango.MachineStudio.Technician.TechItems
}
}
-
- public IOItem() : base()
+ public DigitalOutItem() : base()
{
- Name = "GPIO Controller";
- Description = "GPIO Controller";
+ Name = "Digital Out";
+ Description = "Digital Output Pin Controller";
Image = ResourceHelper.GetImageFromResources("Images/binary.png");
Color = Colors.White;
}
- public IOItem(int port) : this()
+ public DigitalOutItem(TechIo techIo) : this()
{
- Port = port;
+ TechIo = techIo;
}
public override TechItem Clone()
{
- IOItem cloned = base.Clone() as IOItem;
- cloned.Port = Port;
+ DigitalOutItem cloned = base.Clone() as DigitalOutItem;
+ cloned.TechIo = TechIo;
return cloned;
}
}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs
index a7b5ae5b9..92ad1c536 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs
@@ -14,7 +14,7 @@ using Tango.Integration.Observables;
namespace Tango.MachineStudio.Technician.TechItems
{
[XmlInclude(typeof(DispenserItem))]
- [XmlInclude(typeof(IOItem))]
+ [XmlInclude(typeof(DigitalOutItem))]
[XmlInclude(typeof(MeterItem))]
[XmlInclude(typeof(MonitorItem))]
[XmlInclude(typeof(MotorItem))]