merge

1 files changed, 43 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
index c46b1dec1..73ba02435 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
@@ -43,6 +43,46 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
             {
                 _selectedHardwareObject = value;
                 RaisePropertyChangedAuto();
+                RaisePropertyChanged(nameof(SelectedHardwareObjectTypeName));
+            }
+        }
+
+        public String SelectedHardwareObjectTypeName
+        {
+            get
+            {
+                String name = String.Empty;
+
+                if (SelectedHardwareObject is HardwareMotor)
+                {
+                    name = (SelectedHardwareObject as HardwareMotor).HardwareMotorType.Description;
+                }
+                else if (SelectedHardwareObject is HardwareDancer)
+                {
+                    name = (SelectedHardwareObject as HardwareDancer).HardwareDancerType.Description;
+                }
+                else if (SelectedHardwareObject is HardwareBlower)
+                {
+                    name = (SelectedHardwareObject as HardwareBlower).HardwareBlowerType.Description;
+                }
+                else if (SelectedHardwareObject is HardwareBreakSensor)
+                {
+                    name = (SelectedHardwareObject as HardwareBreakSensor).HardwareBreakSensorType.Description;
+                }
+                else if (SelectedHardwareObject is HardwarePidControl)
+                {
+                    name = (SelectedHardwareObject as HardwarePidControl).HardwarePidControlType.Description;
+                }
+                else if (SelectedHardwareObject is HardwareSpeedSensor)
+                {
+                    name = (SelectedHardwareObject as HardwareSpeedSensor).HardwareSpeedSensorType.Description;
+                }
+                else if (SelectedHardwareObject is HardwareWinder)
+                {
+                    name = (SelectedHardwareObject as HardwareWinder).HardwareWinderType.Description;
+                }
+
+                return name;
             }
         }
 
@@ -94,7 +134,9 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                 (prop) =>
                 !prop.PropertyType.IsEnum
                 &&
-                !prop.Name.ToLower().Contains("guid"));
+                prop.Name.ToLower() != "guid"
+                &&
+                prop.Name.ToLower() != "id");
         }
 
         private void CreateDefaultView()