michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(1) E15 modified, no E16, (2) Qref_min, Qref_max, Qref_start, Qref_end added to results, ver. 2.17.708

Browse Source
This commit is contained in:
Milan Hanajik 2017-10-19 09:18:50 +02:00
parent 615383f924
commit a8dd8d98cb
7 changed files with 64 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Results/ItemID.cs
View File

@ -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,
}

4
Results/Properties/AssemblyInfo.cs
View File

@ -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")]

36
Results/Resources/Strings.Designer.cs generated
View File

@ -1185,6 +1185,15 @@ namespace Results.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Flow obtained from the master meter - end.
/// </summary>
internal static string Tooltip_Q_end {
get {
return ResourceManager.GetString("Tooltip_Q_end", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Flow calculated from conventional true mass and time.
/// </summary>
@ -1194,6 +1203,24 @@ namespace Results.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Flow obtained from the master meter - max.
/// </summary>
internal static string Tooltip_Q_max {
get {
return ResourceManager.GetString("Tooltip_Q_max", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Flow obtained from the master meter - min.
/// </summary>
internal static string Tooltip_Q_min {
get {
return ResourceManager.GetString("Tooltip_Q_min", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Flow obtained from the master meter - actual.
/// </summary>
@ -1212,6 +1239,15 @@ namespace Results.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Flow obtained from the master meter - start.
/// </summary>
internal static string Tooltip_Q_start {
get {
return ResourceManager.GetString("Tooltip_Q_start", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Flow calculated from conventional true volume and the time.
/// </summary>

12
Results/Resources/Strings.resx
View File

@ -645,4 +645,16 @@
<data name="sensitivity" xml:space="preserve">
<value>sensitivity</value>
</data>
<data name="Tooltip_Q_end" xml:space="preserve">
<value>Flow obtained from the master meter - end</value>
</data>
<data name="Tooltip_Q_max" xml:space="preserve">
<value>Flow obtained from the master meter - max</value>
</data>
<data name="Tooltip_Q_min" xml:space="preserve">
<value>Flow obtained from the master meter - min</value>
</data>
<data name="Tooltip_Q_start" xml:space="preserve">
<value>Flow obtained from the master meter - start</value>
</data>
</root>

6
Results/WMeterRsltItemSpec.cs
View File

@ -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)) : ""));

4
TestBenchFramework/BenchControl/Various/ErrorFlags/Errors.cs
View File

@ -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
{

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

@ -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")]