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

1 files changed, 78 insertions, 0 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 cd7582fe9..f79ebb29b 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
@@ -617,6 +617,14 @@ namespace Tango.MachineStudio.Technician.ViewModels
             {
                 CreateElement<SpeedSensorElementEditor, SpeedSensorItem, HardwareSpeedSensorType>(bounds, Adapter.HardwareSpeedSensorTypes.FirstOrDefault());
             }
+            else if (item is BlowerItem)
+            {
+                CreateElement<BlowerElementEditor, BlowerItem, HardwareBlowerType>(bounds, Adapter.HardwareBlowerTypes.FirstOrDefault());
+            }
+            else if (item is BreakSensorItem)
+            {
+                CreateElement<BreakSensorElementEditor, BreakSensorItem, HardwareBreakSensorType>(bounds, Adapter.HardwareBreakSensorTypes.FirstOrDefault());
+            }
             else if (item is ProcessParametersItem)
             {
                 var editor = CreateElement<ProcessParametersElementEditor, ProcessParametersItem, object>(bounds, null);
@@ -746,6 +754,16 @@ namespace Tango.MachineStudio.Technician.ViewModels
                 (item as SpeedSensorItem).HardwareSpeedSensorType = Adapter.HardwareSpeedSensorTypes.FirstOrDefault(x => x.Guid == item.ItemGuid);
                 CreateElement<SpeedSensorElementEditor>(item);
             }
+            else if (item is BlowerItem)
+            {
+                (item as BlowerItem).HardwareBlowerType = Adapter.HardwareBlowerTypes.FirstOrDefault(x => x.Guid == item.ItemGuid);
+                CreateElement<BlowerElementEditor>(item);
+            }
+            else if (item is BreakSensorItem)
+            {
+                (item as BreakSensorItem).HardwareBreakSensorType = Adapter.HardwareBreakSensorTypes.FirstOrDefault(x => x.Guid == item.ItemGuid);
+                CreateElement<BreakSensorElementEditor>(item);
+            }
             else if (item is ProcessParametersItem)
             {
                 var editor = CreateElement<ProcessParametersElementEditor>(item);
@@ -1610,6 +1628,26 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     }
                 }
 
+                foreach (var blowerConfig in config.Blowers)
+                {
+                    var itemConfig = BlowerItem.BlowerConfigurations.SingleOrDefault(x => x.HardwareBlowerType.Code == blowerConfig.HardwareBlowerType.ToInt32());
+
+                    if (itemConfig != null)
+                    {
+                        blowerConfig.MapPrimitivesTo(itemConfig);
+                    }
+                }
+
+                foreach (var breakSensorConfig in config.BreakSensors)
+                {
+                    var itemConfig = BreakSensorItem.BreakSensorConfigurations.SingleOrDefault(x => x.HardwareBreakSensorType.Code == breakSensorConfig.HardwareBreakSensorType.ToInt32());
+
+                    if (itemConfig != null)
+                    {
+                        breakSensorConfig.MapPrimitivesTo(itemConfig);
+                    }
+                }
+
                 _notification.ShowInfo("Visual elements synced to the last uploaded hardware configuration.");
             }
             else
@@ -1674,6 +1712,26 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     }
                 }
 
+                foreach (var blowerConfig in hw.HardwareBlowers)
+                {
+                    var itemConfig = BlowerItem.BlowerConfigurations.SingleOrDefault(x => x.HardwareBlowerType.Code == blowerConfig.HardwareBlowerType.Code);
+
+                    if (itemConfig != null)
+                    {
+                        itemConfig.MapPrimitivesTo(blowerConfig);
+                    }
+                }
+
+                foreach (var breakSensorConfig in hw.HardwareBreakSensors)
+                {
+                    var itemConfig = BreakSensorItem.BreakSensorConfigurations.SingleOrDefault(x => x.HardwareBreakSensorType.Code == breakSensorConfig.HardwareBreakSensorType.Code);
+
+                    if (itemConfig != null)
+                    {
+                        itemConfig.MapPrimitivesTo(breakSensorConfig);
+                    }
+                }
+
                 using (_notification.PushTaskItem("Uploading hardware configuration..."))
                 {
                     try
@@ -1745,6 +1803,26 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     }
                 }
 
+                foreach (var blowerSensorConfig in hw.HardwareBlowers)
+                {
+                    var itemConfig = BlowerItem.BlowerConfigurations.SingleOrDefault(x => x.HardwareBlowerType.Code == blowerSensorConfig.HardwareBlowerType.Code);
+
+                    if (itemConfig != null)
+                    {
+                        blowerSensorConfig.MapPrimitivesTo(itemConfig);
+                    }
+                }
+
+                foreach (var breakSensorConfig in hw.HardwareBreakSensors)
+                {
+                    var itemConfig = BreakSensorItem.BreakSensorConfigurations.SingleOrDefault(x => x.HardwareBreakSensorType.Code == breakSensorConfig.HardwareBreakSensorType.Code);
+
+                    if (itemConfig != null)
+                    {
+                        breakSensorConfig.MapPrimitivesTo(itemConfig);
+                    }
+                }
+
                 if (showMessage)
                 {
                     _notification.ShowInfo("Visual elements synced to hardware version " + hw.Name + ", " + hw.Version + ".");