cgx/ConeCalorimeter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新2026

Browse Source
This commit is contained in:
GukSang.Jin
2026-05-27 11:50:35 +08:00
parent db213436ad
commit 1d087c00e8
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ConeCalorimeter/ViewModels/CValueCalibrationViewModel.cs
View File

@@ -26,6 +26,8 @@ public sealed class CValueCalibrationViewModel : PageViewModel
private const double CValueMaximum = 1000; private const double CValueMaximum = 1000;
private const double FractionalOxygenMaximum = 0.3; private const double FractionalOxygenMaximum = 0.3;
private const double PlausibleOxygenMinimum = 1; private const double PlausibleOxygenMinimum = 1;
private const double DisplayZeroTolerance = 0.00005;
private const string FourDecimalDisplayFormat = "0.0000";
private const ushort CirculatingWaterCoil = 49; private const ushort CirculatingWaterCoil = 49;
private const ushort SamplingPumpCoil = 50; private const ushort SamplingPumpCoil = 50;
private const ushort IgniterCoil = 53; private const ushort IgniterCoil = 53;
@@ -164,7 +166,7 @@ public sealed class CValueCalibrationViewModel : PageViewModel
private set => SetProperty(ref _pressureDifferenceText, value); private set => SetProperty(ref _pressureDifferenceText, value);
} }
public string HeatInputText { get; } = "5.0"; public string HeatInputText { get; } = "5.0000";
public string CalibrationOxygenText public string CalibrationOxygenText
{ {
@@ -206,14 +208,14 @@ public sealed class CValueCalibrationViewModel : PageViewModel
BaselineOxygenText = ReadOxygenPercentText( BaselineOxygenText = ReadOxygenPercentText(
"BaselineOxygen", "BaselineOxygen",
BaselineOxygenRegister, BaselineOxygenRegister,
"0.00"); FourDecimalDisplayFormat);
var temperature = ReadRangedFloatDisplay( var temperature = ReadRangedFloatDisplay(
"Temperature", "Temperature",
"Te", "Te",
TemperatureRegister, TemperatureRegister,
TemperatureMinimum, TemperatureMinimum,
TemperatureMaximum, TemperatureMaximum,
"0.00"); FourDecimalDisplayFormat);
TemperatureText = temperature.Text; TemperatureText = temperature.Text;
RememberCalibrationFloatByteOrder(temperature); RememberCalibrationFloatByteOrder(temperature);
@@ -223,14 +225,14 @@ public sealed class CValueCalibrationViewModel : PageViewModel
PressureDifferenceRegister, PressureDifferenceRegister,
PressureDifferenceMinimum, PressureDifferenceMinimum,
PressureDifferenceMaximum, PressureDifferenceMaximum,
"0.00"); FourDecimalDisplayFormat);
PressureDifferenceText = pressureDifference.Text; PressureDifferenceText = pressureDifference.Text;
var calibrationOxygen = ReadOxygenPercentDisplay( var calibrationOxygen = ReadOxygenPercentDisplay(
"CalibrationOxygen", "CalibrationOxygen",
"XO2", "XO2",
CalibrationOxygenRegister, CalibrationOxygenRegister,
"0.00"); FourDecimalDisplayFormat);
CalibrationOxygenText = calibrationOxygen.Text; CalibrationOxygenText = calibrationOxygen.Text;
RememberCalibrationFloatByteOrder(calibrationOxygen); RememberCalibrationFloatByteOrder(calibrationOxygen);
@@ -241,7 +243,7 @@ public sealed class CValueCalibrationViewModel : PageViewModel
CValueRegister, CValueRegister,
CValueMinimum, CValueMinimum,
CValueMaximum, CValueMaximum,
"0.00"); FourDecimalDisplayFormat);
CValueText = cValue.Text; CValueText = cValue.Text;
RefreshHoldActionStates(); RefreshHoldActionStates();
@@ -518,7 +520,7 @@ public sealed class CValueCalibrationViewModel : PageViewModel
private static double NormalizeDisplayValue(double value) private static double NormalizeDisplayValue(double value)
{ {
return Math.Abs(value) < 0.005 ? 0 : value; return Math.Abs(value) < DisplayZeroTolerance ? 0 : value;
} }
private CValueCalibrationActionViewModel CreateAction( private CValueCalibrationActionViewModel CreateAction(