diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/Models/ScanCableModel.cs b/Sinvo.EplanHpD.Plugin.WPFUI/Models/ScanCableModel.cs index c3b3463..98ab154 100644 --- a/Sinvo.EplanHpD.Plugin.WPFUI/Models/ScanCableModel.cs +++ b/Sinvo.EplanHpD.Plugin.WPFUI/Models/ScanCableModel.cs @@ -133,6 +133,26 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.Models OnPropertyChanged(nameof(E_part)); } } + public string _s_PartID; + public string S_PartID + { + get => _s_PartID; + set + { + _s_PartID = value; + OnPropertyChanged(nameof(S_PartID)); + } + } + private string _e_PartID; + public string E_PartID + { + get => _e_PartID; + set + { + _e_PartID = value; + OnPropertyChanged(nameof(E_PartID)); + } + } public BaseOccurrence S_partObj { get; set; } public BaseOccurrence E_partObj { get; set; } diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml b/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml index b82f932..46755c7 100644 --- a/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml +++ b/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml @@ -35,7 +35,7 @@ - + - + Click="Button_Click"> + + + + - + Click="Button_Click_1"> + + + Text="<--------------------------------------------------------------->" /> - + Margin="50,0,0,0" Click="Button_Click_2"> + + + - + Margin="50,0,0,0" Click="Button_Click_3"> + + + diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml.cs b/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml.cs index 666673e..7547173 100644 --- a/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml.cs +++ b/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerInfo.xaml.cs @@ -57,5 +57,52 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.View { } + + + /// + /// 部件1 + /// + /// + /// + private void Button_Click(object sender, RoutedEventArgs e) + { + if (string.IsNullOrEmpty(_scannerViewModel.S_part)) ; + else + { + _scannerViewModel.ToSourceById(_scannerViewModel._ScanCableModels.FirstOrDefault().S_PartID); + } + } + /// + /// 管脚1 + /// + /// + /// + private void Button_Click_1(object sender, RoutedEventArgs e) + { + if (string.IsNullOrEmpty(_scannerViewModel.S_pin)) ; + else + { + _scannerViewModel.ToSourceById(_scannerViewModel._ScanCableModels.FirstOrDefault().S_pinID); + } + } + + private void Button_Click_2(object sender, RoutedEventArgs e) + { + if (string.IsNullOrEmpty(_scannerViewModel.E_part)) ; + else + { + _scannerViewModel.ToSourceById(_scannerViewModel._ScanCableModels.FirstOrDefault().E_PartID); + } + } + + private void Button_Click_3(object sender, RoutedEventArgs e) + { + if (string.IsNullOrEmpty(_scannerViewModel.E_pin)) ; + else + { + _scannerViewModel.ToSourceById(_scannerViewModel._ScanCableModels.FirstOrDefault().E_pinID); + } + + } } } diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/ScannerViewModel.cs b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/ScannerViewModel.cs index 2c3d235..6b6533a 100644 --- a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/ScannerViewModel.cs +++ b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/ScannerViewModel.cs @@ -246,7 +246,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel { S_pin = scanCableModel.E_Pin; E_pin = scanCableModel.E_Pin; - S_part = scanCableModel.S_part; + Length = scanCableModel.Length; Name = scanCableModel.Name; Code = scanCableModel.Code; @@ -263,6 +263,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel var parent = oriOcc.Parents?.FirstOrDefault(); var grandparent = parent.Parents?.FirstOrDefault(); scanCableModel.S_partObj = grandparent; + scanCableModel.S_PartID = grandparent.ID; scanCableModel.S_part = grandparent.Name; S_part = scanCableModel.S_part; } @@ -272,6 +273,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel var parent = oriOcc.Parents?.FirstOrDefault(); var grandparent = parent.Parents?.FirstOrDefault(); scanCableModel.E_partObj = grandparent; + scanCableModel.E_PartID = grandparent.ID; scanCableModel.E_part = grandparent.Name; E_part = scanCableModel.E_part; } @@ -391,7 +393,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel /// 将设计器聚焦到对应的线 /// /// - private void ToSourceById(string occId) + public void ToSourceById(string occId) { // 从设计器中获取线实例 var occWire = _currentFlexDesigner.GetOccurrenceByID(occId); @@ -427,7 +429,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel /// 将设计器聚焦到对应的线 /// /// - private void ToSourceById(ScanCableModel scanedWire) + public void ToSourceById(ScanCableModel scanedWire) { var occId = scanedWire.Id; // 从设计器中获取线实例