csi_team/VacuumPressureMembranePoreSizeAnalyzer
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
xyy
2026-03-11 20:37:53 +08:00
parent b42ee7aa07
commit df022fc848
2 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
ViewModels/PoreDistributionViewModel.cs
View File

@@ -129,28 +129,40 @@ namespace MembranePoreTester.ViewModels
{
try
{
// 始终读取压力
float rawPressure = await _plcService.ReadPressureAsync();
float rawWetFlow = await _plcService.ReadWetFlowAsync();
float rawDryFlow = await _plcService.ReadDryFlowAsync();
double pressure = rawPressure * _plcConfig.PressureFactor;
double wetFlow = rawWetFlow * _plcConfig.WetFlowFactor;
double dryFlow = rawDryFlow * _plcConfig.DryFlowFactor;
if (SelectedDataPoint != null)
{
// 更新选中行
SelectedDataPoint.Pressure = pressure;
SelectedDataPoint.WetFlow = wetFlow;
SelectedDataPoint.DryFlow = dryFlow;
if (TestMode == "湿膜")
{
float rawWet = await _plcService.ReadWetFlowAsync();
SelectedDataPoint.WetFlow = rawWet * _plcConfig.WetFlowFactor;
}
else
{
float rawDry = await _plcService.ReadDryFlowAsync();
SelectedDataPoint.DryFlow = rawDry * _plcConfig.DryFlowFactor;
}
}
else
{
Record.DataPoints.Add(new DataPoint
// 新增一行
var newPoint = new DataPoint { Pressure = pressure };
if (TestMode == "湿膜")
{
Pressure = pressure,
WetFlow = wetFlow,
DryFlow = dryFlow
});
float rawWet = await _plcService.ReadWetFlowAsync();
newPoint.WetFlow = rawWet * _plcConfig.WetFlowFactor;
}
else
{
float rawDry = await _plcService.ReadDryFlowAsync();
newPoint.DryFlow = rawDry * _plcConfig.DryFlowFactor;
}
Record.DataPoints.Add(newPoint);
}
}
catch (Exception ex)
@@ -309,5 +321,15 @@ namespace MembranePoreTester.ViewModels
MessageBox.Show("导出成功");
}
}
private string _testMode = "湿膜";
public string TestMode
{
get => _testMode;
set => SetProperty(ref _testMode, value);
}
}
}