From 1d087c00e88fa065fb6a526edbfeaf0b8e0809d9 Mon Sep 17 00:00:00 2001 From: "GukSang.Jin" Date: Wed, 27 May 2026 11:50:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B02026?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewModels/CValueCalibrationViewModel.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/ConeCalorimeter/ViewModels/CValueCalibrationViewModel.cs b/ConeCalorimeter/ViewModels/CValueCalibrationViewModel.cs index 4ce328d..1b16d35 100644 --- a/ConeCalorimeter/ViewModels/CValueCalibrationViewModel.cs +++ b/ConeCalorimeter/ViewModels/CValueCalibrationViewModel.cs @@ -26,6 +26,8 @@ public sealed class CValueCalibrationViewModel : PageViewModel private const double CValueMaximum = 1000; private const double FractionalOxygenMaximum = 0.3; 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 SamplingPumpCoil = 50; private const ushort IgniterCoil = 53; @@ -164,7 +166,7 @@ public sealed class CValueCalibrationViewModel : PageViewModel private set => SetProperty(ref _pressureDifferenceText, value); } - public string HeatInputText { get; } = "5.0"; + public string HeatInputText { get; } = "5.0000"; public string CalibrationOxygenText { @@ -206,14 +208,14 @@ public sealed class CValueCalibrationViewModel : PageViewModel BaselineOxygenText = ReadOxygenPercentText( "BaselineOxygen", BaselineOxygenRegister, - "0.00"); + FourDecimalDisplayFormat); var temperature = ReadRangedFloatDisplay( "Temperature", "Te", TemperatureRegister, TemperatureMinimum, TemperatureMaximum, - "0.00"); + FourDecimalDisplayFormat); TemperatureText = temperature.Text; RememberCalibrationFloatByteOrder(temperature); @@ -223,14 +225,14 @@ public sealed class CValueCalibrationViewModel : PageViewModel PressureDifferenceRegister, PressureDifferenceMinimum, PressureDifferenceMaximum, - "0.00"); + FourDecimalDisplayFormat); PressureDifferenceText = pressureDifference.Text; var calibrationOxygen = ReadOxygenPercentDisplay( "CalibrationOxygen", "XO2", CalibrationOxygenRegister, - "0.00"); + FourDecimalDisplayFormat); CalibrationOxygenText = calibrationOxygen.Text; RememberCalibrationFloatByteOrder(calibrationOxygen); @@ -241,7 +243,7 @@ public sealed class CValueCalibrationViewModel : PageViewModel CValueRegister, CValueMinimum, CValueMaximum, - "0.00"); + FourDecimalDisplayFormat); CValueText = cValue.Text; RefreshHoldActionStates(); @@ -518,7 +520,7 @@ public sealed class CValueCalibrationViewModel : PageViewModel private static double NormalizeDisplayValue(double value) { - return Math.Abs(value) < 0.005 ? 0 : value; + return Math.Abs(value) < DisplayZeroTolerance ? 0 : value; } private CValueCalibrationActionViewModel CreateAction(