This commit is contained in:
xyy
2026-04-01 20:33:23 +08:00
parent 05c38a7dab
commit 4a6393ba8d
4 changed files with 6 additions and 6 deletions

View File

@@ -8,7 +8,7 @@ using MembranePoreTester.Services;
namespace MembranePoreTester.ViewModels namespace MembranePoreTester.ViewModels
{ {
public partial class MainViewModel : ViewModelBase public partial class ParameterViewModel : ViewModelBase
{ {
private readonly IHardwareService _hardwareService; private readonly IHardwareService _hardwareService;
@@ -24,7 +24,7 @@ namespace MembranePoreTester.ViewModels
[ObservableProperty] [ObservableProperty]
private SolidColorBrush _statusColor = new SolidColorBrush(Colors.Red); private SolidColorBrush _statusColor = new SolidColorBrush(Colors.Red);
public MainViewModel() public ParameterViewModel()
{ {
// 注入硬件服务(实际项目中可用依赖注入) // 注入硬件服务(实际项目中可用依赖注入)
_hardwareService = new HardwareService(); _hardwareService = new HardwareService();

View File

@@ -1,4 +1,4 @@
<Window x:Class="MembranePoreTester.MainWindow" <Window x:Class="MembranePoreTester.ParameterWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:MembranePoreTester" xmlns:local="clr-namespace:MembranePoreTester"

View File

@@ -7,7 +7,7 @@ using MembranePoreTester.Communication;
namespace MembranePoreTester namespace MembranePoreTester
{ {
public partial class MainWindow : Window public partial class ParameterWindow : Window
{ {
private readonly IPlcService _plcService; private readonly IPlcService _plcService;
private readonly PlcConfiguration _config; private readonly PlcConfiguration _config;
@@ -16,7 +16,7 @@ namespace MembranePoreTester
// 文本框映射:(文本框, 地址, 参数名, 是否浮点数) // 文本框映射:(文本框, 地址, 参数名, 是否浮点数)
private readonly List<(TextBox textBox, ushort address, string name, bool isFloat)> _textBoxMapping = new(); private readonly List<(TextBox textBox, ushort address, string name, bool isFloat)> _textBoxMapping = new();
public MainWindow() public ParameterWindow()
{ {
InitializeComponent(); InitializeComponent();
_plcService = App.PlcService; _plcService = App.PlcService;

View File

@@ -20,7 +20,7 @@ namespace MembranePoreTester
{ {
if (Keyboard.Modifiers == ModifierKeys.Control && e.Key == Key.P) if (Keyboard.Modifiers == ModifierKeys.Control && e.Key == Key.P)
{ {
var win = new MainWindow(); var win = new ParameterWindow();
win.Owner = this; win.Owner = this;
win.ShowDialog(); win.ShowDialog();
} }