diff --git a/Results/ItemID.cs b/Results/ItemID.cs index 4bad864c1..5cab7d330 100644 --- a/Results/ItemID.cs +++ b/Results/ItemID.cs @@ -181,6 +181,11 @@ namespace Results Diverter_start_time, /// 159 Diverter_end_time, /// 160 Q_sensitivity, /// 161 + + Q_ref_min, + Q_ref_max, + Q_ref_start, + Q_ref_end, Count, } diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index ef5f4192a..2a1f2c4ac 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.17.705.0")] -[assembly: AssemblyFileVersion("2.17.705.0")] +[assembly: AssemblyVersion("2.17.708.0")] +[assembly: AssemblyFileVersion("2.17.708.0")] diff --git a/Results/Resources/Strings.Designer.cs b/Results/Resources/Strings.Designer.cs index 9157464dd..8e9158dd1 100644 --- a/Results/Resources/Strings.Designer.cs +++ b/Results/Resources/Strings.Designer.cs @@ -1185,6 +1185,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Flow obtained from the master meter - end. + /// + internal static string Tooltip_Q_end { + get { + return ResourceManager.GetString("Tooltip_Q_end", resourceCulture); + } + } + /// /// Looks up a localized string similar to Flow calculated from conventional true mass and time. /// @@ -1194,6 +1203,24 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Flow obtained from the master meter - max. + /// + internal static string Tooltip_Q_max { + get { + return ResourceManager.GetString("Tooltip_Q_max", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Flow obtained from the master meter - min. + /// + internal static string Tooltip_Q_min { + get { + return ResourceManager.GetString("Tooltip_Q_min", resourceCulture); + } + } + /// /// Looks up a localized string similar to Flow obtained from the master meter - actual. /// @@ -1212,6 +1239,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Flow obtained from the master meter - start. + /// + internal static string Tooltip_Q_start { + get { + return ResourceManager.GetString("Tooltip_Q_start", resourceCulture); + } + } + /// /// Looks up a localized string similar to Flow calculated from conventional true volume and the time. /// diff --git a/Results/Resources/Strings.resx b/Results/Resources/Strings.resx index 48935a081..17b86b523 100644 --- a/Results/Resources/Strings.resx +++ b/Results/Resources/Strings.resx @@ -645,4 +645,16 @@ sensitivity + + Flow obtained from the master meter - end + + + Flow obtained from the master meter - max + + + Flow obtained from the master meter - min + + + Flow obtained from the master meter - start + \ No newline at end of file diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs index 3b1895432..063c1d387 100644 --- a/Results/WMeterRsltItemSpec.cs +++ b/Results/WMeterRsltItemSpec.cs @@ -182,7 +182,11 @@ namespace Results AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_to, string.Format("{0} {1}", Strings.VName_Flow, Strings.to), Quantity.Flow, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : DblFormat(u, f, p, "V3", w.GetTestRslt(t).Qto()))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow, string.Format("{0} v r", Strings.VName_Flow), Strings.Tooltip_Q_v_r, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : DblFormat(u, f, p, "V3", w.GetTestRslt(t).FlowVolume))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_mean, string.Format("{0} rim ()", Strings.VName_Flow), Strings.Tooltip_Q_rim, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : DblFormat(u, f, p, "V3", w.GetTestRslt(t).FlowMean))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_rise, string.Format("{0} {1}", Strings.VName_Flow, Strings.rise), Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : DblFormat(u, f, p, "V3", w.QRise)) : "")); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_min, string.Format("{0} ref min ()", Strings.VName_Flow), Strings.Tooltip_Q_min, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : DblFormat(u, f, p, "V3", w.GetTestRslt(t).FlowMin))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_max, string.Format("{0} ref max ()", Strings.VName_Flow), Strings.Tooltip_Q_max, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : DblFormat(u, f, p, "V3", w.GetTestRslt(t).FlowMax))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_start, string.Format("{0} ref start ()", Strings.VName_Flow), Strings.Tooltip_Q_start, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : DblFormat(u, f, p, "V3", w.GetTestRslt(t).FlowStart))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_end, string.Format("{0} ref end ()", Strings.VName_Flow), Strings.Tooltip_Q_end, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : DblFormat(u, f, p, "V3", w.GetTestRslt(t).FlowEnd))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_rise, string.Format("{0} {1}", Strings.VName_Flow, Strings.rise), Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : DblFormat(u, f, p, "V3", w.QRise)) : "")); AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_fall, string.Format("{0} {1}", Strings.VName_Flow, Strings.fall), Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QFall == 0) ? "-" : DblFormat(u, f, p, "V3", w.QFall)) : "")); AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_sensitivity, string.Format("{0} {1}", Strings.VName_Flow, Strings.sensitivity), Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : DblFormat(u, f, p, "V3", w.QRise)) : "")); diff --git a/TestBenchFramework/BenchControl/Various/ErrorFlags/Errors.cs b/TestBenchFramework/BenchControl/Various/ErrorFlags/Errors.cs index e18e01932..a77aa9111 100644 --- a/TestBenchFramework/BenchControl/Various/ErrorFlags/Errors.cs +++ b/TestBenchFramework/BenchControl/Various/ErrorFlags/Errors.cs @@ -151,13 +151,13 @@ namespace TBF.BenchControl.Various.ErrorFlags (mtrQ2.Error > mtrQ2.ErrLimHi() / 2) && (mtrQ1.Error > mtrQ1.ErrLimHi() / 2)) { - return 0x4000; + return 0x4000; /// E15 } else if ((mtrQ3.Error < mtrQ3.ErrLimLo() / 2) && (mtrQ2.Error < mtrQ2.ErrLimLo() / 2) && (mtrQ1.Error < mtrQ1.ErrLimLo() / 2)) { - return 0x8000; + return 0x4000; /// E15 } else { diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 9972b7acd..24fb7f865 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.17.707.1")] -[assembly: AssemblyFileVersion("2.17.707.1")] +[assembly: AssemblyVersion("2.17.708.1")] +[assembly: AssemblyFileVersion("2.17.708.1")]