diff --git a/Results/ItemSpec.cs b/Results/ItemSpec.cs index a6fd9a4e5..5de3fb149 100644 --- a/Results/ItemSpec.cs +++ b/Results/ItemSpec.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using Results.Entities; +using Results.Resources; namespace Results { @@ -76,93 +77,93 @@ namespace Results /// Common - //AllItems.Add(new ResultItemSpec("Bench ID", "Bench ID", x => x.BenchID, (x, y, z) => x.BenchID)); - AllItems.Add(new ItemSpec("Test name", "Test", x => x.Name(), (x, y, z) => z.Name())); - AllItems.Add(new ItemSpec("Procedure name", "Procedure", x => x.ProcedureName(), (x, y, z) => z.ProcedureName())); - AllItems.Add(new ItemSpec("Batch number", "Batch nr.", x => x.BatchNr().ToString(), (x, y, z) => z.BatchNr().ToString())); - AllItems.Add(new ItemSpec("Test method", "Test method", x => x.Method(), (x, y, z) => z.Method())); - AllItems.Add(new ItemSpec("Density", "Density", x => x.DensityOut().ToString("F1"), (x, y, z) => z.DensityOut().ToString("F1"))); /// [kg/m3] + //AllItems.Add(new ResultItemSpec("Bench ID", "Bench ID", x => x.BenchID, (x, y, z) => x.BenchID)); + AllItems.Add(new ItemSpec("Test name", Strings.Test, x => x.Name(), (x, y, z) => z.Name())); + AllItems.Add(new ItemSpec("Procedure name", Strings.Procedure, x => x.ProcedureName(), (x, y, z) => z.ProcedureName())); + AllItems.Add(new ItemSpec("Batch number", Strings.Batch_nr, x => x.BatchNr().ToString(), (x, y, z) => z.BatchNr().ToString())); + AllItems.Add(new ItemSpec("Test method", Strings.Test_method, x => x.Method(), (x, y, z) => z.Method())); + 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", "Q from [m3/h]", x => x.Qfrom().ToString("F3"), (x, y, z) => z.Qfrom().ToString("F3"))); - AllItems.Add(new ItemSpec("Q to", "Q to [m3/h]", x => x.Qto().ToString("F3"), (x, y, z) => z.Qto().ToString("F3"))); - AllItems.Add(new ItemSpec("Test volume", "Test vol. [l]", x => x.TargetVolume().ToString("F1"), (x, y, z) => z.TargetVolume().ToString("F1"))); - AllItems.Add(new ItemSpec("Error limit Lo", "Err.Lim.Lo [%]", x => x.ErrLimLo().ToString("F1"), (x, y, z) => z.ErrLimLo().ToString("F1"))); - AllItems.Add(new ItemSpec("Error limit Hi", "Err.Lim.Hi [%]", x => x.ErrLimHi().ToString("F1"), (x, y, z) => z.ErrLimHi().ToString("F1"))); - AllItems.Add(new ItemSpec("Uncertainty", "Uncertainty [%]", x => x.Uncertainty().ToString("F2"), (x, y, z) => z.Uncertainty().ToString("F2"))); + 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"))); /// Test results - AllItems.Add(new ItemSpec("Test start time", "T start", x => x.StartTime().ToShortTimeString(), (x, y, z) => z.StartTime().ToShortTimeString())); - AllItems.Add(new ItemSpec("Test end time", "T end", x => x.EndTime().ToShortTimeString(), (x, y, z) => z.EndTime().ToShortTimeString())); - AllItems.Add(new ItemSpec("Test time", "T [s]", x => x.TestTime.ToString("F2"), (x, y, z) => z.TestTime.ToString("F2"))); - AllItems.Add(new ItemSpec("Flow", "Flow [m3/h]", x => Utils.DoubleToStr(x.FlowVolume(), 4), (x, y, z) => Utils.DoubleToStr(z.FlowVolume(), 4))); - AllItems.Add(new ItemSpec("T in", "T in [°C]", x => x.TestRslt.TempInAvrg.ToString("F2"), (x, y, z) => z.TestRslt.TempInAvrg.ToString("F2"))); - AllItems.Add(new ItemSpec("T out", "T out [°C]", x => x.TestRslt.TempOutAvrg.ToString("F2"), (x, y, z) => z.TestRslt.TempOutAvrg.ToString("F2"))); - AllItems.Add(new ItemSpec("T div", "T div [°C]", x => x.TestRslt.TempDivAvrg.ToString("F2"), (x, y, z) => z.TestRslt.TempDivAvrg.ToString("F2"))); - AllItems.Add(new ItemSpec("P up", "P up [kPa]", x => x.TestRslt.PressUpAvrg.ToString("F3"), (x, y, z) => z.TestRslt.PressUpAvrg.ToString("F3"))); - AllItems.Add(new ItemSpec("P up start", "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", "P up end [kPa]", x => x.TestRslt.PressUpEnd.ToString("F3"), (x, y, z) => z.TestRslt.PressUpEnd.ToString("F3"))); - AllItems.Add(new ItemSpec("P down", "P down [kPa]", x => x.TestRslt.PressDownAvrg.ToString("F3"), (x, y, z) => z.TestRslt.PressDownAvrg.ToString("F3"))); - AllItems.Add(new ItemSpec("P down start", "P down start [kPa]", x => x.TestRslt.PressDownStart.ToString("F3"),(x, y, z) => z.TestRslt.PressDownStart.ToString("F3"))); - AllItems.Add(new ItemSpec("P down end", "P down end [kPa]", x => x.TestRslt.PressDownEnd.ToString("F3"), (x, y, z) => z.TestRslt.PressDownEnd.ToString("F3"))); - AllItems.Add(new ItemSpec("Reference error", "Err.ref. [%]", x => x.TestRslt.ErrorMaster.ToString("F3"), (x, y, z) => z.TestRslt.ErrorMaster.ToString("F3"))); - AllItems.Add(new ItemSpec("Ambient temperature","T amb [°C]", x => x.TestRslt.AmbientTempAve.ToString("F1"), (x, y, z) => z.TestRslt.AmbientTempAve.ToString("F1"))); - AllItems.Add(new ItemSpec("Ambient pressure", "P amb [mbar]", x => x.TestRslt.AmbientPressAve.ToString("F0"), (x, y, z) => z.TestRslt.AmbientPressAve.ToString("F0"))); - AllItems.Add(new ItemSpec("Ambient humidity", "H amb [%]", 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_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"))); /// Single and combined meter results - AllItems.Add(new ItemSpec("Volume", "Volume [l]", x => x.VolumeMeter.ToString("F3"), (x, y, z) => z.VolumeMeter.ToString("F3"))); - AllItems.Add(new ItemSpec("Reference volume", "Vol.ref. [l]", x => x.VolumeRef.ToString("F3"), (x, y, z) => z.VolumeRef.ToString("F3"))); - AllItems.Add(new ItemSpec("Error", "Error [%]", x => x.Error.ToString("F2"), (x, y, z) => z.Error.ToString("F2"))); - AllItems.Add(new ItemSpec("Passed", "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_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())); /// Water meter info - AllItems.Add(new ItemSpec("Watermeter type", "WM Type", x => x.WaterMeterData().ProductName, (x, y, z) => z.WaterMeterData().ProductName)); - AllItems.Add(new ItemSpec("Producer", "Producer", x => x.WaterMeterData().Producer, (x, y, z) => z.WaterMeterData().Producer)); - AllItems.Add(new ItemSpec("Metrological class", "M.Class", x => x.WaterMeterData().MetrologicalClass, (x, y, z) => z.WaterMeterData().MetrologicalClass)); - AllItems.Add(new ItemSpec("Approval info", "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())); + 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())); /// Water meters results - AllItems.Add(new ItemSpec("Serial Nr", "s/n", x => x.WaterMeter.SerialNr, (x, y, z) => z.WaterMeter.SerialNr)); - AllItems.Add(new ItemSpec("Purchase order", "PO", x => x.WaterMeter.PurchaseOrder, (x, y, z) => z.WaterMeter.PurchaseOrder)); - AllItems.Add(new ItemSpec("Year of production", "Year", x => x.WaterMeter.YearOfProduction.ToString(), (x, y, z) => z.WaterMeter.YearOfProduction.ToString())); - AllItems.Add(new ItemSpec("WM Position", "Pos.", x => x.WaterMeter.WMPosition.ToString(), (x, y, z) => z.WaterMeter.WMPosition.ToString())); + AllItems.Add(new ItemSpec("Serial Nr", Strings.sn, x => x.WaterMeter.SerialNr, (x, y, z) => z.WaterMeter.SerialNr)); + AllItems.Add(new ItemSpec("Purchase order", Strings.PO, x => x.WaterMeter.PurchaseOrder, (x, y, z) => z.WaterMeter.PurchaseOrder)); + AllItems.Add(new ItemSpec("Year of production", Strings.Year, x => x.WaterMeter.YearOfProduction.ToString(), (x, y, z) => z.WaterMeter.YearOfProduction.ToString())); + AllItems.Add(new ItemSpec("WM Position", Strings.Pos, x => x.WaterMeter.WMPosition.ToString(), (x, y, z) => z.WaterMeter.WMPosition.ToString())); /// Water meters results (single) - AllItems.Add(new ItemSpec("End state", "End state", x => x.EndState(), null)); - AllItems.Add(new ItemSpec("Pulses", "Pulses", x => x.PulsesMeter.ToString(), null)); - AllItems.Add(new ItemSpec("Pulses/liter", "Pulses/liter", x => x.PulsesPerLiter.ToString(), null)); - AllItems.Add(new ItemSpec("Reference pulses", "Ref.pulses", x => x.PulsesMaster.ToString(), null)); + AllItems.Add(new ItemSpec("End state", Strings.End_state, x => x.EndState(), null)); + AllItems.Add(new ItemSpec("Pulses", Strings.Pulses, x => x.PulsesMeter.ToString(), null)); + AllItems.Add(new ItemSpec("Pulses/liter", Strings.PulsesLiter, x => x.PulsesPerLiter.ToString(), null)); + AllItems.Add(new ItemSpec("Reference pulses", Strings.RefPulses, x => x.PulsesMaster.ToString(), null)); /// 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))); - AllItems.Add(new ItemSpec("Q fall", "Q fall [m3/h]", null, (x, y, z) => (z.QFall() == 0) ? "-" : Utils.DoubleToStr(z.QFall(), 4))); - AllItems.Add(new ItemSpec("Error large WM", "Error-L [%]", null, (x, y, z) => x.Error.ToString("F2"))); - AllItems.Add(new ItemSpec("Error small WM", "Error-S [%]", null, (x, y, z) => y.Error.ToString("F2"))); - AllItems.Add(new ItemSpec("Serial Nr large WM", "s/n", null, (x, y, z) => x.SerialNr())); - AllItems.Add(new ItemSpec("Serial Nr small WM", "s/n", null, (x, y, z) => y.SerialNr())); - AllItems.Add(new ItemSpec("End state large WM", "End state", null, (x, y, z) => x.EndState())); - AllItems.Add(new ItemSpec("End state small WM", "End state", null, (x, y, z) => y.EndState())); + 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())); /// Batch info - AllItems.Add(new ItemSpec("Batch number", "Batch#", x => x.Batch().BatchNr.ToString(), (x, y, z) => x.Batch().BatchNr.ToString())); - AllItems.Add(new ItemSpec("Test bench ID", "Bench", x => x.Batch().TestBenchId.ToString(), (x, y, z) => x.Batch().TestBenchId.ToString())); - AllItems.Add(new ItemSpec("Program version", "Ver.", x => x.Batch().ProgramVersion, (x, y, z) => x.Batch().ProgramVersion)); - AllItems.Add(new ItemSpec("User name", "User", x => x.Batch().UserName, (x, y, z) => x.Batch().UserName)); - AllItems.Add(new ItemSpec("User nr.", "User#", x => x.Batch().UserNumber.ToString(), (x, y, z) => x.Batch().UserNumber.ToString())); - AllItems.Add(new ItemSpec("Procedure name", "Procedure", x => x.Batch().ProcedureName, (x, y, z) => x.Batch().ProcedureName)); - AllItems.Add(new ItemSpec("Watermeters", "WMs", x => x.Batch().WatermetersStr, (x, y, z) => x.Batch().WatermetersStr)); - AllItems.Add(new ItemSpec("Protocol title", "Protocol", x => x.Batch().ProtocolTitle, (x, y, z) => x.Batch().ProtocolTitle)); - AllItems.Add(new ItemSpec("Batch start time", "Start", x => x.Batch().StartTime.ToShortTimeString(), (x, y, z) => x.Batch().StartTime.ToShortTimeString())); - AllItems.Add(new ItemSpec("Batch end time", "End", x => x.Batch().EndTime.ToShortTimeString(), (x, y, z) => x.Batch().EndTime.ToShortTimeString())); + AllItems.Add(new ItemSpec("Batch number", Strings.Batch_nr, x => x.Batch().BatchNr.ToString(), (x, y, z) => x.Batch().BatchNr.ToString())); + AllItems.Add(new ItemSpec("Test bench ID", Strings.Bench, x => x.Batch().TestBenchId.ToString(), (x, y, z) => x.Batch().TestBenchId.ToString())); + AllItems.Add(new ItemSpec("Program version", Strings.Ver, x => x.Batch().ProgramVersion, (x, y, z) => x.Batch().ProgramVersion)); + AllItems.Add(new ItemSpec("User name", Strings.User, x => x.Batch().UserName, (x, y, z) => x.Batch().UserName)); + AllItems.Add(new ItemSpec("User nr.", Strings.User_nr, x => x.Batch().UserNumber.ToString(), (x, y, z) => x.Batch().UserNumber.ToString())); + AllItems.Add(new ItemSpec("Procedure name", Strings.Procedure, x => x.Batch().ProcedureName, (x, y, z) => x.Batch().ProcedureName)); + AllItems.Add(new ItemSpec("Watermeters", Strings.WMs, x => x.Batch().WatermetersStr, (x, y, z) => x.Batch().WatermetersStr)); + AllItems.Add(new ItemSpec("Protocol title", Strings.Protocol, x => x.Batch().ProtocolTitle, (x, y, z) => x.Batch().ProtocolTitle)); + AllItems.Add(new ItemSpec("Batch start time", Strings.Start, x => x.Batch().StartTime.ToShortTimeString(), (x, y, z) => x.Batch().StartTime.ToShortTimeString())); + AllItems.Add(new ItemSpec("Batch end time", Strings.End, x => x.Batch().EndTime.ToShortTimeString(), (x, y, z) => x.Batch().EndTime.ToShortTimeString())); } public static ItemSpec GetItem(string name) diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 6778c0631..53dbd0fe8 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.7.296.0")] -[assembly: AssemblyFileVersion("2.7.296.0")] +[assembly: AssemblyVersion("2.7.297.0")] +[assembly: AssemblyFileVersion("2.7.297.0")] diff --git a/Results/Resources/Strings.Designer.cs b/Results/Resources/Strings.Designer.cs index 28bfb92e1..c03bfd2b9 100644 --- a/Results/Resources/Strings.Designer.cs +++ b/Results/Resources/Strings.Designer.cs @@ -78,6 +78,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Approval. + /// + internal static string Approval { + get { + return ResourceManager.GetString("Approval", resourceCulture); + } + } + /// /// Looks up a localized string similar to Available results. /// @@ -87,6 +96,24 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Batch nr.. + /// + internal static string Batch_nr { + get { + return ResourceManager.GetString("Batch_nr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Bench. + /// + internal static string Bench { + get { + return ResourceManager.GetString("Bench", resourceCulture); + } + } + /// /// Looks up a localized string similar to Cancel. /// @@ -114,6 +141,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Density. + /// + internal static string Density { + get { + return ResourceManager.GetString("Density", resourceCulture); + } + } + /// /// Looks up a localized string similar to Down. /// @@ -123,6 +159,105 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to End. + /// + internal static string End { + get { + return ResourceManager.GetString("End", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to End state. + /// + internal static string End_state { + get { + return ResourceManager.GetString("End_state", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to End state aux.. + /// + internal static string EndState_aux { + get { + return ResourceManager.GetString("EndState_aux", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to End state main. + /// + internal static string EndState_main { + get { + return ResourceManager.GetString("EndState_main", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Err. aux. [%]. + /// + internal static string Err_aux_pct { + get { + return ResourceManager.GetString("Err_aux_pct", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Err. main [%]. + /// + internal static string Err_main_pct { + get { + return ResourceManager.GetString("Err_main_pct", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Err.Lim.Hi [%]. + /// + internal static string ErrLimHi_pct { + get { + return ResourceManager.GetString("ErrLimHi_pct", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Err.Lim.Lo [%]. + /// + internal static string ErrLimLo_pct { + get { + return ResourceManager.GetString("ErrLimLo_pct", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Error [%]. + /// + internal static string Error_pct { + get { + return ResourceManager.GetString("Error_pct", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Err.ref. [%]. + /// + internal static string ErrRef_pct { + get { + return ResourceManager.GetString("ErrRef_pct", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Flow [m3/h]. + /// + internal static string Flow_m3ph { + get { + return ResourceManager.GetString("Flow_m3ph", resourceCulture); + } + } + /// /// Looks up a localized string similar to Format. /// @@ -132,6 +267,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to H amb [%]. + /// + internal static string H_amb_pct { + get { + return ResourceManager.GetString("H_amb_pct", resourceCulture); + } + } + /// /// Looks up a localized string similar to Item. /// @@ -141,6 +285,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to M.Class. + /// + internal static string MClass { + get { + return ResourceManager.GetString("MClass", resourceCulture); + } + } + /// /// Looks up a localized string similar to OK. /// @@ -150,6 +303,87 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to P amb [mbar]. + /// + internal static string P_amb_mbar { + get { + return ResourceManager.GetString("P_amb_mbar", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to P down end [kPa]. + /// + internal static string P_dn_end_kPa { + get { + return ResourceManager.GetString("P_dn_end_kPa", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to P down [kPa]. + /// + internal static string P_dn_kPa { + get { + return ResourceManager.GetString("P_dn_kPa", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to P down start [kPa]. + /// + internal static string P_dn_start_kPa { + get { + return ResourceManager.GetString("P_dn_start_kPa", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to P up end [kPa]. + /// + internal static string P_up_end_kPa { + get { + return ResourceManager.GetString("P_up_end_kPa", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to P up [kPa]. + /// + internal static string P_up_kPa { + get { + return ResourceManager.GetString("P_up_kPa", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to P up start [kPa]. + /// + internal static string P_up_start_kPa { + get { + return ResourceManager.GetString("P_up_start_kPa", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PO. + /// + internal static string PO { + get { + return ResourceManager.GetString("PO", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Pos.. + /// + internal static string Pos { + get { + return ResourceManager.GetString("Pos", resourceCulture); + } + } + /// /// Looks up a localized string similar to Precision. /// @@ -159,6 +393,168 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Procedure. + /// + internal static string Procedure { + get { + return ResourceManager.GetString("Procedure", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Producer. + /// + internal static string Producer { + get { + return ResourceManager.GetString("Producer", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Protocol. + /// + internal static string Protocol { + get { + return ResourceManager.GetString("Protocol", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Pulses. + /// + internal static string Pulses { + get { + return ResourceManager.GetString("Pulses", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Pulses/l. + /// + internal static string PulsesLiter { + get { + return ResourceManager.GetString("PulsesLiter", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Q fall [m3/h]. + /// + internal static string Q_fall_m3ph { + get { + return ResourceManager.GetString("Q_fall_m3ph", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Q from [m3/h]. + /// + internal static string Q_from_m3ph { + get { + return ResourceManager.GetString("Q_from_m3ph", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Q rise [m3/h]. + /// + internal static string Q_rise_m3ph { + get { + return ResourceManager.GetString("Q_rise_m3ph", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Q to [m3/h]. + /// + internal static string Q_to_m3ph { + 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); + } + } + + /// + /// Looks up a localized string similar to Ref.pulses. + /// + internal static string RefPulses { + get { + return ResourceManager.GetString("RefPulses", resourceCulture); + } + } + /// /// Looks up a localized string similar to < Remove. /// @@ -177,6 +573,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Result. + /// + internal static string Result { + get { + return ResourceManager.GetString("Result", resourceCulture); + } + } + /// /// Looks up a localized string similar to Selected results. /// @@ -186,6 +591,114 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to s/n. + /// + internal static string sn { + get { + return ResourceManager.GetString("sn", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to s/n aux.. + /// + internal static string sn_aux { + get { + return ResourceManager.GetString("sn_aux", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to s/n main. + /// + internal static string sn_main { + get { + return ResourceManager.GetString("sn_main", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Start. + /// + internal static string Start { + get { + return ResourceManager.GetString("Start", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to T amb [°C]. + /// + internal static string T_amb_degC { + get { + return ResourceManager.GetString("T_amb_degC", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to T div [°C]. + /// + internal static string T_div_degC { + get { + return ResourceManager.GetString("T_div_degC", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to T end. + /// + internal static string T_end { + get { + return ResourceManager.GetString("T_end", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to T in [°C]. + /// + internal static string T_in_degC { + get { + return ResourceManager.GetString("T_in_degC", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to T out [°C]. + /// + internal static string T_out_degC { + get { + return ResourceManager.GetString("T_out_degC", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to T [s]. + /// + internal static string T_s { + get { + return ResourceManager.GetString("T_s", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to T start. + /// + internal static string T_start { + get { + return ResourceManager.GetString("T_start", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test. + /// + internal static string Test { + get { + return ResourceManager.GetString("Test", resourceCulture); + } + } + /// /// Looks up a localized string similar to Test ID. /// @@ -195,6 +708,33 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Test method. + /// + internal static string Test_method { + get { + return ResourceManager.GetString("Test_method", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test vol. [l]. + /// + internal static string Test_vol_l { + get { + return ResourceManager.GetString("Test_vol_l", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Uncertainty [%]. + /// + internal static string Uncertainty_pct { + get { + return ResourceManager.GetString("Uncertainty_pct", resourceCulture); + } + } + /// /// Looks up a localized string similar to Units. /// @@ -213,6 +753,51 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to User. + /// + internal static string User { + get { + return ResourceManager.GetString("User", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to User nr.. + /// + internal static string User_nr { + get { + return ResourceManager.GetString("User_nr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Ver.. + /// + internal static string Ver { + get { + return ResourceManager.GetString("Ver", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Vol.ref. [l]. + /// + internal static string VolRef_l { + get { + return ResourceManager.GetString("VolRef_l", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Volume [l]. + /// + internal static string Volume_l { + get { + return ResourceManager.GetString("Volume_l", resourceCulture); + } + } + /// /// Looks up a localized string similar to Width. /// @@ -221,5 +806,32 @@ namespace Results.Resources { return ResourceManager.GetString("Width", resourceCulture); } } + + /// + /// Looks up a localized string similar to WM Type. + /// + internal static string WM_Type { + get { + return ResourceManager.GetString("WM_Type", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to WMs. + /// + internal static string WMs { + get { + return ResourceManager.GetString("WMs", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Year. + /// + internal static string Year { + get { + return ResourceManager.GetString("Year", resourceCulture); + } + } } } diff --git a/Results/Resources/Strings.de.resx b/Results/Resources/Strings.de.resx index 176c7eed5..57fe36066 100644 --- a/Results/Resources/Strings.de.resx +++ b/Results/Resources/Strings.de.resx @@ -123,9 +123,18 @@ Ausrichtung + + Zulassung + Ergebnisse + + Stapel Nr. + + + Prüfstation + Abbrechen @@ -135,40 +144,232 @@ Konfiguration + + Dichte + Abwärts + + Endzeit + + + Eindstand Nebenz. + + + Eindstand Hauptz. + + + Eindstand + + + Fehlergrenze hoch [%] + + + Fehlergrenze niedrig [%] + + + Fehler [%] + + + Referenzfehler [%] + + + Fehler Nebenz. [%] + + + Fehler Hauptz. [%] + + + Durchfluss [m³/h] + Format + + H umgebung [%] + Posten + + Metr. Klasse + OK + + Bestellung + + + Pos. + Präzision + + Prüfvorlage + + + Protokoll + + + Impulse + + + Impulse/l + + + Dr umgebung [mbar] + + + Dr un. ende [kPa] + + + Dr un. [kPa] + + + Dr un. start [kPa] + + + Dr ob. ende [kPa] + + + Dr ob. [kPa] + + + Dr ob. start [kPa] + + + Q1 [m3/h] + + + Q2 [m3/h] + + + Q3 [m3/h] + + + 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] + + + Ref. Impulse + < Entfernen Alles entfernen + + Ergebnis + Ergebnisse ausgewählt + + Seriennr. + + + Seriennr. Nebenz. + + + Seriennr. Hauptz. + + + Startzeit + + + Prüfpunkt + Prüfpunkt + + Prüfart + + + Prüfvolumen [l] + + + T umgebung [°C] + + + T div [°C] + + + Endzeit + + + T ein [°C] + + + T aus [°C] + + + Dauer [s] + + + Startzeit + + + Unsicherheit [%] + Einheit Aufwärts + + Benutzer + + + Benutzer Nr. + + + Ver. + + + Ref. Volumen [l] + + + Volumen [l] + Breite + + WZ + + + WZ Typ + + + Eichjahr + \ No newline at end of file diff --git a/Results/Resources/Strings.resx b/Results/Resources/Strings.resx index 1f8a3d3f5..31252d31c 100644 --- a/Results/Resources/Strings.resx +++ b/Results/Resources/Strings.resx @@ -123,9 +123,18 @@ Alignment + + Approval + Available results + + Batch nr. + + + Bench + Cancel @@ -135,40 +144,235 @@ Configuration + + Density + Down + + End + + + End state aux. + + + End state main + + + End state + + + Err.Lim.Hi [%] + + + Err.Lim.Lo [%] + + + Error [%] + + + Err.ref. [%] + + + Err. aux. [%] + + + Err. main [%] + + + Flow [m3/h] + Format + + H amb [%] + Item + + M.Class + OK + + PO + + + Pos. + Precision + + Procedure + + + Producer + + + Protocol + + + Pulses + + + Pulses/l + + + P amb [mbar] + + + P down end [kPa] + + + P down [kPa] + + + P down start [kPa] + + + P up end [kPa] + + + P up [kPa] + + + P up start [kPa] + + + Q1 [m3/h] + + + Q2 [m3/h] + + + Q3 [m3/h] + + + 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] + + + Ref.pulses + < Remove Remove all + + Result + Selected results + + s/n + + + s/n aux. + + + s/n main + + + Start + + + Test + Test ID + + Test method + + + Test vol. [l] + + + T amb [°C] + + + T div [°C] + + + T end + + + T in [°C] + + + T out [°C] + + + T [s] + + + T start + + + Uncertainty [%] + Units Up + + User + + + User nr. + + + Ver. + + + Vol.ref. [l] + + + Volume [l] + Width + + WMs + + + WM Type + + + Year + \ No newline at end of file