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

SequenceBase.TestResult2CvsLine( ) bug fix, ver. 2.18.826

Browse Source
This commit is contained in:
Milan Hanajik
2018-02-26 20:40:19 +01:00
parent 88bf586da4
commit 0598491753
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Sequences/SequenceBase.cs
+9 -7
View File
@@ -836,9 +836,9 @@ namespace TBF.BenchControl.Sequences
protected string TestResult2CsvLine(Results.Entities.TestRslt tstRslt) protected string TestResult2CsvLine(Results.Entities.TestRslt tstRslt)
{ {
bool isPressureTest = tstRslt.MethodClass.Contains("PMaxTest") || tstRslt.MethodClass.Contains("LeakTest"); bool isPressureTest = (tstRslt.MethodClass != null) && (tstRslt.MethodClass.Contains("PMaxTest") || tstRslt.MethodClass.Contains("LeakTest"));
bool isStartStop = tstRslt.MethodClass.Contains("FixedStart"); bool isStartStop = (tstRslt.MethodClass != null) && tstRslt.MethodClass.Contains("FixedStart");
bool isDiverter = tstRslt.MethodClass.Contains("FlyingStart") && tstRslt.MethodClass.Contains("MassColl"); bool isDiverter = (tstRslt.MethodClass != null) && tstRslt.MethodClass.Contains("FlyingStart") && tstRslt.MethodClass.Contains("MassColl");
System.Text.StringBuilder sb = new System.Text.StringBuilder(); System.Text.StringBuilder sb = new System.Text.StringBuilder();
@@ -947,11 +947,12 @@ namespace TBF.BenchControl.Sequences
if (!ProcessData.BatchRslts.WaterMeters[i].Compound() && !ProcessData.BatchRslts.WaterMeters[i].HeatMeter()) if (!ProcessData.BatchRslts.WaterMeters[i].Compound() && !ProcessData.BatchRslts.WaterMeters[i].HeatMeter())
{ {
Results.Entities.MeterTestRslt mtrRslt = ProcessData.BatchRslts.GetMeterTestRslt(tstRslt.Name(), i, CompoundMeterId.Single); Results.Entities.MeterTestRslt mtrRslt = ProcessData.BatchRslts.GetMeterTestRslt(tstRslt.Name(), i, CompoundMeterId.Single);
bool isCamera = mtrRslt.RegReaderClass.Equals("Network.Camera.Roi");
if (mtrRslt != null) if (mtrRslt != null)
{ {
sb.Append(";"); sb.Append(ProcessData.BatchRslts.WaterMeters[i].SerialNr); /// CE WM Ser.No. bool isCamera = (mtrRslt.RegReaderClass != null) && mtrRslt.RegReaderClass.Equals("Network.Camera.Roi");
sb.Append(";"); sb.Append(ProcessData.BatchRslts.WaterMeters[i].SerialNr); /// CE WM Ser.No.
sb.Append(";"); sb.Append(mtrRslt.VolumeStart); /// CF WM Vstart - pociatocny stav pri pevnom starte alebo zachyteny pri data streame sb.Append(";"); sb.Append(mtrRslt.VolumeStart); /// CF WM Vstart - pociatocny stav pri pevnom starte alebo zachyteny pri data streame
sb.Append(";"); sb.Append(mtrRslt.VolumeEnd); /// CG WM Vend - konecny stav pri pevnom starte alebo zachyteny pri data streame sb.Append(";"); sb.Append(mtrRslt.VolumeEnd); /// CG WM Vend - konecny stav pri pevnom starte alebo zachyteny pri data streame
sb.Append(";"); sb.Append(mtrRslt.VolumeMeter); /// CH WM Vmer - objem namerany vodomerom sb.Append(";"); sb.Append(mtrRslt.VolumeMeter); /// CH WM Vmer - objem namerany vodomerom
@@ -988,11 +989,12 @@ namespace TBF.BenchControl.Sequences
for (byte b = (byte)CompoundMeterId.CompoundMain; b <= (byte)CompoundMeterId.Compound; b++) for (byte b = (byte)CompoundMeterId.CompoundMain; b <= (byte)CompoundMeterId.Compound; b++)
{ {
Results.Entities.MeterTestRslt mtrRslt = ProcessData.BatchRslts.GetMeterTestRslt(tstRslt.Name(), i, (CompoundMeterId)b); Results.Entities.MeterTestRslt mtrRslt = ProcessData.BatchRslts.GetMeterTestRslt(tstRslt.Name(), i, (CompoundMeterId)b);
bool isCamera = mtrRslt.RegReaderClass.Equals("Network.Camera.Roi");
if (mtrRslt != null) if (mtrRslt != null)
{ {
sb.Append(";"); bool isCamera = (mtrRslt.RegReaderClass != null) && mtrRslt.RegReaderClass.Equals("Network.Camera.Roi");
sb.Append(";");
switch ((CompoundMeterId)b) switch ((CompoundMeterId)b)
{ {
case CompoundMeterId.CompoundMain: case CompoundMeterId.CompoundMain:
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.18.825.0")] [assembly: AssemblyVersion("2.18.826.0")]
[assembly: AssemblyFileVersion("2.18.825.0")] [assembly: AssemblyFileVersion("2.18.826.0")]