From fc6bdc8ec79ccb6b45b80a8608a6f3d360244fa4 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 21 Nov 2018 11:27:26 +0200 Subject: Added component type name in hardware versions module. --- .../ViewModels/MainViewVM.cs | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels') 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..5e087cd02 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; } } -- cgit v1.3.1 From 96d935cdfdc4d0d6c4dd0e3d2bd9d5d436bf9a05 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 22 Nov 2018 17:17:32 +0200 Subject: Fixed issue hardware designer copy parameters. --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 20578304 -> 20578304 bytes .../ViewModels/MainViewVM.cs | 4 +++- 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index d0ab60a89..ef4007771 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index 6c60faaea..128bbfbfb 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ 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 5e087cd02..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 @@ -134,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() -- cgit v1.3.1