From 4a6393ba8d11d74e55dd000c5484492485dc322f Mon Sep 17 00:00:00 2001 From: xyy <544939200@qq.com> Date: Wed, 1 Apr 2026 20:33:23 +0800 Subject: [PATCH] --- ViewModels/MainViewModel.cs | 4 ++-- Views/{MainWindow.xaml => ParameterWindow.xaml} | 2 +- Views/{MainWindow.xaml.cs => ParameterWindow.xaml.cs} | 4 ++-- Views/TestView.xaml.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename Views/{MainWindow.xaml => ParameterWindow.xaml} (99%) rename Views/{MainWindow.xaml.cs => ParameterWindow.xaml.cs} (98%) diff --git a/ViewModels/MainViewModel.cs b/ViewModels/MainViewModel.cs index c48b9ce..04ec20f 100644 --- a/ViewModels/MainViewModel.cs +++ b/ViewModels/MainViewModel.cs @@ -8,7 +8,7 @@ using MembranePoreTester.Services; namespace MembranePoreTester.ViewModels { - public partial class MainViewModel : ViewModelBase + public partial class ParameterViewModel : ViewModelBase { private readonly IHardwareService _hardwareService; @@ -24,7 +24,7 @@ namespace MembranePoreTester.ViewModels [ObservableProperty] private SolidColorBrush _statusColor = new SolidColorBrush(Colors.Red); - public MainViewModel() + public ParameterViewModel() { // 注入硬件服务(实际项目中可用依赖注入) _hardwareService = new HardwareService(); diff --git a/Views/MainWindow.xaml b/Views/ParameterWindow.xaml similarity index 99% rename from Views/MainWindow.xaml rename to Views/ParameterWindow.xaml index 50c2d89..4d1517a 100644 --- a/Views/MainWindow.xaml +++ b/Views/ParameterWindow.xaml @@ -1,4 +1,4 @@ - _textBoxMapping = new(); - public MainWindow() + public ParameterWindow() { InitializeComponent(); _plcService = App.PlcService; diff --git a/Views/TestView.xaml.cs b/Views/TestView.xaml.cs index e2ce126..b2ccbea 100644 --- a/Views/TestView.xaml.cs +++ b/Views/TestView.xaml.cs @@ -20,7 +20,7 @@ namespace MembranePoreTester { if (Keyboard.Modifiers == ModifierKeys.Control && e.Key == Key.P) { - var win = new MainWindow(); + var win = new ParameterWindow(); win.Owner = this; win.ShowDialog(); }