From 7465f238093113dd2089e51b0a7d6f12f7859fe1 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 26 Feb 2018 20:48:57 +0100 Subject: [PATCH] T_line_xy added to WMeterRsltItemSpec, ver. 2.18.827 --- Results/ItemID.cs | 7 +++ Results/Resources/Strings.Designer.cs | 69 +++++++++++++++++++++++++-- Results/Resources/Strings.resx | 27 +++++++++-- Results/WMeterRsltItemSpec.cs | 6 +++ TBF/Properties/AssemblyInfo.cs | 4 +- 5 files changed, 105 insertions(+), 8 deletions(-) diff --git a/Results/ItemID.cs b/Results/ItemID.cs index fd4cb9077..85592bff3 100644 --- a/Results/ItemID.cs +++ b/Results/ItemID.cs @@ -213,6 +213,13 @@ namespace Results /// {0}=start DateTime {1}-end DateTime, {2}=batch nr., {3}=wm pos.(1..max), {4}=s/n string E21, /// 185 + T_line_mean, /// 186 + T_line_start, /// 187 + T_line_end, /// 188 + T_line_avg, /// 189 + T_line_min, /// 190 + T_line_max, /// 191 + Count, } } diff --git a/Results/Resources/Strings.Designer.cs b/Results/Resources/Strings.Designer.cs index 986b60262..e3e7f7be6 100644 --- a/Results/Resources/Strings.Designer.cs +++ b/Results/Resources/Strings.Designer.cs @@ -1411,7 +1411,7 @@ namespace Results.Resources { } /// - /// Looks up a localized string similar to Temperature at the diverter at start of the test – first 4 measurements from the start. + /// Looks up a localized string similar to Temperature at the diverter at start of the test – first 4 measurements after the start. /// internal static string Tooltip_T_di_st { get { @@ -1474,7 +1474,7 @@ namespace Results.Resources { } /// - /// Looks up a localized string similar to Temperature at the outlet at start of the test – first 4 measurements from the start. + /// Looks up a localized string similar to Temperature at the outlet at start of the test – first 4 measurements after the start. /// internal static string Tooltip_T_dw_st { get { @@ -1482,6 +1482,69 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Actual temperature in the line. + /// + internal static string Tooltip_T_ln_ac { + get { + return ResourceManager.GetString("Tooltip_T_ln_ac", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Average temperature in the line during a test. + /// + internal static string Tooltip_T_ln_avg { + get { + return ResourceManager.GetString("Tooltip_T_ln_avg", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Temperature in the line at end of the test – last 4 measurement before the end. + /// + internal static string Tooltip_T_ln_en { + get { + return ResourceManager.GetString("Tooltip_T_ln_en", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Maximum temperature in the line during the test. + /// + internal static string Tooltip_T_ln_max { + get { + return ResourceManager.GetString("Tooltip_T_ln_max", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Mean temperature in the line during a test. + /// + internal static string Tooltip_T_ln_me { + get { + return ResourceManager.GetString("Tooltip_T_ln_me", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Minimum temperature in the line during the test. + /// + internal static string Tooltip_T_ln_min { + get { + return ResourceManager.GetString("Tooltip_T_ln_min", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Temperature in the line at start of the test – first 4 measurements after the start. + /// + internal static string Tooltip_T_ln_st { + get { + return ResourceManager.GetString("Tooltip_T_ln_st", resourceCulture); + } + } + /// /// Looks up a localized string similar to Temperature of water sample at water density calibration. /// @@ -1546,7 +1609,7 @@ namespace Results.Resources { } /// - /// Looks up a localized string similar to Temperature at the inlet at start of the test – first 4 measurements from the start. + /// Looks up a localized string similar to Temperature at the inlet at start of the test – first 4 measurements after the start. /// internal static string Tooltip_T_up_st { get { diff --git a/Results/Resources/Strings.resx b/Results/Resources/Strings.resx index 434db1df4..d79d374e7 100644 --- a/Results/Resources/Strings.resx +++ b/Results/Resources/Strings.resx @@ -529,7 +529,7 @@ Mean temperature at diverter - Temperature at the diverter at start of the test – first 4 measurements from the start + Temperature at the diverter at start of the test – first 4 measurements after the start Actual temperature at the outlet @@ -544,7 +544,7 @@ Mean temperature at outlet - Temperature at the outlet at start of the test – first 4 measurements from the start + Temperature at the outlet at start of the test – first 4 measurements after the start Actual temperature at the inlet @@ -559,7 +559,7 @@ Mean temperature at inlet during a test - Temperature at the inlet at start of the test – first 4 measurements from the start + Temperature at the inlet at start of the test – first 4 measurements after the start aux. @@ -699,4 +699,25 @@ Temperature of water sample at water density calibration + + Actual temperature in the line + + + Average temperature in the line during a test + + + Temperature in the line at end of the test – last 4 measurement before the end + + + Maximum temperature in the line during the test + + + Mean temperature in the line during a test + + + Minimum temperature in the line during the test + + + Temperature in the line at start of the test – first 4 measurements after the start + \ No newline at end of file diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs index f8d5f3538..98735ba7d 100644 --- a/Results/WMeterRsltItemSpec.cs +++ b/Results/WMeterRsltItemSpec.cs @@ -213,6 +213,12 @@ namespace Results AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_avg, string.Format("{0} UP avg ()", Strings.VName_Temp), Strings.Tooltip_T_up_avg, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpStart + w.GetTestRslt(t).TempUpEnd) / 2))); AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_min, string.Format("{0} UP min ()", Strings.VName_Temp), Strings.Tooltip_T_up_min, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempUpMin))); AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_max, string.Format("{0} UP max ()", Strings.VName_Temp), Strings.Tooltip_T_up_max, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempUpMax))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_mean, string.Format("{0} LN ME ()", Strings.VName_Temp), Strings.Tooltip_T_ln_me, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpMean + w.GetTestRslt(t).TempDownMean) / 2))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_start, string.Format("{0} LN ST ()", Strings.VName_Temp), Strings.Tooltip_T_ln_st, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpStart + w.GetTestRslt(t).TempDownStart) / 2))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_end, string.Format("{0} LN EN ()", Strings.VName_Temp), Strings.Tooltip_T_ln_en, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpEnd + w.GetTestRslt(t).TempDownEnd) / 2))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_avg, string.Format("{0} LN avg ()", Strings.VName_Temp), Strings.Tooltip_T_ln_avg, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpStart + w.GetTestRslt(t).TempDownStart + w.GetTestRslt(t).TempUpEnd + w.GetTestRslt(t).TempDownEnd) / 4))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_min, string.Format("{0} LN min ()", Strings.VName_Temp), Strings.Tooltip_T_ln_min, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpMin + w.GetTestRslt(t).TempDownMin) / 2))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_max, string.Format("{0} LN max ()", Strings.VName_Temp), Strings.Tooltip_T_ln_max, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpMax + w.GetTestRslt(t).TempDownMax) / 2))); AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_mean, string.Format("{0} DW ME ()", Strings.VName_Temp), Strings.Tooltip_T_dw_me, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDownMean))); AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_start, string.Format("{0} DW ST ()", Strings.VName_Temp), Strings.Tooltip_T_dw_st, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDownStart))); AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_end, string.Format("{0} DW EN ()", Strings.VName_Temp), Strings.Tooltip_T_dw_en, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDownEnd))); diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index dcd0db5b0..6357431e8 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.826.0")] -[assembly: AssemblyFileVersion("2.18.826.0")] +[assembly: AssemblyVersion("2.18.827.0")] +[assembly: AssemblyFileVersion("2.18.827.0")]