Ling
/
EPLAN_PROD_Plugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

105040 Fix 修复开始布线时未能正常开启布线助手窗口的问题

This commit is contained in:
lihanbo 2025-01-24 11:25:44 +08:00
parent 4dd0a7a0c2
commit 9d2d6ccb4d
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs
View File

@ -398,20 +398,27 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI
{ {
CloseBefore(() => CloseBefore(() =>
{ {
ViewModel.ClearNotSavedLectotypeList(); ToLayout();
var motorFlags = ViewModel.Motors.Where(motor => !motor.IsError).Select(motor => motor.GetUniqueFlag()).ToList();
var window = new LayoutHelperWindow(motorFlags);
//window.MotorIds = motorIds;
ElementHost.EnableModelessKeyboardInterop(window);
var mainApp = BaseApp.ActiveApplication;
var helper = new System.Windows.Interop.WindowInteropHelper(window);
helper.Owner = mainApp.Handle;
window.Show();
this.Close();
}); });
} }
else
{
ToLayout();
}
} }
private void ToLayout()
{
ViewModel.ClearNotSavedLectotypeList();
var window = new LayoutHelperWindow(ViewModel.Motors);
//window.MotorIds = motorIds;
ElementHost.EnableModelessKeyboardInterop(window);
var mainApp = BaseApp.ActiveApplication;
var helper = new System.Windows.Interop.WindowInteropHelper(window);
helper.Owner = mainApp.Handle;
window.Show();
this.Close();
}
private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e) private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{ {
if(ViewModel.GetNotSavedLectotypeList() != null && ViewModel.GetNotSavedLectotypeList().Any()) if(ViewModel.GetNotSavedLectotypeList() != null && ViewModel.GetNotSavedLectotypeList().Any())