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

Results.Entities.WaterMetrData.Medium added, woda zimna/goraca, ver. 2.18.876

Browse Source
This commit is contained in:
Milan Hanajik
2018-04-15 11:34:07 +02:00
parent 441601bd42
commit b17d710044
12 changed files with 54 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Config/Entities/Enums.cs
+7 -2
View File
@@ -81,8 +81,13 @@ namespace Config.Entities
public enum Medium
{
[Description("")] NotSpecified,
ColdWater,
HotWater,
#if LANG_PL
[Description("Zimna")] ColdWater,
[Description("Gorąca")] HotWater,
#else
[Description("cold")] ColdWater,
[Description("hot")] HotWater,
#endif
Count
}
Config/Properties/AssemblyInfo.cs
+2 -2
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.18.870.0")]
[assembly: AssemblyFileVersion("2.18.870.0")]
[assembly: AssemblyVersion("2.18.876.0")]
[assembly: AssemblyFileVersion("2.18.876.0")]
Results/Entities/TestRslt.cs
+6 -1
View File
@@ -305,7 +305,12 @@ namespace Results.Entities
/// <summary> Wrapper </summary>
public virtual string ErrorFlagsStr()
{
return Utils.ErrorFlagsStr(ErrorFlags);
string eFlags = Utils.ErrorFlagsStr(ErrorFlags);
#if LANG_PL
return string.IsNullOrEmpty(eFlags) ? "brak" : eFlags;
#else
return eFlags;
#endif
}
public override string ToString()
Results/Entities/WaterMeter.cs
+11
View File
@@ -145,6 +145,15 @@ namespace Results.Entities
#endif
}
#if LANG_PL
public virtual string PassedOrErrorFlagsStr()
{
ErrorFlagsMode errorFlagsMode;
string eFlags = Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM(out errorFlagsMode));
return string.IsNullOrEmpty(eFlags) ? (WaterMeterData.Text4 + PassedColorStr()) : eFlags;
}
#endif
/// <summary>
/// Convert failed tests and combined errorFlags of all tests to string
/// </summary>
@@ -208,6 +217,8 @@ namespace Results.Entities
}
///
/// Not mapped to the database
///
Results/Entities/WaterMeterData.cs
+4
View File
@@ -41,6 +41,8 @@ namespace Results.Entities
public virtual string MetrologicalClassAux { get; set; }
public virtual string ApprovalInfoAux { get; set; }
public virtual Config.Entities.Medium Medium { get; set; }
public virtual string Text1 { get; set; }
public virtual string Text2 { get; set; }
public virtual string Text3 { get; set; }
@@ -96,6 +98,8 @@ namespace Results.Entities
if (MetrologicalClassAux != wmd.MetrologicalClassAux) return false;
if (ApprovalInfoAux != wmd.ApprovalInfoAux) return false;
if (Medium != wmd.Medium) return false;
if (Text1 != wmd.Text1) return false;
if (Text2 != wmd.Text2) return false;
if (Text3 != wmd.Text3) return false;
Results/ItemID.cs
+2
View File
@@ -243,6 +243,8 @@ namespace Results
Timestamp_end, /// 211
P_PMax_test_mean, /// 212 PMax test pressure mean of (Pup + Pdown)/2
Medium, /// 213 Woda zimna/tepla
Count,
}
}
Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs
+12 -12
View File
@@ -193,27 +193,27 @@ namespace Results.Output.Printers.OnePerMeter
TableStyle commonTableStyle = new TableStyle { Font = font, MarginX = 5, MarginY = 3 };
Table table1 = new Table(2) { Style = commonTableStyle };
foreach (var v in commonItems1)
foreach (var item in commonItems1)
{
string[] row = new string[] { v.Caption, (batch.WaterMeters.Count > 0) ? v.Print(batch.WaterMeters[0]) : string.Empty };
string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty };
table1.AddRow(row, horizAlgn, vertAlgn);
}
float bodyTop1 = table1.Draw(e, leftMarginCommon1, commonTop);
table1 = new Table(2) { Style = commonTableStyle };
foreach (var v in commonItems2)
foreach (var item in commonItems2)
{
string[] row = new string[] { v.Caption, (batch.WaterMeters.Count > 0) ? v.Print(batch.WaterMeters[0]) : string.Empty };
string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty };
table1.AddRow(row, horizAlgn, vertAlgn);
}
float bodyTop2 = table1.Draw(e, leftMarginCommon2, commonTop);
table1 = new Table(2) { Style = commonTableStyle };
foreach (var v in commonItems3)
foreach (var item in commonItems3)
{
string[] row = new string[] { v.Caption, (batch.WaterMeters.Count > 0) ? v.Print(batch.WaterMeters[0]) : string.Empty };
string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty };
table1.AddRow(row, horizAlgn, vertAlgn);
}
float bodyTop3 = table1.Draw(e, leftMarginCommon3, commonTop);
@@ -301,27 +301,27 @@ namespace Results.Output.Printers.OnePerMeter
TableStyle commonTableStyle = new TableStyle { Font = font, MarginX = 5, MarginY = 3 };
Table table2 = new Table(2) { Style = commonTableStyle };
foreach (var v in belowItems1)
foreach (var item in belowItems1)
{
string[] row = new string[] { v.Caption, (batch.WaterMeters.Count > 0) ? v.Print(batch.WaterMeters[0]) : string.Empty };
string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty };
table2.AddRow(row, horizAlgn, vertAlgn);
}
table2.Draw(e, leftMarginBelow1, belowTop);
table2 = new Table(2) { Style = commonTableStyle };
foreach (var v in belowItems2)
foreach (var item in belowItems2)
{
string[] row = new string[] { v.Caption, (batch.WaterMeters.Count > 0) ? v.Print(batch.WaterMeters[0]) : string.Empty };
string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty };
table2.AddRow(row, horizAlgn, vertAlgn);
}
table2.Draw(e, leftMarginBelow2, belowTop);
table2 = new Table(2) { Style = commonTableStyle };
foreach (var v in belowItems3)
foreach (var item in belowItems3)
{
string[] row = new string[] { v.Caption, (batch.WaterMeters.Count > 0) ? v.Print(batch.WaterMeters[0]) : string.Empty };
string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty };
table2.AddRow(row, horizAlgn, vertAlgn);
}
table2.Draw(e, leftMarginBelow3, belowTop);
Results/WMeterRsltItemSpec.cs
+2 -1
View File
@@ -305,7 +305,7 @@ namespace Results
#endif
AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed, Strings.Result, Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(t) ? w.PassedColorStr() : ((w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PassedColorStr())));
AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, string.IsNullOrEmpty(w.ErrorFlagsStr()) ? (w.WaterMeterData.Text4 + w.PassedColorStr()) : w.ErrorFlagsStr()))); /// PL specific result
AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.PassedOrErrorFlagsStr()))); /// PL specific result
///
/// Water meter info
@@ -328,6 +328,7 @@ namespace Results
AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_profile_sensitivity_class, "Flow profile sensitivity class", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.FlowProfileSensitivityClass.ToDescription())));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Approval_info, Strings.Approval, Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.ApprovalInfo)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Certificate, "Certificate", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Certificate)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Medium, "Water cold/hot", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Medium.ToDescription())));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Text1, "Text1", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text1)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Text2, "Text2", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text2)));
TBF/BenchControl/GenericDevices/IWaterMeter.cs
+2
View File
@@ -34,6 +34,8 @@ namespace TBF.BenchControl.GenericDevices
double PulsesPerLtr { get; }
Medium Medium { get; }
string Text1 { get; }
string Text2 { get; }
string Text3 { get; }
TBF/BenchControl/Sequences/MainSeq.cs
+1 -1
View File
@@ -1381,7 +1381,7 @@ namespace TBF.BenchControl.Sequences
Certificate = WaterMeters[ix].Certificate,
PulsesPerLtr = WaterMeters[ix].PulsesPerLtr,
Medium = WaterMeters[ix].Medium,
Text1 = WaterMeters[ix].Text1,
Text2 = WaterMeters[ix].Text2,
Text3 = WaterMeters[ix].Text3,
TBF/BenchControl/WaterMeters/Munich/WaterMeter.cs
+2
View File
@@ -51,6 +51,8 @@ namespace TBF.BenchControl.WaterMeters.Munich
public string ApprovalInfo { get { return waterMeterCfg.ProcParams.ApprovalInfo; } }
public string Certificate { get { return string.Empty; } }
public Medium Medium { get { return Medium.ColdWater; } }
public string Text1 { get { return string.Empty; } }
public string Text2 { get { return string.Empty; } }
public string Text3 { get { return string.Empty; } }
TBF/BenchControl/WaterMeters/WaterMeter/WaterMeter.cs
+1 -1
View File
@@ -55,7 +55,7 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter
public string Text5 { get { return waterMeterCfg.ProcParams.Text5; } }
/// <summary>Water: cold / hot</summary>
public Config.Entities.Medium WaterTemp { get { return waterMeterCfg.ProcParams.WaterTemp; } }
public Config.Entities.Medium Medium { get { return waterMeterCfg.ProcParams.WaterTemp; } }
#if IPERL
public ushort OriginalCalibFactor;