105040 Clean code

This commit is contained in:
lihanbo 2025-04-03 16:06:54 +08:00
parent 88378e55c1
commit 0c17a41ba7
2 changed files with 37 additions and 49 deletions

View File

@ -1,14 +1,10 @@
using EPLAN.Harness.Actuator.Commands.Designer; using EPLAN.Harness.Actuator.Commands.Designer;
using EPLAN.Harness.API; using EPLAN.Harness.API;
using EPLAN.Harness.AppCore.Controls;
using EPLAN.Harness.Core; using EPLAN.Harness.Core;
using EPLAN.Harness.Core.Commands; using EPLAN.Harness.Core.Commands;
using EPLAN.Harness.Core.Common;
using EPLAN.Harness.Core.Controls; using EPLAN.Harness.Core.Controls;
using EPLAN.Harness.Core.UIFactory; using EPLAN.Harness.Core.UIFactory;
using EPLAN.Harness.Primitives.ActionControls;
using EPLAN.Harness.ProjectCore; using EPLAN.Harness.ProjectCore;
using EPLAN.Harness.ProjectCore.Occurrences;
using EPLAN.Harness.ProjectCore.Occurrences.Designer; using EPLAN.Harness.ProjectCore.Occurrences.Designer;
using HandyControl.Controls; using HandyControl.Controls;
using Sinvo.EplanHpD.Plugin.WPFUI.Models; using Sinvo.EplanHpD.Plugin.WPFUI.Models;
@ -16,18 +12,9 @@ using Sinvo.EplanHpD.Plugin.WPFUI.Utils;
using Sinvo.EplanHpD.Plugin.WPFUI.ViewModel; using Sinvo.EplanHpD.Plugin.WPFUI.ViewModel;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace Sinvo.EplanHpD.Plugin.WPFUI.View namespace Sinvo.EplanHpD.Plugin.WPFUI.View
{ {
@ -132,6 +119,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.View
FlexMessageBox.Error(ex.Message); FlexMessageBox.Error(ex.Message);
} }
} }
#region
protected CmdRunEnv _cmdEnvironment = CmdRunEnv.Designer; protected CmdRunEnv _cmdEnvironment = CmdRunEnv.Designer;
private void InsertCableBtn_Click(object sender, RoutedEventArgs e) private void InsertCableBtn_Click(object sender, RoutedEventArgs e)
{ {
@ -168,7 +156,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.View
{ {
return _currentFlexDesigner.CurrentView.UserControlFactory_Create<CmdD3DPlaceCableForked.IForkedCableControl>(UIObject.ctrl_Designer_ForkedPathPlace, new object[] { side }); return _currentFlexDesigner.CurrentView.UserControlFactory_Create<CmdD3DPlaceCableForked.IForkedCableControl>(UIObject.ctrl_Designer_ForkedPathPlace, new object[] { side });
} }
#endregion
private void ToMotorBtn_Click(object sender, RoutedEventArgs e) private void ToMotorBtn_Click(object sender, RoutedEventArgs e)
{ {
ToMotorSource(viewModel.Motor.OccPartId); ToMotorSource(viewModel.Motor.OccPartId);

View File

@ -159,43 +159,43 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI
} }
} }
private void LettotypeListView_RowDetailsVisibilityChanged(object sender, System.Windows.Controls.DataGridRowDetailsEventArgs e) //private void LettotypeListView_RowDetailsVisibilityChanged(object sender, System.Windows.Controls.DataGridRowDetailsEventArgs e)
{ //{
Stopwatch stopwatch = new Stopwatch(); // Stopwatch stopwatch = new Stopwatch();
stopwatch.Start(); // stopwatch.Start();
//var datagrid = sender as DataGrid; // //var datagrid = sender as DataGrid;
//if (datagrid != null) // //if (datagrid != null)
//{ // //{
// var DetailsDataGrid = e.DetailsElement as ListView; // // var DetailsDataGrid = e.DetailsElement as ListView;
// if (DetailsDataGrid != null) // // if (DetailsDataGrid != null)
// { // // {
// DetailsDataGrid.ItemsSource = ViewModel.SelectedSubItem; // // DetailsDataGrid.ItemsSource = ViewModel.SelectedSubItem;
// } // // }
//} // //}
stopwatch.Stop(); // stopwatch.Stop();
Debug.Print($"LettotypeListView_RowDetailsVisibilityChanged {stopwatch.ElapsedMilliseconds}ms"); // Debug.Print($"LettotypeListView_RowDetailsVisibilityChanged {stopwatch.ElapsedMilliseconds}ms");
} //}
private void SubToSourceMenuItem_Click(object sender, RoutedEventArgs e) //private void SubToSourceMenuItem_Click(object sender, RoutedEventArgs e)
{ //{
if (SubDetailsDataGridSelectedItem != null) // if (SubDetailsDataGridSelectedItem != null)
{ // {
if (SubDetailsDataGridSelectedItem is LectotypeLineModel model) // if (SubDetailsDataGridSelectedItem is LectotypeLineModel model)
{ // {
ViewModel.ToSource(model.CableName); // ViewModel.ToSource(model.CableName);
} // }
} // }
} //}
private object SubDetailsDataGridSelectedItem; //private object SubDetailsDataGridSelectedItem;
private void SubDetailsDataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e) //private void SubDetailsDataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
{ //{
var view = sender as ListView; // var view = sender as ListView;
if (view != null && view.SelectedItem != null) // if (view != null && view.SelectedItem != null)
{ // {
SubDetailsDataGridSelectedItem = view.SelectedItem; // SubDetailsDataGridSelectedItem = view.SelectedItem;
} // }
} //}
private void Window_Closed(object sender, System.EventArgs e) private void Window_Closed(object sender, System.EventArgs e)
{ {