From 62f26719bace7891fe6fed57ce8b76ce5f0ea25f Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 19 Dec 2016 13:49:21 +0100 Subject: [PATCH] iPerl bug fixes. --- .../BenchControl/DB/SensusOracle/Database.cs | 16 ++++++++-------- .../BenchControl/Sequences/SequenceBase.cs | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs index 4c428bd77..d55ad48b5 100644 --- a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs +++ b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs @@ -538,8 +538,8 @@ namespace TBF.BenchControl.DB.SensusOracle logger.WriteLine(string.Format("Temp6_P-1={0}", 0)); /// 19,8 logger.WriteLine(string.Format("Temp7_P-1={0}", 0)); /// 0,0 logger.WriteLine(string.Format("Temp8_P-1={0}", 0)); /// 0,0 - logger.WriteLine(string.Format("Druck1_P-1={0}", adj.TestRslt.PressUpAvrg.ToString(Program.AltCulture))); - logger.WriteLine(string.Format("Druck2_P-1={0}", adj.TestRslt.PressDownAvrg.ToString(Program.AltCulture))); + logger.WriteLine(string.Format("Druck1_P-1={0}", adj.TestRslt.PressUpMean.ToString(Program.AltCulture))); + logger.WriteLine(string.Format("Druck2_P-1={0}", adj.TestRslt.PressDownMean.ToString(Program.AltCulture))); logger.WriteLine(string.Format("K-Faktor-1={0}", 0)); /// 0,00000000 logger.WriteLine(string.Format("Q_Waage-1={0}", 0)); /// 3880,87469 logger.WriteLine(string.Format("Q_Vergleich-1={0}", 0)); /// 3869,47056 @@ -580,8 +580,8 @@ namespace TBF.BenchControl.DB.SensusOracle logger.WriteLine(string.Format("Temp6_P1={0}", 0)); /// 20,0 logger.WriteLine(string.Format("Temp7_P1={0}", 0)); /// 0,0 logger.WriteLine(string.Format("Temp8_P1={0}", 0)); /// 0,0 - logger.WriteLine(string.Format("Druck1_P1={0}", q1.TestRslt.PressUpAvrg.ToString(Program.AltCulture))); - logger.WriteLine(string.Format("Druck2_P1={0}", q1.TestRslt.PressDownAvrg.ToString(Program.AltCulture))); + logger.WriteLine(string.Format("Druck1_P1={0}", q1.TestRslt.PressUpMean.ToString(Program.AltCulture))); + logger.WriteLine(string.Format("Druck2_P1={0}", q1.TestRslt.PressDownMean.ToString(Program.AltCulture))); logger.WriteLine(string.Format("K-Faktor1={0}", 0)); /// 0,99820080 logger.WriteLine(string.Format("Q_Waage1={0}", 0)); /// 26,89887 logger.WriteLine(string.Format("Q_Vergleich1={0}", 0)); /// 26,83427 @@ -620,8 +620,8 @@ namespace TBF.BenchControl.DB.SensusOracle logger.WriteLine(string.Format("Temp6_P2={0}", 0)); /// 19,9 logger.WriteLine(string.Format("Temp7_P2={0}", 0)); /// 0,0 logger.WriteLine(string.Format("Temp8_P2={0}", 0)); /// 0,0 - logger.WriteLine(string.Format("Druck1_P2={0}", q2.TestRslt.PressUpAvrg.ToString(Program.AltCulture))); - logger.WriteLine(string.Format("Druck2_P2={0}", q2.TestRslt.PressDownAvrg.ToString(Program.AltCulture))); + logger.WriteLine(string.Format("Druck1_P2={0}", q2.TestRslt.PressUpMean.ToString(Program.AltCulture))); + logger.WriteLine(string.Format("Druck2_P2={0}", q2.TestRslt.PressDownMean.ToString(Program.AltCulture))); logger.WriteLine(string.Format("K-Faktor2={0}", 0)); /// 0,99822140 logger.WriteLine(string.Format("Q_Waage2={0}", 0)); /// 41,84627 logger.WriteLine(string.Format("Q_Vergleich2={0}", 0)); /// 41,68738 @@ -660,8 +660,8 @@ namespace TBF.BenchControl.DB.SensusOracle logger.WriteLine(string.Format("Temp6_P3={0}", 0)); /// 19,8 logger.WriteLine(string.Format("Temp7_P3={0}", 0)); /// 0,0 logger.WriteLine(string.Format("Temp8_P3={0}", 0)); /// 0,0 - logger.WriteLine(string.Format("Druck1_P3={0}", q3.TestRslt.PressUpAvrg.ToString(Program.AltCulture))); - logger.WriteLine(string.Format("Druck2_P3={0}", q3.TestRslt.PressDownAvrg.ToString(Program.AltCulture))); + logger.WriteLine(string.Format("Druck1_P3={0}", q3.TestRslt.PressUpMean.ToString(Program.AltCulture))); + logger.WriteLine(string.Format("Druck2_P3={0}", q3.TestRslt.PressDownMean.ToString(Program.AltCulture))); logger.WriteLine(string.Format("K-Faktor3={0}", 0)); /// 0,99824190 logger.WriteLine(string.Format("Q_Waage3={0}", 0)); /// 3874,27093 logger.WriteLine(string.Format("Q_Vergleich3={0}", 0)); /// 3867,08324 diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs index 3166a219c..3b3940598 100644 --- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs +++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs @@ -916,7 +916,7 @@ namespace TBF.BenchControl.Sequences sb.Append(";"); sb.Append(volumeMtr.TestTime); /// WM Tmet - cas merania (obmedzany pri synchro skuske) sb.Append(";"); sb.Append(volumeMtr.Passed ? "OK" : "NOK"); /// WM Vysledok (t.j. ci je v hraniciach chyb) - OK/NOK #if IPERLST || IPERLST_SPECIAL - sb.Append(";"); sb.Append(mtrRslt.WaterMeter.Q2Correction.ToString("F1")); /// iPerl Q2 correction factor used during the test / AN value - hodnota z analogoveho prevodnika + sb.Append(";"); sb.Append(volumeMtr.WaterMeter.Q2Correction.ToString("F1")); /// iPerl Q2 correction factor used during the test / AN value - hodnota z analogoveho prevodnika #else sb.Append(";"); sb.Append(" "); /// nechat prazdne #endif @@ -944,7 +944,7 @@ namespace TBF.BenchControl.Sequences sb.Append(";"); sb.Append(energyMtr.TestTime); /// WM Tmet - cas merania (obmedzany pri synchro skuske) sb.Append(";"); sb.Append(energyMtr.Passed ? "OK" : "NOK"); /// WM Vysledok (t.j. ci je v hraniciach chyb) - OK/NOK #if IPERLST || IPERLST_SPECIAL - sb.Append(";"); sb.Append(mtrRslt.WaterMeter.Q2Correction.ToString("F1")); /// iPerl Q2 correction factor used during the test / AN value - hodnota z analogoveho prevodnika + sb.Append(";"); sb.Append(energyMtr.WaterMeter.Q2Correction.ToString("F1")); /// iPerl Q2 correction factor used during the test / AN value - hodnota z analogoveho prevodnika #else sb.Append(";"); sb.Append(" "); /// nechat prazdne #endif