From 774d47a86f46f204089b47d63f1a9bf43664e61a Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sun, 21 Aug 2016 22:07:20 +0200 Subject: [PATCH] More changes and fixes for heat measurement. --- Results/ItemSpec.cs | 64 ++++++++++--------- .../HeatMeters12/TestStartEndForm.cs | 40 ++++++++---- .../HeatMeters12/TestStartEndForm.designer.cs | 2 +- TestBenchFramework/BenchControl/Formulas.cs | 2 +- .../BenchControl/Sequences/ProcessData.cs | 4 +- .../FixedStartMassCollectionSeq.cs | 15 +++-- TestBenchFramework/ProcedureDlg.cs | 2 +- .../Resources/Strings.Designer.cs | 33 ++++------ TestBenchFramework/Resources/Strings.cs.resx | 6 +- TestBenchFramework/Resources/Strings.de.resx | 12 +--- TestBenchFramework/Resources/Strings.pl.resx | 6 +- TestBenchFramework/Resources/Strings.resx | 15 ++--- TestBenchFramework/Resources/Strings.ro.resx | 6 +- .../Resources/Strings.zh-CN.resx | 6 +- .../Screens/ProcessTabPageCtrl6.cs | 6 +- .../TestWizard/VolumeAndErrorSelection.cs | 2 +- 16 files changed, 110 insertions(+), 111 deletions(-) diff --git a/Results/ItemSpec.cs b/Results/ItemSpec.cs index bb459a9c3..03a7e0ddb 100644 --- a/Results/ItemSpec.cs +++ b/Results/ItemSpec.cs @@ -118,30 +118,30 @@ namespace Results 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", "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", "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)); - 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())); + 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", 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)); + 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", Strings.Q_rise + " [m3/h]", null, (x, y, z) => (z.QRise() == 0) ? "-" : Utils.DoubleToStr(z.QRise(), 4))); @@ -154,16 +154,20 @@ namespace Results 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())); - 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())); + 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())); + + /// Heat meters results + AllItems.Add(new ItemSpec("Energy", Strings.Energy, x => x.Energy.ToString(), null)); + AllItems.Add(new ItemSpec("Reference energy", Strings.Energy_ref, x => x.RefEnergy.ToString(), null)); } public static ItemSpec GetItem(string name) diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs index 331f36a69..8d90522d3 100644 --- a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs @@ -173,7 +173,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12 } } - private void CycleEndForm_Load(object sender, EventArgs e) + private void TestStartEndForm_Load(object sender, EventArgs e) { Localize(); @@ -184,27 +184,35 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12 if (i < WaterMetersCount) { labels[i].Visible = startTextBoxes[i].Visible = endTextBoxes[i].Visible = true; - } + energyLabels[i].Visible = energyStartTextBoxes[i].Visible = energyEndTextBoxes[i].Visible = true; + } } if (endStates) { for (int i = 0; i < TextBoxesCount; i++) { - if (WMStartStateStr != null && i < WMStartStateStr.Length) - { - startTextBoxes[i].Text = WMStartStateStr[i]; - } + if (WMStartStateStr != null && i < WMStartStateStr.Length) + { + startTextBoxes[i].Text = WMStartStateStr[i]; + } + if (EnergyStartStateStr != null && i < EnergyStartStateStr.Length) + { + energyStartTextBoxes[i].Text = EnergyStartStateStr[i]; + } if (disabled != null && i < disabled.Length && disabled[i]) { endTextBoxes[i].Enabled = false; - } + energyEndTextBoxes[i].Enabled = false; + } else { endTextBoxes[i].Enabled = true; - enabledTextBoxes.Add(endTextBoxes[i]); - } + energyEndTextBoxes[i].Enabled = true; + enabledTextBoxes.Add(endTextBoxes[i]); + enabledTextBoxes.Add(energyEndTextBoxes[i]); + } } } else @@ -214,12 +222,15 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12 if (disabled != null && i < disabled.Length && disabled[i]) { startTextBoxes[i].Enabled = false; - } + energyStartTextBoxes[i].Enabled = false; + } else { startTextBoxes[i].Enabled = true; - enabledTextBoxes.Add(startTextBoxes[i]); - } + energyStartTextBoxes[i].Enabled = true; + enabledTextBoxes.Add(startTextBoxes[i]); + enabledTextBoxes.Add(energyStartTextBoxes[i]); + } } } } @@ -229,8 +240,9 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12 Text = Strings.Water_Meter_States; for (int i = 0; i < TextBoxesCount; i++) { - labels[i].Text = Strings.Water_Meter + " " + (i + 1).ToString(); - } + labels[i].Text = string.Format("{0} {1}", Strings.Volume + " ", i + 1); + energyLabels[i].Text = string.Format("{0} {1}", Strings.Energy + " ", i + 1); + } startLabel.Text = Strings.Start; endLabel.Text = Strings.End; okButton.Text = Strings.OkBtnText; diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.designer.cs b/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.designer.cs index 352b533f0..a51d6b251 100644 --- a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.designer.cs +++ b/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.designer.cs @@ -1402,7 +1402,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12 this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; this.Text = "End States"; this.TopMost = true; - this.Load += new System.EventHandler(this.CycleEndForm_Load); + this.Load += new System.EventHandler(this.TestStartEndForm_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/TestBenchFramework/BenchControl/Formulas.cs b/TestBenchFramework/BenchControl/Formulas.cs index 8dcc1cf74..6a30c054a 100644 --- a/TestBenchFramework/BenchControl/Formulas.cs +++ b/TestBenchFramework/BenchControl/Formulas.cs @@ -191,7 +191,7 @@ namespace TBF.BenchControl /// Inlet temperature [C] /// Outlet temperature [C] /// true = flow measured @inlet, false = flow measured @outlet - /// Heat coefficient for water + /// Heat coefficient for water [J/(m3 K)] public static double HeatCoefficientWater(double pressure, double T_in, double T_out, bool flowMeasuredAtInlet) { if (T_in == T_out) return 0; diff --git a/TestBenchFramework/BenchControl/Sequences/ProcessData.cs b/TestBenchFramework/BenchControl/Sequences/ProcessData.cs index 00f62f733..f6ce5cd2c 100644 --- a/TestBenchFramework/BenchControl/Sequences/ProcessData.cs +++ b/TestBenchFramework/BenchControl/Sequences/ProcessData.cs @@ -77,7 +77,7 @@ namespace TBF.BenchControl.Sequences public static Statistics RefFlowStat = new Statistics(); public static Statistics Energy = new Statistics(); - public static Statistics MassForEnergy = new Statistics(); + public static Statistics VolumeForEnergy = new Statistics(); public static int lastEnergyUpdateTime; protected static void ClearAllStatistics() @@ -93,7 +93,7 @@ namespace TBF.BenchControl.Sequences RefFlowStat.Clear(); Energy.Clear(); - MassForEnergy.Clear(); + VolumeForEnergy.Clear(); lastEnergyUpdateTime = 0; } diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 1257a86bf..005e821c6 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -212,7 +212,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection .EnterState(); do { - if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } + e = StateMachine.WaitRunDevsRunOps(); + if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (e.Contains(Event.Next)) goto temperature_set; if (StateMachine.Time - lastTimeSec > 10 || StateMachine.Time - lastTimeSec < 0) @@ -404,12 +405,12 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection else { //double deltaTime = (double)(StateMachine.Time - lastEnergyUpdateTime); - float T_in = (heatMetersPath.TMeterRefWarm1.ReadTemperature() + heatMetersPath.TMeterRefWarm2.ReadTemperature()) / 2; /// [°C] - float T_out = (heatMetersPath.TMeterRefCold1.ReadTemperature() + heatMetersPath.TMeterRefCold2.ReadTemperature()) / 2; /// [°C] - double deltaMass = 0.001 * LtrPerRefPulse * RefPulsesDelta * Formulas.WaterDensityFromTemp((TempIn.Val + TempOut.Val) / 2); /// [kg] - double deltaEnergy = deltaMass * Formulas.HeatCoefficientWater(16, T_in, T_out, heatMetersTestParams.FlowMeasuredAtHiTempPipe); + float T_in = (heatMetersPath.TMeterRefWarm1.ReadTemperature() + heatMetersPath.TMeterRefWarm2.ReadTemperature()) / 2; /// [°C] + float T_out = (heatMetersPath.TMeterRefCold1.ReadTemperature() + heatMetersPath.TMeterRefCold2.ReadTemperature()) / 2; /// [°C] + double deltaVolume = 0.001 * LtrPerRefPulse * RefPulsesDelta; /// [m3] + double deltaEnergy = deltaVolume * (T_in - T_out) * Formulas.HeatCoefficientWater(16, T_in, T_out, heatMetersTestParams.FlowMeasuredAtHiTempPipe); /// [J] Energy.Update(deltaEnergy); - MassForEnergy.Update(deltaMass); + VolumeForEnergy.Update(deltaVolume); lastEnergyUpdateTime = StateMachine.Time; } } @@ -676,7 +677,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection } else if (heatMetersTestParams != null) { - tstRslt.RefEnergy = Energy.Sum * (tstRslt.MassEnd - tstRslt.MassStart) / MassForEnergy.Sum; + tstRslt.RefEnergy = Energy.Sum * tstRslt.VolumeCTV * 0.001 / VolumeForEnergy.Sum; /// /// Heat meters diff --git a/TestBenchFramework/ProcedureDlg.cs b/TestBenchFramework/ProcedureDlg.cs index e9ec9df24..8e8f762ea 100644 --- a/TestBenchFramework/ProcedureDlg.cs +++ b/TestBenchFramework/ProcedureDlg.cs @@ -593,7 +593,7 @@ namespace TBF metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 }); metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Q_from_m3h, Width = 80 }); metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Q_to_m3h, Width = 80 }); - metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Volume_ltr_chdr, Width = 70 }); + metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Volume + " [l]", Width = 70 }); metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Test_time_s_chdr, Width = 70 }); metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Repeats_nr_chdr, Width = 80 }); metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Emptying_chdr, Width = 60 }); diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs index 2a44e5ec1..cbb5a18c6 100644 --- a/TestBenchFramework/Resources/Strings.Designer.cs +++ b/TestBenchFramework/Resources/Strings.Designer.cs @@ -1113,6 +1113,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Energy. + /// + internal static string Energy { + get { + return ResourceManager.GetString("Energy", resourceCulture); + } + } + /// /// Looks up a localized string similar to Enter password. /// @@ -4186,11 +4195,11 @@ namespace TBF.Resources { } /// - /// Looks up a localized string similar to Volume:. + /// Looks up a localized string similar to Volume. /// - internal static string Volume_ { + internal static string Volume { get { - return ResourceManager.GetString("Volume_", resourceCulture); + return ResourceManager.GetString("Volume", resourceCulture); } } @@ -4203,24 +4212,6 @@ namespace TBF.Resources { } } - /// - /// 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 Volume [l]. - /// - internal static string Volume_ltr_chdr { - get { - return ResourceManager.GetString("Volume_ltr_chdr", resourceCulture); - } - } - /// /// Looks up a localized string similar to Warning. /// diff --git a/TestBenchFramework/Resources/Strings.cs.resx b/TestBenchFramework/Resources/Strings.cs.resx index 2f8aa2d49..5536fe5fc 100644 --- a/TestBenchFramework/Resources/Strings.cs.resx +++ b/TestBenchFramework/Resources/Strings.cs.resx @@ -1101,9 +1101,6 @@ Objem a výběr mezní chyby - - Objem [l] - Varování @@ -1278,4 +1275,7 @@ Montáž + + Objem + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx index 78f2f3e57..ca950da72 100644 --- a/TestBenchFramework/Resources/Strings.de.resx +++ b/TestBenchFramework/Resources/Strings.de.resx @@ -345,9 +345,6 @@ Tol. Abzug [%] - - Volumen [l] - Nullstellen (Ergebnisse) @@ -1119,12 +1116,6 @@ T aus [°C]: - - Volumen: - - - Volumen [l]: - Speichern @@ -1353,4 +1344,7 @@ Temperatur einstellen + + Volumen + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.pl.resx b/TestBenchFramework/Resources/Strings.pl.resx index 532dee54e..96ace564a 100644 --- a/TestBenchFramework/Resources/Strings.pl.resx +++ b/TestBenchFramework/Resources/Strings.pl.resx @@ -1005,9 +1005,6 @@ Wybór dopuszczalnej objętości i błędu - - Objętość [l] - Ostrzeżenie @@ -1056,4 +1053,7 @@ Ciepłomierza czujniki + + Objętość + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx index 5c6a6aa50..5b5f6151a 100644 --- a/TestBenchFramework/Resources/Strings.resx +++ b/TestBenchFramework/Resources/Strings.resx @@ -369,9 +369,6 @@ Test bench is not running, however you can change the settings to resolve the problem. - - Volume [l] - Emptying @@ -1324,12 +1321,6 @@ T out [°C]: - - Volume: - - - Volume [l]: - Save column widths @@ -1546,4 +1537,10 @@ Setting temperature + + Energy + + + Volume + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.ro.resx b/TestBenchFramework/Resources/Strings.ro.resx index 7db78da6e..31330cee5 100644 --- a/TestBenchFramework/Resources/Strings.ro.resx +++ b/TestBenchFramework/Resources/Strings.ro.resx @@ -801,9 +801,6 @@ Selectarea volumului si limitei de erori - - Volum [l] - Atentie @@ -834,4 +831,7 @@ resetare + + Volum + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.zh-CN.resx b/TestBenchFramework/Resources/Strings.zh-CN.resx index 85611d2e7..903fae3f7 100644 --- a/TestBenchFramework/Resources/Strings.zh-CN.resx +++ b/TestBenchFramework/Resources/Strings.zh-CN.resx @@ -1098,9 +1098,6 @@ 音量和误差区间选择 - - 体积[L] - 警告 Warning @@ -1215,4 +1212,7 @@ 简短描述 + + 体积 + \ No newline at end of file diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs b/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs index 0c981b54e..ac98f8abf 100644 --- a/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs +++ b/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs @@ -144,7 +144,7 @@ namespace TBF.Screens massCapLabel.Text = Strings.Mass_kg_; massDiffCapLabel.Text = Strings.Mass_diff_kg_; - volumeCtvCapLabel.Text = Strings.Volume_l_; + volumeCtvCapLabel.Text = Strings.Volume + " [l]:"; refErrorCapLabel.Text = Strings.Ref_error_pct_; GroupBox[] groupBoxes = new GroupBox[] { groupBox1, groupBox2, groupBox3, groupBox4, groupBox5, groupBox6 }; @@ -153,13 +153,13 @@ namespace TBF.Screens sensor1CapLabel.Text = sensor2CapLabel.Text = sensor3CapLabel.Text = sensor4CapLabel.Text = sensor5CapLabel.Text = sensor6CapLabel.Text = Strings.Sensor_; pulses1CapLabel.Text = pulses2CapLabel.Text = pulses3CapLabel.Text = pulses4CapLabel.Text = pulses5CapLabel.Text = pulses6CapLabel.Text = Strings.Pulses_; refPulses1CapLabel.Text = refPulses2CapLabel.Text = refPulses3CapLabel.Text = refPulses4CapLabel.Text = refPulses5CapLabel.Text = refPulses6CapLabel.Text = Strings.Ref_pulses_; - volume1CapLabel.Text = volume2CapLabel.Text = volume3CapLabel.Text = volume4CapLabel.Text = volume5CapLabel.Text = volume6CapLabel.Text = Strings.Volume_; + volume1CapLabel.Text = volume2CapLabel.Text = volume3CapLabel.Text = volume4CapLabel.Text = volume5CapLabel.Text = volume6CapLabel.Text = Strings.Volume + ":"; error1CapLabel.Text = error2CapLabel.Text = error3CapLabel.Text = error4CapLabel.Text = error5CapLabel.Text = error6CapLabel.Text = Strings.Error_; GroupBox[] groupBoxesZ = new GroupBox[] { groupBox1z, groupBox2z, groupBox3z }; for (int i = 0; i < groupBoxesZ.Length; i++) groupBoxesZ[i].Text = string.Format(Strings.Compound_meter_nr, i + 1); - volume1zCapLabel.Text = volume2zCapLabel.Text = volume3zCapLabel.Text = Strings.Volume_; + volume1zCapLabel.Text = volume2zCapLabel.Text = volume3zCapLabel.Text = Strings.Volume + ":"; error1zCapLabel.Text = error2zCapLabel.Text = error3zCapLabel.Text = Strings.Error_; } diff --git a/TestBenchFramework/TestWizard/VolumeAndErrorSelection.cs b/TestBenchFramework/TestWizard/VolumeAndErrorSelection.cs index f064323dd..8bea58016 100644 --- a/TestBenchFramework/TestWizard/VolumeAndErrorSelection.cs +++ b/TestBenchFramework/TestWizard/VolumeAndErrorSelection.cs @@ -23,7 +23,7 @@ namespace TBF.TestWizard this.test = test; Text = Strings.Volume_and_error_selection; - volumeLabel.Text = Strings.Volume_ltr_chdr; + volumeLabel.Text = Strings.Volume + " [l]"; durationLabel.Text = Strings.Duration_s; errLoPctLabel.Text = Strings.Err_limit_neg_pct_chdr; errHiPctLabel.Text = Strings.Err_limit_pos_pct_chdr;