From 140ec136268f211a87ece92fac2199e97b7c2b71 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 19 Feb 2016 15:20:44 +0100 Subject: [PATCH] CEVAK bug fixes, version 2.2.223. --- TestBenchFramework/BenchControl/Formulas.cs | 2 +- .../BenchControl/WaterMeters/WaterMeter/ProcParams.cs | 4 ++++ TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/TestBenchFramework/BenchControl/Formulas.cs b/TestBenchFramework/BenchControl/Formulas.cs index 0f0bb1011..84848b411 100644 --- a/TestBenchFramework/BenchControl/Formulas.cs +++ b/TestBenchFramework/BenchControl/Formulas.cs @@ -77,7 +77,7 @@ namespace TBF.BenchControl if (measuredVolume <= float.Epsilon) { log.WarnFormat("ErrorFromVolumes({0},{1}) returns {2}", measuredVolume, trueVolume, 0); - return 0; + return 99.0; } log.WarnFormat("ErrorFromVolumes({0},{1}) returns {2}", measuredVolume, trueVolume, 99.0); diff --git a/TestBenchFramework/BenchControl/WaterMeters/WaterMeter/ProcParams.cs b/TestBenchFramework/BenchControl/WaterMeters/WaterMeter/ProcParams.cs index 667256e55..f81ddb223 100644 --- a/TestBenchFramework/BenchControl/WaterMeters/WaterMeter/ProcParams.cs +++ b/TestBenchFramework/BenchControl/WaterMeters/WaterMeter/ProcParams.cs @@ -112,10 +112,14 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter void CopyContentTo(ProcParams prms) { + prms.ProductName = this.ProductName; prms.Producer = this.Producer; prms.Qn = this.Qn; + prms.Qt = this.Qt; + prms.Qmin = this.Qmin; prms.ApprovalInfo = this.ApprovalInfo; prms.MetrologicalClass = this.MetrologicalClass; + prms.WaterTemp = this.WaterTemp; } public IParamsProvider Clone() diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index bcaf84953..996c4e2aa 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.2.222.1")] -[assembly: AssemblyFileVersion("2.2.222.1")] +[assembly: AssemblyVersion("2.2.223.1")] +[assembly: AssemblyFileVersion("2.2.223.1")]