From b0c95c06774c6b129c4e5a6555be002bbcccae45 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 28 Nov 2018 12:41:12 +0100 Subject: [PATCH] Output.FileWriters.IperlLogger : Request from Joachim in email 28.11.2018 11:18, ver. 2.18.1079 --- TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs | 6 ++++-- TBF/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs b/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs index 213536d2c..7b2f529f8 100644 --- a/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs +++ b/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs @@ -187,10 +187,12 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger Results.Entities.MeterTestRslt[] wm0trs = new Results.Entities.MeterTestRslt[testInfos.Length]; double totalTestTime = 0; + int maxPruefungsNr = 0; for (int j = 0; j < testInfos.Length; j++) { - wm0trs[j] = wm0.GetMeterTestRslt(testInfos[j].TestName); + if (Math.Abs(testInfos[j].PruefungsNr) > maxPruefungsNr) maxPruefungsNr = Math.Abs(testInfos[j].PruefungsNr); + wm0trs[j] = wm0.GetMeterTestRslt(testInfos[j].TestName); if (wm0trs[j] != null) { totalTestTime += wm0trs[j].TargetTime(); @@ -204,7 +206,7 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger try { logger.WriteLine("[Wasserzähler-Daten]"); - logger.WriteLine(string.Format("PruefPunkte={0}", 3)); + logger.WriteLine(string.Format("PruefPunkte={0}", (maxPruefungsNr > 15) ? 20 : ((maxPruefungsNr > 10) ? 15 : ((maxPruefungsNr > 5) ? 10 : 5)))); logger.WriteLine(string.Format("Typ={0}", batch.ProcedureName)); /// iP 020 Q3_4 R160 A XXXX logger.WriteLine(string.Format("MetroKlasse={0}", wmData.MetrologicalClass)); logger.WriteLine(string.Format("Zulassungszeichen={0}", wmData.ApprovalInfo)); diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 03cdeaa4a..617b62208 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.1078.0")] -[assembly: AssemblyFileVersion("2.18.1078.0")] +[assembly: AssemblyVersion("2.18.1079.0")] +[assembly: AssemblyFileVersion("2.18.1079.0")]