diff --git a/ViewModels/BubblePointViewModel.cs b/ViewModels/BubblePointViewModel.cs index dfee5ef..bde56df 100644 --- a/ViewModels/BubblePointViewModel.cs +++ b/ViewModels/BubblePointViewModel.cs @@ -118,6 +118,7 @@ namespace MembranePoreTester.ViewModels CalculateCommand = new RelayCommand(Calculate); GenerateReportCommand = new RelayCommand(GenerateReport); SelectedLiquid = Liquids[0]; + Record.SampleType = "中空纤维膜"; ReadPlcCommand = new RelayCommand(async () => await ReadPlcAsync()); SaveCommand = new RelayCommand(SaveToDatabase); ExportCommand = new RelayCommand(ExportToExcel); @@ -282,6 +283,7 @@ namespace MembranePoreTester.ViewModels using var db = new AppDbContext(); db.BubblePointRecords.Add(entity); db.SaveChanges(); + MessageBox.Show("保存成功!"); } public void LoadFromDatabase(int recordId) @@ -290,7 +292,7 @@ namespace MembranePoreTester.ViewModels var entity = db.BubblePointRecords.Find(recordId); if (entity == null) return; - Record.SampleType = entity.SampleType; + Record.SampleType = entity.SampleType ?? "中空纤维膜"; Record.SampleSpec = entity.SampleSpec; Record.RoomTemperature = entity.RoomTemperature ?? 0; Record.SoakingTime = entity.SoakingTime ?? 0; @@ -336,6 +338,7 @@ namespace MembranePoreTester.ViewModels Task.Run(async () => { await _plcService.WriteCoilAsync(address, true); + MessageBox.Show("校准成功!"); }); } @@ -364,6 +367,7 @@ namespace MembranePoreTester.ViewModels Task.Run(async () => { await _plcService.WriteCoilAsync(address, true); + MessageBox.Show("校准成功!"); }); } diff --git a/ViewModels/MainViewModel.cs b/ViewModels/MainViewModel.cs index 8962387..5a3d1d4 100644 --- a/ViewModels/MainViewModel.cs +++ b/ViewModels/MainViewModel.cs @@ -90,7 +90,7 @@ namespace MembranePoreTester.ViewModels public List InTakeModeList => _inTakeModeList ??= new List { new PressureModeItem { Text = "底部进气", Value = 0 }, - new PressureModeItem { Text = "顶部进气", Value = 1 } + //new PressureModeItem { Text = "顶部进气", Value = 1 } }; public PressureModeItem SelecteInTakeMode diff --git a/ViewModels/PoreDistributionViewModel.cs b/ViewModels/PoreDistributionViewModel.cs index cb60f03..eda959c 100644 --- a/ViewModels/PoreDistributionViewModel.cs +++ b/ViewModels/PoreDistributionViewModel.cs @@ -213,8 +213,8 @@ namespace MembranePoreTester.ViewModels private TestLiquid _selectedLiquid; private bool _isCustomLiquid; private double _customSurfaceTension = 30.0; - private double _lowerPore = 0.2; - private double _upperPore = 0.8; + private double _lowerPore = 0.05; + private double _upperPore = 0.65; private double _rangePercentage; @@ -260,7 +260,7 @@ namespace MembranePoreTester.ViewModels public IReadOnlyList Liquids => TestLiquid.Predefined; public List PressureUnits => new() { "Pa", "cmHg", "psi" }; - public List MembraneTypes => new() { "中空纤维膜" }; + public List MembraneTypes => new() { "平板膜", "中空纤维膜" }; public TestLiquid SelectedLiquid { @@ -331,6 +331,7 @@ namespace MembranePoreTester.ViewModels CalculateCommand = new RelayCommand(Calculate); GenerateReportCommand = new RelayCommand(GenerateReport); SelectedLiquid = Liquids[0]; + Record.SampleType = "中空纤维膜"; Record.PressureUnit = PressureUnits[0]; // 默认 "Pa" ReadPlcCommand = new RelayCommand(async () => await ReadPlcAsync()); @@ -842,6 +843,7 @@ namespace MembranePoreTester.ViewModels Task.Run(async () => { await _plcService.WriteCoilAsync(address, true); + MessageBox.Show("校准成功!"); }); } @@ -870,6 +872,7 @@ namespace MembranePoreTester.ViewModels Task.Run(async () => { await _plcService.WriteCoilAsync(address, true); + MessageBox.Show("校准成功!"); }); } @@ -932,7 +935,7 @@ namespace MembranePoreTester.ViewModels .FirstOrDefault(p => p.Id == recordId); if (entity == null) return; - Record.SampleType = entity.SampleType; + Record.SampleType = entity.SampleType ?? "中空纤维膜"; Record.SampleSpec = entity.SampleSpec; Record.RoomTemperature = entity.RoomTemperature; Record.SoakingTime = entity.SoakingTime; @@ -1029,7 +1032,7 @@ namespace MembranePoreTester.ViewModels } - private string _testMode = "湿膜"; + private string _testMode = "湿膜"; // 默认湿膜 public string TestMode { get => _testMode; @@ -1037,7 +1040,7 @@ namespace MembranePoreTester.ViewModels { if (SetProperty(ref _testMode, value)) { - // 切换测试模式时刷新曲线显示(显示对应模式的历史数据) + // 切换测试模式时刷新曲线和相关逻辑 UpdatePlot(); } } @@ -1171,8 +1174,6 @@ namespace MembranePoreTester.ViewModels // } - - // PlotModel = model; //} @@ -1333,6 +1334,9 @@ namespace MembranePoreTester.ViewModels } + public List TestModes { get; } = new List {"全部", "湿膜", "干膜" }; + + private double ConvertFlowByMode(double rawFlow) diff --git a/Views/BubblePointView.xaml b/Views/BubblePointView.xaml index e8d6e36..33f2134 100644 --- a/Views/BubblePointView.xaml +++ b/Views/BubblePointView.xaml @@ -45,7 +45,7 @@