diff --git a/Config/Units.cs b/Config/Units.cs index 423320733..3ccfd3c98 100644 --- a/Config/Units.cs +++ b/Config/Units.cs @@ -8,32 +8,40 @@ namespace Config public enum Unit { None, - l, /// 1 liter - m3, /// 1000 l - gal_UK, /// 1 gal(UK) = 4.54609 l - gal_US, /// 1 gal(US) = 3.78541178 l - lph, /// 1 liter/h - m3ph, /// 1 m3/h = 1000 l/h - g, /// 0.001 kg - kg, /// 1 kilogram - t, /// 1000 kg - lb, /// 0.45359237 kg - C, /// degree Celsius - F, /// degree Fahrenheit - K, /// degree Kelvin - Pa, /// 1 Pa = 0.01 hPa - hPa, /// 1 hPa = 100 Pa - kPa, /// 1 kPa = 10 HPa - MPa, /// 1 MPa = 10000 hPa - mbar, /// 1 mbar = 1 hPa = 100 Pa - bar, /// 1 Bar = 1000 mbar = 100000 Pa - inHg, /// 1 inHg = 33.864 hPa - Pct, /// 1 % - Promile, /// 1 promile = 0.1 % - mm, /// 1 millimeter - cm, /// 1 cm = 10 mm - m, /// 1 m = 1000 mm - inch, /// 1 inch = 25.4 mm + + l, /// * 1 liter + m3, /// 1000 l + gal_UK, /// 1 gal(UK) = 4.54609 l + gal_US, /// 1 gal(US) = 3.78541178 l + + lph, /// 1 liter/h + m3ph, /// * 1 m3/h = 1000 l/h + + g, /// 0.001 kg + kg, /// * 1 kilogram + t, /// 1000 kg + lb, /// 0.45359237 kg + + C, /// * degree Celsius + F, /// degree Fahrenheit + K, /// degree Kelvin + + Pa, /// 1 Pa = 0.01 hPa + hPa, /// 1 hPa = 100 Pa + kPa, /// 1 kPa = 10 HPa + MPa, /// 1 MPa = 10000 hPa + mbar, /// 1 mbar = 1 hPa = 100 Pa + bar, /// * 1 Bar = 1000 mbar = 0.1 MPa = 100000 Pa + inHg, /// 1 inHg = 33.864 hPa + + Pct, /// * 1 % + Promile, /// 1 promile = 0.1 % + + mm, /// * 1 millimeter + cm, /// 1 cm = 10 mm + m, /// 1 m = 1000 mm + inch, /// 1 inch = 25.4 mm + Count } @@ -64,14 +72,14 @@ namespace Config case Unit.F: return 1.8 * v + 32; /// degree Fahrenheit case Unit.K: return v + 273.15; /// degree Kelvin - /// Pressure: internal representation in mbar = hPa - case Unit.Pa: return 100 * v; /// 1 hPa = 100 Pa - case Unit.hPa: return v; /// 1 hPa = 100 Pa - case Unit.mbar: return v; /// 1 mbar = 1 hPa = 100 Pa - case Unit.kPa: return 0.1 * v; /// 1 kPa = 10 HPa - case Unit.bar: return 0.001 * v; /// 1 bar = 1000 mbar = 100000 Pa - case Unit.MPa: return 0.0001 * v; /// 1 MPa = 10000 hPa - case Unit.inHg: return 0.02953 * v; /// 1 inHg = 33.864 hPa + /// Pressure: internal representation in bar = 0.1 MPa + case Unit.Pa: return 100000 * v; /// 1 hPa = 100 Pa + case Unit.hPa: return 1000 * v; /// 1 hPa = 100 Pa + case Unit.mbar: return 1000 * v; /// 1 mbar = 1 hPa = 100 Pa + case Unit.kPa: return 100 * v; /// 1 kPa = 10 HPa + case Unit.bar: return v; /// 1 bar = 1000 mbar = 100000 Pa + case Unit.MPa: return 0.1 * v; /// 1 MPa = 10000 hPa + case Unit.inHg: return 29.53 * v; /// 1 inHg = 33.864 hPa /// Error: internal representation in % case Unit.Pct: return v; /// 1 % @@ -112,14 +120,14 @@ namespace Config case Unit.F: return 5 * (v-32) / 9; /// degree Fahrenheit case Unit.K: return v - 273.15; /// degree Kelvin - /// Pressure: internal representation in mbar = hPa - case Unit.Pa: return 0.01 * v; /// 1 hPa = 100 Pa - case Unit.hPa: return v; /// 1 hPa = 100 Pa - case Unit.mbar: return v; /// 1 mbar = 1 hPa = 100 Pa - case Unit.kPa: return 10 * v; /// 1 kPa = 10 HPa - case Unit.bar: return 1000 * v; /// 1 bar = 1000 mbar = 100000 Pa - case Unit.MPa: return 10000 * v; /// 1 MPa = 10000 hPa - case Unit.inHg: return 33.864 * v; /// 1 inHg = 33.864 hPa + /// Pressure: internal representation in bar = 0.1 MPa + case Unit.Pa: return 0.00001 * v; /// 1 hPa = 100 Pa + case Unit.hPa: return 0.001 * v; /// 1 hPa = 100 Pa + case Unit.mbar: return 0.001 * v; /// 1 mbar = 1 hPa = 100 Pa + case Unit.kPa: return 0.01 * v; /// 1 kPa = 10 HPa + case Unit.bar: return v; /// 1 bar = 1000 mbar = 100000 Pa + case Unit.MPa: return 10 * v; /// 1 MPa = 10000 hPa + case Unit.inHg: return 0.033864 * v; /// 1 inHg = 33.864 hPa /// Error: internal representation in % case Unit.Pct: return v; /// 1 % diff --git a/Results/Entities/TestRslt.cs b/Results/Entities/TestRslt.cs index ee5a5ed53..9fb7a763f 100644 --- a/Results/Entities/TestRslt.cs +++ b/Results/Entities/TestRslt.cs @@ -31,41 +31,41 @@ namespace Results.Entities public virtual double DensityOut { get; set; } /// [kg/m3] public virtual double DensityDiv { get; set; } /// [kg/m3] public virtual double Buoyancy { get; set; } - public virtual double FlowMass { get; set; } /// [kg/h] calculated from conventional true value - public virtual double FlowVolume { get; set; } ///![m3/h] - public virtual double VolumeCTV { get; set; } /// [l] Volume conventional true value - public virtual double VolumeMaster { get; set; } /// [l] Volume from the master flow meter + public virtual double FlowMass { get; set; } /// [kg/h] calculated from conventional true value + public virtual double FlowVolume { get; set; } /// [m3/h] + public virtual double VolumeCTV { get; set; } /// [l] Volume conventional true value + public virtual double VolumeMaster { get; set; } /// [l] Volume from the master flow meter public virtual double ErrorMaster { get; set; } /// [%] /// Auxiliary results - public virtual float AmbientTempAve { get; set; } /// [deg.C] Average ambient air temperature - public virtual float AmbientPressAve { get; set; } /// Average ambient air pressure - public virtual float AmbientHumiAve { get; set; } /// [%] Average ambient air relative humidity - public virtual float PressUpAvrg { get; set; } /// [Bar] Input water pressure (average) - public virtual float PressUpStart { get; set; } /// [Bar] - public virtual float PressUpEnd { get; set; } /// [Bar] - public virtual float PressUpMin { get; set; } /// [Bar] - public virtual float PressUpMax { get; set; } /// [Bar] - public virtual float PressDownAvrg { get; set; } /// [Bar] - public virtual float PressDownStart { get; set; } /// [Bar] - public virtual float PressDownEnd { get; set; } /// [Bar] - public virtual float PressDownMin { get; set; } /// [Bar] - public virtual float PressDownMax { get; set; } /// [Bar] - public virtual float TempInAvrg { get; set; } /// [deg.C] - public virtual float TempInStart { get; set; } /// [deg.C] - public virtual float TempInEnd { get; set; } /// [deg.C] - public virtual float TempInMin { get; set; } /// [deg.C] - public virtual float TempInMax { get; set; } /// [deg.C] - public virtual float TempOutAvrg { get; set; } /// [deg.C] - public virtual float TempOutStart { get; set; } /// [deg.C] - public virtual float TempOutEnd { get; set; } /// [deg.C] - public virtual float TempOutMin { get; set; } /// [deg.C] - public virtual float TempOutMax { get; set; } /// [deg.C] - public virtual float TempDivAvrg { get; set; } /// [deg.C] - public virtual float TempDivStart { get; set; } /// [deg.C] - public virtual float TempDivEnd { get; set; } /// [deg.C] - public virtual float TempDivMin { get; set; } /// [deg.C] - public virtual float TempDivMax { get; set; } /// [deg.C] + public virtual float AmbientTempAve { get; set; } /// [°C] Average ambient air temperature + public virtual float AmbientPressAve { get; set; } /// [bar] Average ambient air pressure + public virtual float AmbientHumiAve { get; set; } /// [%] Average ambient air relative humidity + public virtual float PressUpAvrg { get; set; } /// [bar] Input water pressure (average) + public virtual float PressUpStart { get; set; } /// [bar] + public virtual float PressUpEnd { get; set; } /// [bar] + public virtual float PressUpMin { get; set; } /// [bar] + public virtual float PressUpMax { get; set; } /// [bar] + public virtual float PressDownAvrg { get; set; } /// [bar] + public virtual float PressDownStart { get; set; } /// [bar] + public virtual float PressDownEnd { get; set; } /// [bar] + public virtual float PressDownMin { get; set; } /// [bar] + public virtual float PressDownMax { get; set; } /// [bar] + public virtual float TempInAvrg { get; set; } /// [°C] + public virtual float TempInStart { get; set; } /// [°C] + public virtual float TempInEnd { get; set; } /// [°C] + public virtual float TempInMin { get; set; } /// [°C] + public virtual float TempInMax { get; set; } /// [°C] + public virtual float TempOutAvrg { get; set; } /// [°C] + public virtual float TempOutStart { get; set; } /// [°C] + public virtual float TempOutEnd { get; set; } /// [°C] + public virtual float TempOutMin { get; set; } /// [°C] + public virtual float TempOutMax { get; set; } /// [°C] + public virtual float TempDivAvrg { get; set; } /// [°C] + public virtual float TempDivStart { get; set; } /// [°C] + public virtual float TempDivEnd { get; set; } /// [°C] + public virtual float TempDivMin { get; set; } /// [°C] + public virtual float TempDivMax { get; set; } /// [°C] public virtual float FlowMin { get; set; } /// [kg/m3] minimum flow public virtual float FlowMax { get; set; } /// [kg/m3] maximum flow diff --git a/Results/Entities/WaterMeter.cs b/Results/Entities/WaterMeter.cs index 34d25261c..1d6712f6c 100644 --- a/Results/Entities/WaterMeter.cs +++ b/Results/Entities/WaterMeter.cs @@ -16,8 +16,8 @@ namespace Results.Entities public virtual int WMPosition { get; set; } public virtual string EndState { get; set; } /// End state (of the main water meter) public virtual string EndStateAux { get; set; } /// End state of the auxiliary water meter - public virtual double QRise { get; set; } ///![m3/h] detected Q_rise of a composed meter - public virtual double QFall { get; set; } ///![m3/h] detected Q_fall of a composed meter + public virtual double QRise { get; set; } /// [m3/h] detected Q_rise of a composed meter + public virtual double QFall { get; set; } /// [m3/h] detected Q_fall of a composed meter public virtual bool Passed { get; set; } public virtual int ResultCode { get; set; } diff --git a/Results/ItemSpec.cs b/Results/ItemSpec.cs index 5de3fb149..bb459a9c3 100644 --- a/Results/ItemSpec.cs +++ b/Results/ItemSpec.cs @@ -85,51 +85,51 @@ namespace Results AllItems.Add(new ItemSpec("Density", Strings.Density, x => x.DensityOut().ToString("F1"), (x, y, z) => z.DensityOut().ToString("F1"))); /// [kg/m3] /// Target values - AllItems.Add(new ItemSpec("Q from", Strings.Q_from_m3ph, x => x.Qfrom().ToString("F3"), (x, y, z) => z.Qfrom().ToString("F3"))); - AllItems.Add(new ItemSpec("Q to", Strings.Q_to_m3ph, x => x.Qto().ToString("F3"), (x, y, z) => z.Qto().ToString("F3"))); - AllItems.Add(new ItemSpec("Test volume", Strings.Test_vol_l, x => x.TargetVolume().ToString("F1"), (x, y, z) => z.TargetVolume().ToString("F1"))); - AllItems.Add(new ItemSpec("Error limit Lo", Strings.ErrLimLo_pct, x => x.ErrLimLo().ToString("F1"), (x, y, z) => z.ErrLimLo().ToString("F1"))); - AllItems.Add(new ItemSpec("Error limit Hi", Strings.ErrLimHi_pct, x => x.ErrLimHi().ToString("F1"), (x, y, z) => z.ErrLimHi().ToString("F1"))); - AllItems.Add(new ItemSpec("Uncertainty", Strings.Uncertainty_pct, x => x.Uncertainty().ToString("F2"), (x, y, z) => z.Uncertainty().ToString("F2"))); + AllItems.Add(new ItemSpec("Q from", Strings.Q_from + " [m3/h]", x => x.Qfrom().ToString("F3"), (x, y, z) => z.Qfrom().ToString("F3"))); + AllItems.Add(new ItemSpec("Q to", Strings.Q_to + " [m3/h]", x => x.Qto().ToString("F3"), (x, y, z) => z.Qto().ToString("F3"))); + AllItems.Add(new ItemSpec("Test volume", Strings.Test_vol + " [l]", x => x.TargetVolume().ToString("F1"), (x, y, z) => z.TargetVolume().ToString("F1"))); + AllItems.Add(new ItemSpec("Error limit Lo", Strings.ErrLimLo + " [%]", x => x.ErrLimLo().ToString("F1"), (x, y, z) => z.ErrLimLo().ToString("F1"))); + AllItems.Add(new ItemSpec("Error limit Hi", Strings.ErrLimHi + " [%]", x => x.ErrLimHi().ToString("F1"), (x, y, z) => z.ErrLimHi().ToString("F1"))); + AllItems.Add(new ItemSpec("Uncertainty", Strings.Uncertainty + " [%]", x => x.Uncertainty().ToString("F2"), (x, y, z) => z.Uncertainty().ToString("F2"))); /// Test results - AllItems.Add(new ItemSpec("Test start time", Strings.T_start, x => x.StartTime().ToShortTimeString(), (x, y, z) => z.StartTime().ToShortTimeString())); - AllItems.Add(new ItemSpec("Test end time", Strings.T_end, x => x.EndTime().ToShortTimeString(), (x, y, z) => z.EndTime().ToShortTimeString())); - AllItems.Add(new ItemSpec("Test time", Strings.T_s, x => x.TestTime.ToString("F2"), (x, y, z) => z.TestTime.ToString("F2"))); - AllItems.Add(new ItemSpec("Flow", Strings.Flow_m3ph, x => Utils.DoubleToStr(x.FlowVolume(), 4), (x, y, z) => Utils.DoubleToStr(z.FlowVolume(), 4))); - AllItems.Add(new ItemSpec("T in", Strings.T_in_degC, x => x.TestRslt.TempInAvrg.ToString("F2"), (x, y, z) => z.TestRslt.TempInAvrg.ToString("F2"))); - AllItems.Add(new ItemSpec("T out", Strings.T_out_degC, x => x.TestRslt.TempOutAvrg.ToString("F2"), (x, y, z) => z.TestRslt.TempOutAvrg.ToString("F2"))); - AllItems.Add(new ItemSpec("T div", Strings.T_div_degC, x => x.TestRslt.TempDivAvrg.ToString("F2"), (x, y, z) => z.TestRslt.TempDivAvrg.ToString("F2"))); - AllItems.Add(new ItemSpec("P up", Strings.P_up_kPa, x => x.TestRslt.PressUpAvrg.ToString("F3"), (x, y, z) => z.TestRslt.PressUpAvrg.ToString("F3"))); - AllItems.Add(new ItemSpec("P up start", Strings.P_up_start_kPa, x => x.TestRslt.PressUpStart.ToString("F3"), (x, y, z) => z.TestRslt.PressUpStart.ToString("F3"))); - AllItems.Add(new ItemSpec("P up end", Strings.P_up_end_kPa, x => x.TestRslt.PressUpEnd.ToString("F3"), (x, y, z) => z.TestRslt.PressUpEnd.ToString("F3"))); - AllItems.Add(new ItemSpec("P down", Strings.P_dn_kPa, x => x.TestRslt.PressDownAvrg.ToString("F3"), (x, y, z) => z.TestRslt.PressDownAvrg.ToString("F3"))); - AllItems.Add(new ItemSpec("P down start", Strings.P_dn_start_kPa, x => x.TestRslt.PressDownStart.ToString("F3"), (x, y, z) => z.TestRslt.PressDownStart.ToString("F3"))); - AllItems.Add(new ItemSpec("P down end", Strings.P_dn_end_kPa, x => x.TestRslt.PressDownEnd.ToString("F3"), (x, y, z) => z.TestRslt.PressDownEnd.ToString("F3"))); - AllItems.Add(new ItemSpec("Reference error", Strings.ErrRef_pct, x => x.TestRslt.ErrorMaster.ToString("F3"), (x, y, z) => z.TestRslt.ErrorMaster.ToString("F3"))); - AllItems.Add(new ItemSpec("Ambient temperature",Strings.T_amb_degC, x => x.TestRslt.AmbientTempAve.ToString("F1"), (x, y, z) => z.TestRslt.AmbientTempAve.ToString("F1"))); - AllItems.Add(new ItemSpec("Ambient pressure", Strings.P_amb_mbar, x => x.TestRslt.AmbientPressAve.ToString("F0"),(x, y, z) => z.TestRslt.AmbientPressAve.ToString("F0"))); - AllItems.Add(new ItemSpec("Ambient humidity", Strings.H_amb_pct, x => x.TestRslt.AmbientHumiAve.ToString("F1"), (x, y, z) => z.TestRslt.AmbientHumiAve.ToString("F1"))); + AllItems.Add(new ItemSpec("Test start time", Strings.T_start, x => x.StartTime().ToShortTimeString(), (x, y, z) => z.StartTime().ToShortTimeString())); + AllItems.Add(new ItemSpec("Test end time", Strings.T_end, x => x.EndTime().ToShortTimeString(), (x, y, z) => z.EndTime().ToShortTimeString())); + AllItems.Add(new ItemSpec("Test time", Strings.T_s, x => x.TestTime.ToString("F2"), (x, y, z) => z.TestTime.ToString("F2"))); + AllItems.Add(new ItemSpec("Flow", Strings.Flow + " [m3/h]", x => Utils.DoubleToStr(x.FlowVolume(), 4), (x, y, z) => Utils.DoubleToStr(z.FlowVolume(), 4))); + AllItems.Add(new ItemSpec("T in", Strings.T_in + " [°C]", x => x.TestRslt.TempInAvrg.ToString("F2"), (x, y, z) => z.TestRslt.TempInAvrg.ToString("F2"))); + AllItems.Add(new ItemSpec("T out", Strings.T_out + " [°C]", x => x.TestRslt.TempOutAvrg.ToString("F2"), (x, y, z) => z.TestRslt.TempOutAvrg.ToString("F2"))); + AllItems.Add(new ItemSpec("T div", Strings.T_div + " [°C]", x => x.TestRslt.TempDivAvrg.ToString("F2"), (x, y, z) => z.TestRslt.TempDivAvrg.ToString("F2"))); + AllItems.Add(new ItemSpec("P up", Strings.P_up + " [kPa]", x => (100 * x.TestRslt.PressUpAvrg).ToString("F3"), (x, y, z) => z.TestRslt.PressUpAvrg.ToString("F3"))); + AllItems.Add(new ItemSpec("P up start", Strings.P_up_start + " [kPa]", x => (100 * x.TestRslt.PressUpStart).ToString("F3"), (x, y, z) => z.TestRslt.PressUpStart.ToString("F3"))); + AllItems.Add(new ItemSpec("P up end", Strings.P_up_end + " [kPa]", x => (100 * x.TestRslt.PressUpEnd).ToString("F3"), (x, y, z) => z.TestRslt.PressUpEnd.ToString("F3"))); + AllItems.Add(new ItemSpec("P down", Strings.P_dn + " [kPa]", x => (100 * x.TestRslt.PressDownAvrg).ToString("F3"), (x, y, z) => z.TestRslt.PressDownAvrg.ToString("F3"))); + AllItems.Add(new ItemSpec("P down start", Strings.P_dn_start + " [kPa]", x => (100 * x.TestRslt.PressDownStart).ToString("F3"), (x, y, z) => z.TestRslt.PressDownStart.ToString("F3"))); + AllItems.Add(new ItemSpec("P down end", Strings.P_dn_end + " [kPa]", x => (100 * x.TestRslt.PressDownEnd).ToString("F3"), (x, y, z) => z.TestRslt.PressDownEnd.ToString("F3"))); + AllItems.Add(new ItemSpec("Reference error", Strings.ErrRef + " [%]", x => x.TestRslt.ErrorMaster.ToString("F3"), (x, y, z) => z.TestRslt.ErrorMaster.ToString("F3"))); + AllItems.Add(new ItemSpec("Ambient temperature",Strings.T_amb + " [°C]", x => x.TestRslt.AmbientTempAve.ToString("F1"), (x, y, z) => z.TestRslt.AmbientTempAve.ToString("F1"))); + AllItems.Add(new ItemSpec("Ambient pressure", Strings.P_amb + " [mbar]", x => (1000 * x.TestRslt.AmbientPressAve).ToString("F0"), (x, y, z) => (1000 * z.TestRslt.AmbientPressAve).ToString("F0"))); + AllItems.Add(new ItemSpec("Ambient humidity", Strings.H_amb + " [%]", x => x.TestRslt.AmbientHumiAve.ToString("F1"), (x, y, z) => z.TestRslt.AmbientHumiAve.ToString("F1"))); /// Single and combined meter results - AllItems.Add(new ItemSpec("Volume", Strings.Volume_l, x => x.VolumeMeter.ToString("F3"), (x, y, z) => z.VolumeMeter.ToString("F3"))); - AllItems.Add(new ItemSpec("Reference volume", Strings.VolRef_l, x => x.VolumeRef.ToString("F3"), (x, y, z) => z.VolumeRef.ToString("F3"))); - AllItems.Add(new ItemSpec("Error", Strings.Error_pct, x => x.Error.ToString("F2"), (x, y, z) => z.Error.ToString("F2"))); - AllItems.Add(new ItemSpec("Passed", Strings.Result, x => x.PassedColorStr(), (x, y, z) => z.PassedColorStr())); + AllItems.Add(new ItemSpec("Volume", Strings.Volume + " [l]", x => x.VolumeMeter.ToString("F3"), (x, y, z) => z.VolumeMeter.ToString("F3"))); + AllItems.Add(new ItemSpec("Reference volume", Strings.VolRef + " [l]", x => x.VolumeRef.ToString("F3"), (x, y, z) => z.VolumeRef.ToString("F3"))); + AllItems.Add(new ItemSpec("Error", Strings.Error + " [%]", x => x.Error.ToString("F2"), (x, y, z) => z.Error.ToString("F2"))); + AllItems.Add(new ItemSpec("Passed", Strings.Result, x => x.PassedColorStr(), (x, y, z) => z.PassedColorStr())); /// Water meter info - AllItems.Add(new ItemSpec("Watermeter type", Strings.WM_Type, x => x.WaterMeterData().ProductName, (x, y, z) => z.WaterMeterData().ProductName)); - AllItems.Add(new ItemSpec("Producer", Strings.Producer, x => x.WaterMeterData().Producer, (x, y, z) => z.WaterMeterData().Producer)); - AllItems.Add(new ItemSpec("Metrological class", Strings.MClass, x => x.WaterMeterData().MetrologicalClass, (x, y, z) => z.WaterMeterData().MetrologicalClass)); - AllItems.Add(new ItemSpec("Approval info", Strings.Approval, x => x.WaterMeterData().ApprovalInfo, (x, y, z) => z.WaterMeterData().ApprovalInfo)); - AllItems.Add(new ItemSpec("Q4", Strings.Q4_m3ph, x => x.WaterMeterData().Q4_Qmax.ToString(), (x, y, z) => z.WaterMeterData().Q4_Qmax.ToString())); - AllItems.Add(new ItemSpec("Q3", Strings.Q3_m3ph, x => x.WaterMeterData().Q3_Qn.ToString(), (x, y, z) => z.WaterMeterData().Q3_Qn.ToString())); - AllItems.Add(new ItemSpec("Q2", Strings.Q2_m3ph, x => x.WaterMeterData().Q2_Qt.ToString(), (x, y, z) => z.WaterMeterData().Q2_Qt.ToString())); - AllItems.Add(new ItemSpec("Q1", Strings.Q1_m3ph, x => x.WaterMeterData().Q1_Qmin.ToString(), (x, y, z) => z.WaterMeterData().Q1_Qmin.ToString())); - AllItems.Add(new ItemSpec("Qmax", Strings.Qmax_m3ph, x => x.WaterMeterData().Q4_Qmax.ToString(), (x, y, z) => z.WaterMeterData().Q4_Qmax.ToString())); - AllItems.Add(new ItemSpec("Qn", Strings.Qn_m3ph, x => x.WaterMeterData().Q3_Qn.ToString(), (x, y, z) => z.WaterMeterData().Q3_Qn.ToString())); - AllItems.Add(new ItemSpec("Qt", Strings.Qt_m3ph, x => x.WaterMeterData().Q2_Qt.ToString(), (x, y, z) => z.WaterMeterData().Q2_Qt.ToString())); - AllItems.Add(new ItemSpec("Qmin", Strings.Qmin_m3ph, x => x.WaterMeterData().Q1_Qmin.ToString(), (x, y, z) => z.WaterMeterData().Q1_Qmin.ToString())); + AllItems.Add(new ItemSpec("Watermeter type", Strings.WM_Type, x => x.WaterMeterData().ProductName, (x, y, z) => z.WaterMeterData().ProductName)); + AllItems.Add(new ItemSpec("Producer", Strings.Producer, x => x.WaterMeterData().Producer, (x, y, z) => z.WaterMeterData().Producer)); + AllItems.Add(new ItemSpec("Metrological class", Strings.MClass, x => x.WaterMeterData().MetrologicalClass, (x, y, z) => z.WaterMeterData().MetrologicalClass)); + AllItems.Add(new ItemSpec("Approval info", Strings.Approval, x => x.WaterMeterData().ApprovalInfo, (x, y, z) => z.WaterMeterData().ApprovalInfo)); + AllItems.Add(new ItemSpec("Q4", "Q4 [m3/h]", x => x.WaterMeterData().Q4_Qmax.ToString(), (x, y, z) => z.WaterMeterData().Q4_Qmax.ToString())); + AllItems.Add(new ItemSpec("Q3", "Q3 [m3/h]", x => x.WaterMeterData().Q3_Qn.ToString(), (x, y, z) => z.WaterMeterData().Q3_Qn.ToString())); + AllItems.Add(new ItemSpec("Q2", "Q2 [m3/h]", x => x.WaterMeterData().Q2_Qt.ToString(), (x, y, z) => z.WaterMeterData().Q2_Qt.ToString())); + AllItems.Add(new ItemSpec("Q1", "Q1 [m3/h]", x => x.WaterMeterData().Q1_Qmin.ToString(), (x, y, z) => z.WaterMeterData().Q1_Qmin.ToString())); + AllItems.Add(new ItemSpec("Qmax", "Qmax [m3/h]", x => x.WaterMeterData().Q4_Qmax.ToString(), (x, y, z) => z.WaterMeterData().Q4_Qmax.ToString())); + AllItems.Add(new ItemSpec("Qn", "Qn [m3/h]", x => x.WaterMeterData().Q3_Qn.ToString(), (x, y, z) => z.WaterMeterData().Q3_Qn.ToString())); + AllItems.Add(new ItemSpec("Qt", "Qt [m3/h]", x => x.WaterMeterData().Q2_Qt.ToString(), (x, y, z) => z.WaterMeterData().Q2_Qt.ToString())); + AllItems.Add(new ItemSpec("Qmin", "Qmin [m3/h]", x => x.WaterMeterData().Q1_Qmin.ToString(), (x, y, z) => z.WaterMeterData().Q1_Qmin.ToString())); /// Water meters results AllItems.Add(new ItemSpec("Serial Nr", Strings.sn, x => x.WaterMeter.SerialNr, (x, y, z) => z.WaterMeter.SerialNr)); @@ -144,14 +144,14 @@ namespace Results AllItems.Add(new ItemSpec("Reference pulses", Strings.RefPulses, x => x.PulsesMaster.ToString(), null)); /// Water meters results (combined) - AllItems.Add(new ItemSpec("Q rise", Strings.Q_rise_m3ph, null, (x, y, z) => (z.QRise() == 0) ? "-" : Utils.DoubleToStr(z.QRise(), 4))); - AllItems.Add(new ItemSpec("Q fall", Strings.Q_fall_m3ph, null, (x, y, z) => (z.QFall() == 0) ? "-" : Utils.DoubleToStr(z.QFall(), 4))); - AllItems.Add(new ItemSpec("Error large WM", Strings.Err_main_pct, null, (x, y, z) => x.Error.ToString("F2"))); - AllItems.Add(new ItemSpec("Error small WM", Strings.Err_aux_pct, null, (x, y, z) => y.Error.ToString("F2"))); - AllItems.Add(new ItemSpec("Serial Nr large WM", Strings.sn_main, null, (x, y, z) => x.SerialNr())); - AllItems.Add(new ItemSpec("Serial Nr small WM", Strings.sn_aux, null, (x, y, z) => y.SerialNr())); - AllItems.Add(new ItemSpec("End state large WM", Strings.EndState_main, null, (x, y, z) => x.EndState())); - AllItems.Add(new ItemSpec("End state small WM", Strings.EndState_aux, null, (x, y, z) => y.EndState())); + AllItems.Add(new ItemSpec("Q rise", Strings.Q_rise + " [m3/h]", null, (x, y, z) => (z.QRise() == 0) ? "-" : Utils.DoubleToStr(z.QRise(), 4))); + AllItems.Add(new ItemSpec("Q fall", Strings.Q_fall + " [m3/h]", null, (x, y, z) => (z.QFall() == 0) ? "-" : Utils.DoubleToStr(z.QFall(), 4))); + AllItems.Add(new ItemSpec("Error large WM", Strings.Err_main + " [%]", null, (x, y, z) => x.Error.ToString("F2"))); + AllItems.Add(new ItemSpec("Error small WM", Strings.Err_aux + " [%]", null, (x, y, z) => y.Error.ToString("F2"))); + AllItems.Add(new ItemSpec("Serial Nr large WM", Strings.sn_main, null, (x, y, z) => x.SerialNr())); + AllItems.Add(new ItemSpec("Serial Nr small WM", Strings.sn_aux, null, (x, y, z) => y.SerialNr())); + AllItems.Add(new ItemSpec("End state large WM", Strings.EndState_main, null, (x, y, z) => x.EndState())); + AllItems.Add(new ItemSpec("End state small WM", Strings.EndState_aux, null, (x, y, z) => y.EndState())); /// Batch info AllItems.Add(new ItemSpec("Batch number", Strings.Batch_nr, x => x.Batch().BatchNr.ToString(), (x, y, z) => x.Batch().BatchNr.ToString())); diff --git a/Results/Resources/Strings.Designer.cs b/Results/Resources/Strings.Designer.cs index c5df71f8e..0d27b4e99 100644 --- a/Results/Resources/Strings.Designer.cs +++ b/Results/Resources/Strings.Designer.cs @@ -196,65 +196,65 @@ namespace Results.Resources { } /// - /// Looks up a localized string similar to Err. aux. [%]. + /// Looks up a localized string similar to Err. aux.. /// - internal static string Err_aux_pct { + internal static string Err_aux { get { - return ResourceManager.GetString("Err_aux_pct", resourceCulture); + return ResourceManager.GetString("Err_aux", resourceCulture); } } /// - /// Looks up a localized string similar to Err. main [%]. + /// Looks up a localized string similar to Err. main. /// - internal static string Err_main_pct { + internal static string Err_main { get { - return ResourceManager.GetString("Err_main_pct", resourceCulture); + return ResourceManager.GetString("Err_main", resourceCulture); } } /// - /// Looks up a localized string similar to Err.Lim.Hi [%]. + /// Looks up a localized string similar to Err.Lim.Hi. /// - internal static string ErrLimHi_pct { + internal static string ErrLimHi { get { - return ResourceManager.GetString("ErrLimHi_pct", resourceCulture); + return ResourceManager.GetString("ErrLimHi", resourceCulture); } } /// - /// Looks up a localized string similar to Err.Lim.Lo [%]. + /// Looks up a localized string similar to Err.Lim.Lo. /// - internal static string ErrLimLo_pct { + internal static string ErrLimLo { get { - return ResourceManager.GetString("ErrLimLo_pct", resourceCulture); + return ResourceManager.GetString("ErrLimLo", resourceCulture); } } /// - /// Looks up a localized string similar to Error [%]. + /// Looks up a localized string similar to Error. /// - internal static string Error_pct { + internal static string Error { get { - return ResourceManager.GetString("Error_pct", resourceCulture); + return ResourceManager.GetString("Error", resourceCulture); } } /// - /// Looks up a localized string similar to Err.ref. [%]. + /// Looks up a localized string similar to Err.ref.. /// - internal static string ErrRef_pct { + internal static string ErrRef { get { - return ResourceManager.GetString("ErrRef_pct", resourceCulture); + return ResourceManager.GetString("ErrRef", resourceCulture); } } /// - /// Looks up a localized string similar to Flow [m3/h]. + /// Looks up a localized string similar to Flow. /// - internal static string Flow_m3ph { + internal static string Flow { get { - return ResourceManager.GetString("Flow_m3ph", resourceCulture); + return ResourceManager.GetString("Flow", resourceCulture); } } @@ -268,11 +268,11 @@ namespace Results.Resources { } /// - /// Looks up a localized string similar to H amb [%]. + /// Looks up a localized string similar to H amb. /// - internal static string H_amb_pct { + internal static string H_amb { get { - return ResourceManager.GetString("H_amb_pct", resourceCulture); + return ResourceManager.GetString("H_amb", resourceCulture); } } @@ -313,65 +313,65 @@ namespace Results.Resources { } /// - /// Looks up a localized string similar to P amb [mbar]. + /// Looks up a localized string similar to P amb. /// - internal static string P_amb_mbar { + internal static string P_amb { get { - return ResourceManager.GetString("P_amb_mbar", resourceCulture); + return ResourceManager.GetString("P_amb", resourceCulture); } } /// - /// Looks up a localized string similar to P down end [kPa]. + /// Looks up a localized string similar to P down. /// - internal static string P_dn_end_kPa { + internal static string P_dn { get { - return ResourceManager.GetString("P_dn_end_kPa", resourceCulture); + return ResourceManager.GetString("P_dn", resourceCulture); } } /// - /// Looks up a localized string similar to P down [kPa]. + /// Looks up a localized string similar to P down end. /// - internal static string P_dn_kPa { + internal static string P_dn_end { get { - return ResourceManager.GetString("P_dn_kPa", resourceCulture); + return ResourceManager.GetString("P_dn_end", resourceCulture); } } /// - /// Looks up a localized string similar to P down start [kPa]. + /// Looks up a localized string similar to P down start. /// - internal static string P_dn_start_kPa { + internal static string P_dn_start { get { - return ResourceManager.GetString("P_dn_start_kPa", resourceCulture); + return ResourceManager.GetString("P_dn_start", resourceCulture); } } /// - /// Looks up a localized string similar to P up end [kPa]. + /// Looks up a localized string similar to P up. /// - internal static string P_up_end_kPa { + internal static string P_up { get { - return ResourceManager.GetString("P_up_end_kPa", resourceCulture); + return ResourceManager.GetString("P_up", resourceCulture); } } /// - /// Looks up a localized string similar to P up [kPa]. + /// Looks up a localized string similar to P up end. /// - internal static string P_up_kPa { + internal static string P_up_end { get { - return ResourceManager.GetString("P_up_kPa", resourceCulture); + return ResourceManager.GetString("P_up_end", resourceCulture); } } /// - /// Looks up a localized string similar to P up start [kPa]. + /// Looks up a localized string similar to P up start. /// - internal static string P_up_start_kPa { + internal static string P_up_start { get { - return ResourceManager.GetString("P_up_start_kPa", resourceCulture); + return ResourceManager.GetString("P_up_start", resourceCulture); } } @@ -448,110 +448,38 @@ namespace Results.Resources { } /// - /// Looks up a localized string similar to Q fall [m3/h]. + /// Looks up a localized string similar to Q fall. /// - internal static string Q_fall_m3ph { + internal static string Q_fall { get { - return ResourceManager.GetString("Q_fall_m3ph", resourceCulture); + return ResourceManager.GetString("Q_fall", resourceCulture); } } /// - /// Looks up a localized string similar to Q from [m3/h]. + /// Looks up a localized string similar to Q from. /// - internal static string Q_from_m3ph { + internal static string Q_from { get { - return ResourceManager.GetString("Q_from_m3ph", resourceCulture); + return ResourceManager.GetString("Q_from", resourceCulture); } } /// - /// Looks up a localized string similar to Q rise [m3/h]. + /// Looks up a localized string similar to Q rise. /// - internal static string Q_rise_m3ph { + internal static string Q_rise { get { - return ResourceManager.GetString("Q_rise_m3ph", resourceCulture); + return ResourceManager.GetString("Q_rise", resourceCulture); } } /// - /// Looks up a localized string similar to Q to [m3/h]. + /// Looks up a localized string similar to Q to. /// - internal static string Q_to_m3ph { + internal static string Q_to { get { - return ResourceManager.GetString("Q_to_m3ph", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Q1 [m3/h]. - /// - internal static string Q1_m3ph { - get { - return ResourceManager.GetString("Q1_m3ph", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Q2 [m3/h]. - /// - internal static string Q2_m3ph { - get { - return ResourceManager.GetString("Q2_m3ph", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Q3 [m3/h]. - /// - internal static string Q3_m3ph { - get { - return ResourceManager.GetString("Q3_m3ph", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Q4 [m3/h]. - /// - internal static string Q4_m3ph { - get { - return ResourceManager.GetString("Q4_m3ph", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Qmax [m3/h]. - /// - internal static string Qmax_m3ph { - get { - return ResourceManager.GetString("Qmax_m3ph", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Qmin [m3/h]. - /// - internal static string Qmin_m3ph { - get { - return ResourceManager.GetString("Qmin_m3ph", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Qn [m3/h]. - /// - internal static string Qn_m3ph { - get { - return ResourceManager.GetString("Qn_m3ph", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Qt [m3/h]. - /// - internal static string Qt_m3ph { - get { - return ResourceManager.GetString("Qt_m3ph", resourceCulture); + return ResourceManager.GetString("Q_to", resourceCulture); } } @@ -664,20 +592,20 @@ namespace Results.Resources { } /// - /// Looks up a localized string similar to T amb [°C]. + /// Looks up a localized string similar to T amb. /// - internal static string T_amb_degC { + internal static string T_amb { get { - return ResourceManager.GetString("T_amb_degC", resourceCulture); + return ResourceManager.GetString("T_amb", resourceCulture); } } /// - /// Looks up a localized string similar to T div [°C]. + /// Looks up a localized string similar to T div. /// - internal static string T_div_degC { + internal static string T_div { get { - return ResourceManager.GetString("T_div_degC", resourceCulture); + return ResourceManager.GetString("T_div", resourceCulture); } } @@ -691,20 +619,20 @@ namespace Results.Resources { } /// - /// Looks up a localized string similar to T in [°C]. + /// Looks up a localized string similar to T in. /// - internal static string T_in_degC { + internal static string T_in { get { - return ResourceManager.GetString("T_in_degC", resourceCulture); + return ResourceManager.GetString("T_in", resourceCulture); } } /// - /// Looks up a localized string similar to T out [°C]. + /// Looks up a localized string similar to T out. /// - internal static string T_out_degC { + internal static string T_out { get { - return ResourceManager.GetString("T_out_degC", resourceCulture); + return ResourceManager.GetString("T_out", resourceCulture); } } @@ -754,20 +682,20 @@ namespace Results.Resources { } /// - /// Looks up a localized string similar to Test vol. [l]. + /// Looks up a localized string similar to Test vol.. /// - internal static string Test_vol_l { + internal static string Test_vol { get { - return ResourceManager.GetString("Test_vol_l", resourceCulture); + return ResourceManager.GetString("Test_vol", resourceCulture); } } /// - /// Looks up a localized string similar to Uncertainty [%]. + /// Looks up a localized string similar to Uncertainty. /// - internal static string Uncertainty_pct { + internal static string Uncertainty { get { - return ResourceManager.GetString("Uncertainty_pct", resourceCulture); + return ResourceManager.GetString("Uncertainty", resourceCulture); } } @@ -817,20 +745,20 @@ namespace Results.Resources { } /// - /// Looks up a localized string similar to Vol.ref. [l]. + /// Looks up a localized string similar to Vol.ref.. /// - internal static string VolRef_l { + internal static string VolRef { get { - return ResourceManager.GetString("VolRef_l", resourceCulture); + return ResourceManager.GetString("VolRef", resourceCulture); } } /// - /// Looks up a localized string similar to Volume [l]. + /// Looks up a localized string similar to Volume. /// - internal static string Volume_l { + internal static string Volume { get { - return ResourceManager.GetString("Volume_l", resourceCulture); + return ResourceManager.GetString("Volume", resourceCulture); } } diff --git a/Results/Resources/Strings.de.resx b/Results/Resources/Strings.de.resx index 6423504f7..65c2d00b6 100644 --- a/Results/Resources/Strings.de.resx +++ b/Results/Resources/Strings.de.resx @@ -162,32 +162,32 @@ Eindstand - - Fehlergrenze hoch [%] + + Fehlergrenze hoch - - Fehlergrenze niedrig [%] + + Fehlergrenze niedrig - - Fehler [%] + + Fehler - - Referenzfehler [%] + + Referenzfehler - - Fehler Nebenz. [%] + + Fehler Nebenz. - - Fehler Hauptz. [%] + + Fehler Hauptz. - - Durchfluss [m³/h] + + Durchfluss Format - - H umgebung [%] + + H umgebung Posten @@ -219,62 +219,38 @@ Impulse/l - - Dr umgebung [mbar] + + Dr umgebung - - Dr aus ende [kPa] + + Dr aus ende - - Dr aus [kPa] + + Dr aus - - Dr aus start [kPa] + + Dr aus start - - Dr ein ende [kPa] + + Dr ein ende - - Dr ein [kPa] + + Dr ein - - Dr ein start [kPa] + + Dr ein start - - Q1 [m3/h] + + Q fall - - Q2 [m3/h] + + Q von - - Q3 [m3/h] + + Q steig - - Q4 [m3/h] - - - Qmax [m3/h] - - - Qmin [m3/h] - - - Qn [m3/h] - - - Qt [m3/h] - - - Q fall [m3/h] - - - Q von [m3/h] - - - Q steig [m3/h] - - - Q bis [m3/h] + + Q bis Ref. Impulse @@ -312,23 +288,23 @@ Prüfart - - Prüfvolumen [l] + + Prüfvolumen - - T umgebung [°C] + + T umgebung - - T div [°C] + + T div Endzeit - - T ein [°C] + + T ein - - T aus [°C] + + T aus Dauer [s] @@ -336,8 +312,8 @@ Startzeit - - Unsicherheit [%] + + Unsicherheit Einheit @@ -354,11 +330,11 @@ Ver. - - Ref. Volumen [l] + + Ref. Volumen - - Volumen [l] + + Volumen Breite @@ -384,4 +360,7 @@ Montage + + Hersteller + \ No newline at end of file diff --git a/Results/Resources/Strings.resx b/Results/Resources/Strings.resx index af999a79e..f9e558497 100644 --- a/Results/Resources/Strings.resx +++ b/Results/Resources/Strings.resx @@ -162,32 +162,32 @@ End state - - Err.Lim.Hi [%] + + Err.Lim.Hi - - Err.Lim.Lo [%] + + Err.Lim.Lo - - Error [%] + + Error - - Err.ref. [%] + + Err.ref. - - Err. aux. [%] + + Err. aux. - - Err. main [%] + + Err. main - - Flow [m3/h] + + Flow Format - - H amb [%] + + H amb Item @@ -222,62 +222,38 @@ Pulses/l - - P amb [mbar] + + P amb - - P down end [kPa] + + P down end - - P down [kPa] + + P down - - P down start [kPa] + + P down start - - P up end [kPa] + + P up end - - P up [kPa] + + P up - - P up start [kPa] + + P up start - - Q1 [m3/h] + + Q fall - - Q2 [m3/h] + + Q from - - Q3 [m3/h] + + Q rise - - Q4 [m3/h] - - - Qmax [m3/h] - - - Qmin [m3/h] - - - Qn [m3/h] - - - Qt [m3/h] - - - Q fall [m3/h] - - - Q from [m3/h] - - - Q rise [m3/h] - - - Q to [m3/h] + + Q to Ref.pulses @@ -315,23 +291,23 @@ Test method - - Test vol. [l] + + Test vol. - - T amb [°C] + + T amb - - T div [°C] + + T div T end - - T in [°C] + + T in - - T out [°C] + + T out T [s] @@ -339,8 +315,8 @@ T start - - Uncertainty [%] + + Uncertainty Units @@ -357,11 +333,11 @@ Ver. - - Vol.ref. [l] + + Vol.ref. - - Volume [l] + + Volume Width diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs index dcf58145c..ee27b3ddd 100644 --- a/Results/WMeterRsltItemSpec.cs +++ b/Results/WMeterRsltItemSpec.cs @@ -96,101 +96,101 @@ namespace Results { AllItems = new List(); - AllItems.Add(new WMeterRsltItemSpec(ItemID.String, "String", (w, t, u, f, p) => f)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.String, "String", (w, t, u, f, p) => f)); /// Common - AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_name, Strings.Test + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Name())); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Procedure_name, Strings.Procedure, (w, t, u, f, p) => w.ProcedureName())); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_number, Strings.Batch_nr, (w, t, u, f, p) => w.BatchNr().ToString())); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_method, Strings.Test_method + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Method())); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Density, Strings.Density + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).DensityOut.ToString(string.IsNullOrEmpty(p) ? "F1" : p))); /// [kg/m3] + AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_name, Strings.Test + " *", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Name())); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Procedure_name, Strings.Procedure, (w, t, u, f, p) => w.ProcedureName())); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_number, Strings.Batch_nr, (w, t, u, f, p) => w.BatchNr().ToString())); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_method, Strings.Test_method + " *", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Method())); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Density, Strings.Density + " *", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).DensityOut.ToString(string.IsNullOrEmpty(p) ? "F1" : p))); /// [kg/m3] /// Target values - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_from, Strings.Q_from_m3ph + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Qfrom().ToString(string.IsNullOrEmpty(p) ? "F3" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_to, Strings.Q_to_m3ph + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Qto().ToString(string.IsNullOrEmpty(p) ? "F3" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_volume, Strings.Test_vol_l + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TargetVolume()).ToString(string.IsNullOrEmpty(p) ? "F1" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_limit_Lo, Strings.ErrLimLo_pct + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).ErrLimLo()).ToString(string.IsNullOrEmpty(p) ? "F1" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_limit_Hi, Strings.ErrLimHi_pct + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).ErrLimHi()).ToString(string.IsNullOrEmpty(p) ? "F1" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Uncertainty, Strings.Uncertainty_pct + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Uncertainty().ToString(string.IsNullOrEmpty(p) ? "F2" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_from, Strings.Q_from + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Qfrom().ToString(string.IsNullOrEmpty(p) ? "F3" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_to, Strings.Q_to + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Qto().ToString(string.IsNullOrEmpty(p) ? "F3" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_volume, Strings.Test_vol + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TargetVolume()).ToString(string.IsNullOrEmpty(p) ? "F1" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_limit_Lo, Strings.ErrLimLo + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).ErrLimLo()).ToString(string.IsNullOrEmpty(p) ? "F1" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_limit_Hi, Strings.ErrLimHi + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).ErrLimHi()).ToString(string.IsNullOrEmpty(p) ? "F1" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Uncertainty, Strings.Uncertainty + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Uncertainty().ToString(string.IsNullOrEmpty(p) ? "F2" : p))); /// Test results - AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_start_time, Strings.T_start + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : (string.IsNullOrEmpty(f) ? w.GetTestRslt(t).StartTime.ToString() : string.Format(f, w.GetTestRslt(t).StartTime)))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_end_time, Strings.T_end + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : (string.IsNullOrEmpty(f) ? w.GetTestRslt(t).EndTime.ToString() : string.Format(f, w.GetTestRslt(t).EndTime)))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_time, Strings.T_s + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).TestTime.ToString(string.IsNullOrEmpty(p) ? "F2" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow, Strings.Flow_m3ph + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Utils.DoubleToStr(Config.Units.ConvertTo(u, w.GetTestRslt(t).FlowVolume), 4))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.T_in, Strings.T_in_degC + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempInAvrg).ToString(string.IsNullOrEmpty(p) ? "F2" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.T_out, Strings.T_out_degC + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempOutAvrg).ToString(string.IsNullOrEmpty(p) ? "F2" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div, Strings.T_div_degC + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempDivAvrg).ToString(string.IsNullOrEmpty(p) ? "F2" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up, Strings.P_up_kPa + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressUpAvrg).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_start, Strings.P_up_start_kPa + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressUpStart).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_end, Strings.P_up_end_kPa + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressUpEnd).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down, Strings.P_dn_kPa + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressDownAvrg).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_start, Strings.P_dn_start_kPa + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressDownStart).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_end, Strings.P_dn_end_kPa + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressDownEnd).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_error, Strings.ErrRef_pct + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).ErrorMaster).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Ambient_temperature, Strings.T_amb_degC + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? Config.Units.ConvertTo(u, w.Batch.AmbientTempAve()).ToString(string.IsNullOrEmpty(p) ? "F1" : p) : Config.Units.ConvertTo(u, w.GetTestRslt(t).AmbientTempAve).ToString(string.IsNullOrEmpty(p) ? "F1" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Ambient_pressure, Strings.P_amb_mbar + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? Config.Units.ConvertTo(u, w.Batch.AmbientPressAve()).ToString(string.IsNullOrEmpty(p) ? "F0" : p) : Config.Units.ConvertTo(u, w.GetTestRslt(t).AmbientPressAve).ToString(string.IsNullOrEmpty(p) ? "F0" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Ambient_humidity, Strings.H_amb_pct + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? Config.Units.ConvertTo(u, w.Batch.AmbientHumiAve()).ToString(string.IsNullOrEmpty(p) ? "F1" : p) : Config.Units.ConvertTo(u, w.GetTestRslt(t).AmbientHumiAve).ToString(string.IsNullOrEmpty(p) ? "F1" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_start_time, Strings.T_start + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : (string.IsNullOrEmpty(f) ? w.GetTestRslt(t).StartTime.ToString() : string.Format(f, w.GetTestRslt(t).StartTime)))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_end_time, Strings.T_end + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : (string.IsNullOrEmpty(f) ? w.GetTestRslt(t).EndTime.ToString() : string.Format(f, w.GetTestRslt(t).EndTime)))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_time, Strings.T_s + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).TestTime.ToString(string.IsNullOrEmpty(p) ? "F2" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow, Strings.Flow + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Utils.DoubleToStr(Config.Units.ConvertTo(u, w.GetTestRslt(t).FlowVolume), 4))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.T_in, Strings.T_in + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempInAvrg).ToString(string.IsNullOrEmpty(p) ? "F2" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.T_out, Strings.T_out + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempOutAvrg).ToString(string.IsNullOrEmpty(p) ? "F2" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div, Strings.T_div + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempDivAvrg).ToString(string.IsNullOrEmpty(p) ? "F2" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up, Strings.P_up + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressUpAvrg).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_start, Strings.P_up_start + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressUpStart).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_end, Strings.P_up_end + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressUpEnd).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down, Strings.P_dn + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressDownAvrg).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_start, Strings.P_dn_start + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressDownStart).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_end, Strings.P_dn_end + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressDownEnd).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_error, Strings.ErrRef + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).ErrorMaster).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Ambient_temperature, Strings.T_amb + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? Config.Units.ConvertTo(u, w.Batch.AmbientTempAve()).ToString(string.IsNullOrEmpty(p) ? "F1" : p) : Config.Units.ConvertTo(u, w.GetTestRslt(t).AmbientTempAve).ToString(string.IsNullOrEmpty(p) ? "F1" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Ambient_pressure, Strings.P_amb + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? Config.Units.ConvertTo(u, w.Batch.AmbientPressAve()).ToString(string.IsNullOrEmpty(p) ? "F0" : p) : Config.Units.ConvertTo(u, w.GetTestRslt(t).AmbientPressAve).ToString(string.IsNullOrEmpty(p) ? "F0" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Ambient_humidity, Strings.H_amb + "()", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? Config.Units.ConvertTo(u, w.Batch.AmbientHumiAve()).ToString(string.IsNullOrEmpty(p) ? "F1" : p) : Config.Units.ConvertTo(u, w.GetTestRslt(t).AmbientHumiAve).ToString(string.IsNullOrEmpty(p) ? "F1" : p))); /// Single and combined meter results - AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume, Strings.Volume_l + "()", (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeMeter).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_volume, Strings.VolRef_l + "()", (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeRef).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume, Strings.Volume + "()", (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeMeter).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_volume, Strings.VolRef + "()", (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeRef).ToString(string.IsNullOrEmpty(p) ? "F3" : p))); #if IPERLST || IPERLST_SPECIAL - AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, Strings.Error_pct + "()", (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "0" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).Error).ToString(string.IsNullOrEmpty(p) ? "F2" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, Strings.Error + "()", (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "0" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).Error).ToString(string.IsNullOrEmpty(p) ? "F2" : p))); #else - AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, Strings.Error_pct + "()", (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).Error).ToString(string.IsNullOrEmpty(p) ? "F2" : p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, Strings.Error + "()", (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).Error).ToString(string.IsNullOrEmpty(p) ? "F2" : p))); #endif - AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed, Strings.Result + "()", (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PassedColorStr())); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed, Strings.Result + "()", (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PassedColorStr())); /// Water meter info - AllItems.Add(new WMeterRsltItemSpec(ItemID.Watermeter_type, Strings.WM_Type, (w, t, u, f, p) => w.WaterMeterData.ProductName)); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Producer, Strings.Producer, (w, t, u, f, p) => w.WaterMeterData.Producer)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Watermeter_type, Strings.WM_Type, (w, t, u, f, p) => w.WaterMeterData.ProductName)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Producer, Strings.Producer, (w, t, u, f, p) => w.WaterMeterData.Producer)); - AllItems.Add(new WMeterRsltItemSpec(ItemID.DN, "DN", (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.DN).ToString() - : Config.Units.ConvertTo(u, w.WaterMeterData.DN).ToString(p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.L, "L", (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.L).ToString() - : Config.Units.ConvertTo(u, w.WaterMeterData.L).ToString(p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Mounting, Strings.Mounting, (w, t, u, f, p) => w.WaterMeterData.Mounting.ToDescription())); + AllItems.Add(new WMeterRsltItemSpec(ItemID.DN, "DN", (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.DN).ToString() + : Config.Units.ConvertTo(u, w.WaterMeterData.DN).ToString(p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.L, "L", (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.L).ToString() + : Config.Units.ConvertTo(u, w.WaterMeterData.L).ToString(p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Mounting, Strings.Mounting, (w, t, u, f, p) => w.WaterMeterData.Mounting.ToDescription())); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q4, "Q4_Qmax", (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.Q4_Qmax).ToString() - : Config.Units.ConvertTo(u, w.WaterMeterData.Q4_Qmax).ToString(p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q3, "Q3_Qn", (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.Q3_Qn).ToString() - : Config.Units.ConvertTo(u, w.WaterMeterData.Q3_Qn).ToString(p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2, "Q2_Qt", (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.Q2_Qt).ToString() - : Config.Units.ConvertTo(u, w.WaterMeterData.Q2_Qt).ToString(p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q1, "Q1_Qmin", (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.Q1_Qmin).ToString() - : Config.Units.ConvertTo(u, w.WaterMeterData.Q1_Qmin).ToString(p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q4, "Q4_Qmax", (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.Q4_Qmax).ToString() + : Config.Units.ConvertTo(u, w.WaterMeterData.Q4_Qmax).ToString(p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q3, "Q3_Qn", (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.Q3_Qn).ToString() + : Config.Units.ConvertTo(u, w.WaterMeterData.Q3_Qn).ToString(p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2, "Q2_Qt", (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.Q2_Qt).ToString() + : Config.Units.ConvertTo(u, w.WaterMeterData.Q2_Qt).ToString(p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q1, "Q1_Qmin", (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.Q1_Qmin).ToString() + : Config.Units.ConvertTo(u, w.WaterMeterData.Q1_Qmin).ToString(p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Metrological_class, Strings.MClass, (w, t, u, f, p) => w.WaterMeterData.MetrologicalClass)); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Temperature_class, "Temperature class", (w, t, u, f, p) => w.WaterMeterData.TemperatureClass.ToDescription())); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Pressure_loss_class, "Pressure loss class", (w, t, u, f, p) => w.WaterMeterData.PressureLossClass.ToDescription())); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Metrological_class, Strings.MClass, (w, t, u, f, p) => w.WaterMeterData.MetrologicalClass)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Temperature_class, "Temperature class", (w, t, u, f, p) => w.WaterMeterData.TemperatureClass.ToDescription())); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Pressure_loss_class, "Pressure loss class", (w, t, u, f, p) => w.WaterMeterData.PressureLossClass.ToDescription())); AllItems.Add(new WMeterRsltItemSpec(ItemID.Max_admissible_pressure, "Max. admissible pressure",(w, t, u, f, p) => w.WaterMeterData.MaxAdmissiblePressure.ToDescription())); AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_profile_sensitivity_class, "Flow profile sensitivity class",(w, t, u, f, p) => w.WaterMeterData.FlowProfileSensitivityClass.ToDescription())); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Approval_info, Strings.Approval, (w, t, u, f, p) => w.WaterMeterData.ApprovalInfo)); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Certificate, "Certificate", (w, t, u, f, p) => w.WaterMeterData.Certificate)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Approval_info, Strings.Approval, (w, t, u, f, p) => w.WaterMeterData.ApprovalInfo)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Certificate, "Certificate", (w, t, u, f, p) => w.WaterMeterData.Certificate)); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses_per_liter, Strings.PulsesLiter, (w, t, u, f, p) => string.IsNullOrEmpty(p) ? w.WaterMeterData.PulsesPerLtr.ToString() - : w.WaterMeterData.PulsesPerLtr.ToString(p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses_per_liter, Strings.PulsesLiter, (w, t, u, f, p) => string.IsNullOrEmpty(p) ? w.WaterMeterData.PulsesPerLtr.ToString() + : w.WaterMeterData.PulsesPerLtr.ToString(p))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Text1, "Text1", (w, t, u, f, p) => w.WaterMeterData.Text1)); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Text2, "Text2", (w, t, u, f, p) => w.WaterMeterData.Text2)); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Text3, "Text3", (w, t, u, f, p) => w.WaterMeterData.Text3)); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Text4, "Text4", (w, t, u, f, p) => w.WaterMeterData.Text4)); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Text5, "Text5", (w, t, u, f, p) => w.WaterMeterData.Text5)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Text1, "Text1", (w, t, u, f, p) => w.WaterMeterData.Text1)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Text2, "Text2", (w, t, u, f, p) => w.WaterMeterData.Text2)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Text3, "Text3", (w, t, u, f, p) => w.WaterMeterData.Text3)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Text4, "Text4", (w, t, u, f, p) => w.WaterMeterData.Text4)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Text5, "Text5", (w, t, u, f, p) => w.WaterMeterData.Text5)); /// Water meters results - AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr, Strings.sn, (w, t, u, f, p) => w.SerialNr)); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Purchase_order, Strings.PO, (w, t, u, f, p) => w.PurchaseOrder)); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Year_of_production, Strings.Year, (w, t, u, f, p) => w.YearOfProduction.ToString())); - AllItems.Add(new WMeterRsltItemSpec(ItemID.WM_Position, Strings.Pos, (w, t, u, f, p) => w.WMPosition.ToString())); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr, Strings.sn, (w, t, u, f, p) => w.SerialNr)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Purchase_order, Strings.PO, (w, t, u, f, p) => w.PurchaseOrder)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Year_of_production, Strings.Year, (w, t, u, f, p) => w.YearOfProduction.ToString())); + AllItems.Add(new WMeterRsltItemSpec(ItemID.WM_Position, Strings.Pos, (w, t, u, f, p) => w.WMPosition.ToString())); /// Water meters results (single) - AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state, Strings.End_state, (w, t, u, f, p) => w.EndState)); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses, Strings.Pulses + "()", (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PulsesMeter.ToString())); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses__liter, Strings.PulsesLiter + "()", (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : (string.IsNullOrEmpty(p) ? w.GetMeterTestRslt(t).PulsesPerLiter.ToString() + AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state, Strings.End_state, (w, t, u, f, p) => w.EndState)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses, Strings.Pulses + "()", (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PulsesMeter.ToString())); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses__liter, Strings.PulsesLiter + "()", (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : (string.IsNullOrEmpty(p) ? w.GetMeterTestRslt(t).PulsesPerLiter.ToString() : w.GetMeterTestRslt(t).PulsesPerLiter.ToString(p)))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_pulses, Strings.RefPulses + "()", (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PulsesMaster.ToString())); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_pulses, Strings.RefPulses + "()", (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PulsesMaster.ToString())); /// Water meters results (combined) //AllItems.Add(new ItemSpec("Q rise", "Q rise [m3/h]", null, (x, y, z) => (z.QRise() == 0) ? "-" : Utils.DoubleToStr(z.QRise(), 4))); @@ -203,19 +203,19 @@ namespace Results //AllItems.Add(new ItemSpec("End state small WM", "End state", null, (x, y, z) => y.EndState())); /// Batch info - AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_bench_ID, Strings.Bench, (w, t, u, f, p) => w.Batch.TestBenchId.ToString())); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Program_version, Strings.Ver, (w, t, u, f, p) => w.Batch.ProgramVersion)); - AllItems.Add(new WMeterRsltItemSpec(ItemID.User_name, Strings.User, (w, t, u, f, p) => w.Batch.UserName)); - AllItems.Add(new WMeterRsltItemSpec(ItemID.User_nr, Strings.User_nr, (w, t, u, f, p) => w.Batch.UserNumber.ToString())); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Watermeters, Strings.WMs, (w, t, u, f, p) => w.Batch.WatermetersStr)); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Protocol_title, Strings.Protocol, (w, t, u, f, p) => w.Batch.ProtocolTitle)); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_start_time, Strings.Start, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.Batch.StartTime.ToString() : string.Format(f, w.Batch.StartTime))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_end_time, Strings.End, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.Batch.EndTime.ToString() : string.Format(f, w.Batch.EndTime))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Lite_per_pulse_Read, "1 / PlsPerLtr_Read", (w, t, u, f, p) => string.IsNullOrEmpty(p) ? ((w.WaterMeterData.PulsesPerLtr != 0) ? 1 / w.WaterMeterData.PulsesPerLtr : 0).ToString() - : ((w.WaterMeterData.PulsesPerLtr != 0) ? 1 / w.WaterMeterData.PulsesPerLtr : 0).ToString(p))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_bench_ID, Strings.Bench, (w, t, u, f, p) => w.Batch.TestBenchId.ToString())); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Program_version, Strings.Ver, (w, t, u, f, p) => w.Batch.ProgramVersion)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.User_name, Strings.User, (w, t, u, f, p) => w.Batch.UserName)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.User_nr, Strings.User_nr, (w, t, u, f, p) => w.Batch.UserNumber.ToString())); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Watermeters, Strings.WMs, (w, t, u, f, p) => w.Batch.WatermetersStr)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Protocol_title, Strings.Protocol, (w, t, u, f, p) => w.Batch.ProtocolTitle)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_start_time, Strings.Start, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.Batch.StartTime.ToString() : string.Format(f, w.Batch.StartTime))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_end_time, Strings.End, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.Batch.EndTime.ToString() : string.Format(f, w.Batch.EndTime))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Lite_per_pulse_Read, "1 / PlsPerLtr_Read", (w, t, u, f, p) => string.IsNullOrEmpty(p) ? ((w.WaterMeterData.PulsesPerLtr != 0) ? 1 / w.WaterMeterData.PulsesPerLtr : 0).ToString() + : ((w.WaterMeterData.PulsesPerLtr != 0) ? 1 / w.WaterMeterData.PulsesPerLtr : 0).ToString(p))); /// Extra water meter data - AllItems.Add(new WMeterRsltItemSpec(ItemID.Result_code, Strings.Result_code, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.ResultCode.ToString() : string.Format(f, w.ResultCode))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Remark, Strings.Remark, (w, t, u, f, p) => w.Batch.Remark)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Result_code, Strings.Result_code, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.ResultCode.ToString() : string.Format(f, w.ResultCode))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Remark, Strings.Remark, (w, t, u, f, p) => w.Batch.Remark)); } /// diff --git a/TestBenchFramework/BenchControl/Ambient/Comet/Ambient.cs b/TestBenchFramework/BenchControl/Ambient/Comet/Ambient.cs index d73dc8d1f..32f491543 100644 --- a/TestBenchFramework/BenchControl/Ambient/Comet/Ambient.cs +++ b/TestBenchFramework/BenchControl/Ambient/Comet/Ambient.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2016 Sensus Metering Systems /// using System; using System.Collections.Generic; @@ -34,7 +34,7 @@ namespace TBF.BenchControl.Ambient.Comet /// Measured values when MsrmntState == MsrmntState.Valid /// float temperature; /// [deg C] - float pressure; /// [mbar] + float pressure; /// [bar] float humidity; /// [%] /// Measurement time stamp when MsrmntState == MsrmntState.Valid @@ -61,7 +61,7 @@ namespace TBF.BenchControl.Ambient.Comet { temperature = 20.0f; humidity = 40.0f; - pressure = 1000.0f; + pressure = 1.0f; msrmntTimeStamp = StateMachine.Time; msrmntState = MsrmntState.Valid; return; @@ -105,11 +105,11 @@ namespace TBF.BenchControl.Ambient.Comet humidity = (float)value / 10.0f; value = (int)byteArr[9] * 256 + (int)byteArr[10]; - pressure = (float)value / 10.0f; + pressure = (float)value / 10000.0f; msrmntTimeStamp = StateMachine.Time; msrmntState = MsrmntState.Valid; - log.InfoFormat("Ambient: temperature = {0} C, humidity = {1} %, pressure = {2} hPa", temperature.ToString("F1"), humidity.ToString("F1"), pressure.ToString("F0")); + log.InfoFormat("Ambient: temperature = {0} C, humidity = {1} %, pressure = {2} mbar", temperature.ToString("F1"), humidity.ToString("F1"), (1000 * pressure).ToString("F0")); } } } diff --git a/TestBenchFramework/BenchControl/Ambient/Greco/Ambient.cs b/TestBenchFramework/BenchControl/Ambient/Greco/Ambient.cs index 6db1d7afa..839cb4262 100644 --- a/TestBenchFramework/BenchControl/Ambient/Greco/Ambient.cs +++ b/TestBenchFramework/BenchControl/Ambient/Greco/Ambient.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2016 Sensus Metering Systems /// using System; using System.Collections.Generic; @@ -31,14 +31,12 @@ namespace TBF.BenchControl.Ambient.Greco /// The state of the measurement MsrmntState msrmntState; - /// Measured temperature when MsrmntState == MsrmntState.Valid - float temperature; - - /// Measured humidity when MsrmntState == MsrmntState.Valid - float humidity; - - /// Measured pressure when MsrmntState == MsrmntState.Valid - float pressure; + /// + /// Measured values when MsrmntState == MsrmntState.Valid + /// + float temperature; /// [deg C] + float pressure; /// [bar] + float humidity; /// [%] /// Measurement time stamp when MsrmntState == MsrmntState.Valid int msrmntTimeStamp; @@ -64,7 +62,7 @@ namespace TBF.BenchControl.Ambient.Greco { temperature = 20.0f; humidity = 40.0f; - pressure = 1000.0f; + pressure = 1.0f; msrmntTimeStamp = StateMachine.Time; msrmntState = MsrmntState.Valid; return; @@ -129,11 +127,11 @@ namespace TBF.BenchControl.Ambient.Greco { temperature = t; humidity = h; - pressure = p; + pressure = p / 1000.0F; msrmntTimeStamp = StateMachine.Time; msrmntState = MsrmntState.Valid; - log.InfoFormat("Ambient: temperature = {0} C, humidity = {1} %, pressure = {2} hPa", temperature.ToString("F1"), humidity.ToString("F1"), pressure.ToString("F0")); + log.InfoFormat("Ambient: temperature = {0} C, humidity = {1} %, pressure = {2} mbar", temperature.ToString("F1"), humidity.ToString("F1"), (1000 * pressure).ToString("F0")); } else { diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeter.cs b/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeter.cs index a34f43986..5569ddff4 100644 --- a/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeter.cs +++ b/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeter.cs @@ -49,7 +49,7 @@ namespace TBF.BenchControl.Elde.PressureMeter /// Pressure in mBar public float ReadPressure() { - return 10 * ControlBoard.Pressure(Idx0); /// converted from [kPa] to [mbar] + return 0.01F * ControlBoard.Pressure(Idx0); /// converted from [kPa] to [bar] } diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/ReadPressureOp.cs b/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/ReadPressureOp.cs index f3be8fd03..38440bd2e 100644 --- a/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/ReadPressureOp.cs +++ b/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/ReadPressureOp.cs @@ -43,7 +43,7 @@ namespace TBF.BenchControl.Elde.PressureMeterInternal /// Start this operation public void Start() { - pressure.Val = controlBoardDev.Pressure(pressureMeterNr); + pressure.Val = 0.01F * controlBoardDev.Pressure(pressureMeterNr); /// converted from [kPa] to [bar] } /// Run this operation @@ -52,7 +52,7 @@ namespace TBF.BenchControl.Elde.PressureMeterInternal /// public Event Run() { - pressure.Val = controlBoardDev.Pressure(pressureMeterNr); + pressure.Val = 0.01F * controlBoardDev.Pressure(pressureMeterNr); /// converted from [kPa] to [bar] return eventDone; } diff --git a/TestBenchFramework/BenchControl/Sequences/ProcessData.cs b/TestBenchFramework/BenchControl/Sequences/ProcessData.cs index be67efa77..dcf7699df 100644 --- a/TestBenchFramework/BenchControl/Sequences/ProcessData.cs +++ b/TestBenchFramework/BenchControl/Sequences/ProcessData.cs @@ -8,23 +8,23 @@ namespace TBF.BenchControl.Sequences { public static IBenchInfo BenchInfo; - public static FloatBox AmbientTemp = new FloatBox() { Name = "Ambient Temperature", Format = "F1" }; /// [Celsius] - public static FloatBox AmbientPressure = new FloatBox() { Name = "Ambient Pressure", Format = "F1" }; - public static FloatBox AmbientHumidity = new FloatBox() { Name = "Ambient Humidity", Format = "F1" }; /// [%] - public static FloatBox TempIn = new FloatBox() { Name = "Temperature In", Format = "F2" }; /// [Celsius] - public static FloatBox TempOut = new FloatBox() { Name = "Temperature Out", Format = "F2" }; /// [Celsius] - public static FloatBox TempDiv = new FloatBox() { Name = "Temperature Div", Format = "F2" }; /// [Celsius] - public static FloatBox PressureUp = new FloatBox() { Name = "Pressure In", Format = "F2", Factor = 0.001f }; /// [mbar], printed by ToString() in [bar] - public static FloatBox PressureDown = new FloatBox() { Name = "Pressure Out", Format = "F2", Factor = 0.001f }; /// [mbar], printed by ToString() in [bar] + public static FloatBox AmbientTemp = new FloatBox() { Name = "Ambient Temperature", Format = "F1" }; /// [Celsius] + public static FloatBox AmbientPressure = new FloatBox() { Name = "Ambient Pressure", Format = "F0", Factor = 1000 }; /// [bar], printed by ToString() in [mbar] + public static FloatBox AmbientHumidity = new FloatBox() { Name = "Ambient Humidity", Format = "F1" }; /// [%] + public static FloatBox TempIn = new FloatBox() { Name = "Temperature In", Format = "F2" }; /// [Celsius] + public static FloatBox TempOut = new FloatBox() { Name = "Temperature Out", Format = "F2" }; /// [Celsius] + public static FloatBox TempDiv = new FloatBox() { Name = "Temperature Div", Format = "F2" }; /// [Celsius] + public static FloatBox PressureUp = new FloatBox() { Name = "Pressure In", Format = "F2" }; /// [bar] + public static FloatBox PressureDown = new FloatBox() { Name = "Pressure Out", Format = "F2" }; /// [bar] - public static float LtrPerRefPulse; /// to calculate the ref.volume + public static float LtrPerRefPulse; /// to calculate the ref.volume public static int RefPulses; public static FloatBox RefFreq = new FloatBox() { Name = "RefFreq", Format = "F2" }; - public static FloatBox RefFlow = new FloatBox() { Name = "RefFlow", Format = "F2" }; /// [m3/h] + public static FloatBox RefFlow = new FloatBox() { Name = "RefFlow", Format = "F2" }; /// [m3/h] - public static FloatBox Mass = new FloatBox() { Name = "Mass", Format = "F3" }; /// [kg] - public static FloatBox StartMass = new FloatBox() { Name = "Start Mass", Format = "F3" }; /// [kg] - public static FloatBox EndMass = new FloatBox() { Name = "End Mass", Format = "F3" }; /// [kg] + public static FloatBox Mass = new FloatBox() { Name = "Mass", Format = "F3" }; /// [kg] + public static FloatBox StartMass = new FloatBox() { Name = "Start Mass", Format = "F3" }; /// [kg] + public static FloatBox EndMass = new FloatBox() { Name = "End Mass", Format = "F3" }; /// [kg] public static DateTime TestStartTime; public static DateTime TestEndTime; diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs index 81b97398e..109947453 100644 --- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs +++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs @@ -646,14 +646,14 @@ namespace TBF.BenchControl.Sequences sb.Append(";"); sb.Append(" "); sb.Append(";"); if (outPath.Balance != null) sb.Append(outPath.Balance.Name); sb.Append(";"); sb.Append(tstRslt.AmbientTempAve); - sb.Append(";"); sb.Append(tstRslt.AmbientPressAve); - sb.Append(";"); sb.Append(tstRslt.AmbientHumiAve); - sb.Append(";"); sb.Append(tstRslt.PressUpAvrg); - sb.Append(";"); sb.Append(tstRslt.PressDownAvrg); - sb.Append(";"); sb.Append(tstRslt.PressUpStart); - sb.Append(";"); sb.Append(tstRslt.PressDownStart); - sb.Append(";"); sb.Append(tstRslt.PressUpEnd); - sb.Append(";"); sb.Append(tstRslt.PressDownEnd); + sb.Append(";"); sb.Append((1000 * tstRslt.AmbientPressAve).ToString("F0")); /// Convert from [bar] to [mbar] + sb.Append(";"); sb.Append(tstRslt.AmbientHumiAve); /// [%] + sb.Append(";"); sb.Append(tstRslt.PressUpAvrg); /// [bar] + sb.Append(";"); sb.Append(tstRslt.PressDownAvrg); /// [bar] + sb.Append(";"); sb.Append(tstRslt.PressUpStart); /// [bar] + sb.Append(";"); sb.Append(tstRslt.PressDownStart); /// [bar] + sb.Append(";"); sb.Append(tstRslt.PressUpEnd); /// [bar] + sb.Append(";"); sb.Append(tstRslt.PressDownEnd); /// [bar] sb.Append(";"); sb.Append(tstRslt.TempInAvrg); sb.Append(";"); sb.Append(tstRslt.TempOutAvrg); sb.Append(";"); sb.Append(tstRslt.TempDivAvrg); @@ -819,31 +819,31 @@ namespace TBF.BenchControl.Sequences tstRslt.ErrorMaster = 0; tstRslt.AmbientTempAve = 20.0f; - tstRslt.AmbientPressAve = 1000.0f; + tstRslt.AmbientPressAve = 1.0f; tstRslt.AmbientHumiAve = 50.0f; - tstRslt.PressUpStart = 1000.0f; - tstRslt.PressDownStart = 1000.0f; + tstRslt.PressUpStart = 1.0f; + tstRslt.PressDownStart = 1.0f; tstRslt.TempInStart = 20.0f; tstRslt.TempOutStart = 20.0f; tstRslt.TempDivStart = 20.0f; - tstRslt.PressUpEnd = 1000.0f; - tstRslt.PressDownEnd = 1000.0f; + tstRslt.PressUpEnd = 1.0f; + tstRslt.PressDownEnd = 1.0f; tstRslt.TempInEnd = 20.0f; tstRslt.TempOutEnd = 20.0f; tstRslt.TempDivEnd = 20.0f; - tstRslt.PressUpAvrg = 1000.0f; - tstRslt.PressDownAvrg = 1000.0f; + tstRslt.PressUpAvrg = 1.0f; + tstRslt.PressDownAvrg = 1.0f; tstRslt.TempInAvrg = 20.0f; tstRslt.TempOutAvrg = 20.0f; tstRslt.TempDivAvrg = 20.0f; - tstRslt.PressUpMin = 1000.0f; - tstRslt.PressDownMin = 1000.0f; + tstRslt.PressUpMin = 1.0f; + tstRslt.PressDownMin = 1.0f; tstRslt.TempInMin = 20.0f; tstRslt.TempOutMin = 20.0f; tstRslt.TempDivMin = 20.0f; - tstRslt.PressUpMax = 1000.0f; - tstRslt.PressDownMax = 1000.0f; + tstRslt.PressUpMax = 1.0f; + tstRslt.PressDownMax = 1.0f; tstRslt.TempInMax = 20.0f; tstRslt.TempOutMax = 20.0f; tstRslt.TempDivMax = 20.0f; @@ -923,31 +923,31 @@ namespace TBF.BenchControl.Sequences tstRslt.ErrorMaster = 0; tstRslt.AmbientTempAve = 20.0f; - tstRslt.AmbientPressAve = 1000.0f; + tstRslt.AmbientPressAve = 1.0f; tstRslt.AmbientHumiAve = 50.0f; - tstRslt.PressUpStart = 1000.0f; - tstRslt.PressDownStart = 1000.0f; + tstRslt.PressUpStart = 1.0f; + tstRslt.PressDownStart = 1.0f; tstRslt.TempInStart = 20.0f; tstRslt.TempOutStart = 20.0f; tstRslt.TempDivStart = 20.0f; - tstRslt.PressUpEnd = 1000.0f; - tstRslt.PressDownEnd = 1000.0f; + tstRslt.PressUpEnd = 1.0f; + tstRslt.PressDownEnd = 1.0f; tstRslt.TempInEnd = 20.0f; tstRslt.TempOutEnd = 20.0f; tstRslt.TempDivEnd = 20.0f; - tstRslt.PressUpAvrg = 1000.0f; - tstRslt.PressDownAvrg = 1000.0f; + tstRslt.PressUpAvrg = 1.0f; + tstRslt.PressDownAvrg = 1.0f; tstRslt.TempInAvrg = 20.0f; tstRslt.TempOutAvrg = 20.0f; tstRslt.TempDivAvrg = 20.0f; - tstRslt.PressUpMin = 1000.0f; - tstRslt.PressDownMin = 1000.0f; + tstRslt.PressUpMin = 1.0f; + tstRslt.PressDownMin = 1.0f; tstRslt.TempInMin = 20.0f; tstRslt.TempOutMin = 20.0f; tstRslt.TempDivMin = 20.0f; - tstRslt.PressUpMax = 1000.0f; - tstRslt.PressDownMax = 1000.0f; + tstRslt.PressUpMax = 1.0f; + tstRslt.PressDownMax = 1.0f; tstRslt.TempInMax = 20.0f; tstRslt.TempOutMax = 20.0f; tstRslt.TempDivMax = 20.0f; diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs b/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs index 3f8efb32e..5a24b0bdf 100644 --- a/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs +++ b/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs @@ -412,8 +412,8 @@ namespace TBF.Screens /// Always available /// airTempLabel.Text = ProcessData.AmbientTemp.ToString(); - airPressLabel.Text = ProcessData.AmbientPressure.ToString(); - airHumiLabel.Text = ProcessData.AmbientHumidity.ToString(); + airPressLabel.Text = Config.Units.ConvertTo(Config.Unit.mbar, ProcessData.AmbientPressure.Val).ToString("F0"); + airHumiLabel.Text = ProcessData.AmbientHumidity.ToString(); tInLabel.Text = ProcessData.TempIn.ToString(); tOutLabel.Text = ProcessData.TempOut.ToString(); @@ -508,8 +508,8 @@ namespace TBF.Screens Results.Entities.TestRslt tRes = args.TestRslt; airTempLabel.Text = tRes.AmbientTempAve.ToString("F1"); - airPressLabel.Text = tRes.AmbientPressAve.ToString("F1"); - airHumiLabel.Text = tRes.AmbientHumiAve.ToString("F1"); + airPressLabel.Text = Config.Units.ConvertTo(Config.Unit.mbar, tRes.AmbientPressAve).ToString("F0"); + airHumiLabel.Text = tRes.AmbientHumiAve.ToString("F1"); tInLabel.Text = tRes.TempInAvrg.ToString("F2"); tOutLabel.Text = tRes.TempOutAvrg.ToString("F2"); diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl48.cs b/TestBenchFramework/Screens/ProcessTabPageCtrl48.cs index 2ca25d630..a3e0b6af9 100644 --- a/TestBenchFramework/Screens/ProcessTabPageCtrl48.cs +++ b/TestBenchFramework/Screens/ProcessTabPageCtrl48.cs @@ -441,7 +441,7 @@ namespace TBF.Screens /// Always available /// airTempLabel.Text = ProcessData.AmbientTemp.ToString(); - airPressLabel.Text = ProcessData.AmbientPressure.ToString(); + airPressLabel.Text = Config.Units.ConvertTo(Config.Unit.mbar, ProcessData.AmbientPressure.Val).ToString("F0"); airHumiLabel.Text = ProcessData.AmbientHumidity.ToString(); tInLabel.Text = ProcessData.TempIn.ToString(); @@ -537,8 +537,8 @@ namespace TBF.Screens Results.Entities.TestRslt tRes = args.TestRslt; airTempLabel.Text = tRes.AmbientTempAve.ToString("F1"); - airPressLabel.Text = tRes.AmbientPressAve.ToString("F1"); - airHumiLabel.Text = tRes.AmbientHumiAve.ToString("F1"); + airPressLabel.Text = Config.Units.ConvertTo(Config.Unit.mbar, tRes.AmbientPressAve).ToString("F0"); + airHumiLabel.Text = tRes.AmbientHumiAve.ToString("F1"); tInLabel.Text = tRes.TempInAvrg.ToString("F2"); tOutLabel.Text = tRes.TempOutAvrg.ToString("F2"); diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs b/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs index bbf899460..0c981b54e 100644 --- a/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs +++ b/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs @@ -446,8 +446,8 @@ namespace TBF.Screens /// Always available /// airTempLabel.Text = ProcessData.AmbientTemp.ToString(); - airPressLabel.Text = ProcessData.AmbientPressure.ToString(); - airHumiLabel.Text = ProcessData.AmbientHumidity.ToString(); + airPressLabel.Text = Config.Units.ConvertTo(Config.Unit.mbar, ProcessData.AmbientPressure.Val).ToString("F0"); + airHumiLabel.Text = ProcessData.AmbientHumidity.ToString(); tInLabel.Text = ProcessData.TempIn.ToString(); tOutLabel.Text = ProcessData.TempOut.ToString(); @@ -542,8 +542,8 @@ namespace TBF.Screens Results.Entities.TestRslt tRes = args.TestRslt; airTempLabel.Text = tRes.AmbientTempAve.ToString("F1"); - airPressLabel.Text = tRes.AmbientPressAve.ToString("F1"); - airHumiLabel.Text = tRes.AmbientHumiAve.ToString("F1"); + airPressLabel.Text = Config.Units.ConvertTo(Config.Unit.mbar, tRes.AmbientPressAve).ToString("F0"); + airHumiLabel.Text = tRes.AmbientHumiAve.ToString("F1"); tInLabel.Text = tRes.TempInAvrg.ToString("F2"); tOutLabel.Text = tRes.TempOutAvrg.ToString("F2");