diff --git a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs index 394d3c7f6..9a3fc35a4 100644 --- a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs +++ b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs @@ -393,10 +393,15 @@ namespace TBF.BenchControl.Sequences } while (e.Contains(Event.Busy)); - - //------------------------------------------------------ + /// + /// Save to database and to 'summary results' logger + /// IList sortedResults = Utils.GetSortedTestResults(StateMachine.Procedure, results, 0); - foreach (var rslt in sortedResults) FluentCommon.SaveToDb(StateMachine.WtSession, rslt); + foreach (var rslt in sortedResults) + { + FluentCommon.SaveToDb(StateMachine.WtSession, rslt); + summaryResults.Info(TestResult2CsvLine(rslt)); + } //-------------------------------- diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs index cd7af5bae..f4c31f8bb 100644 --- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs +++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs @@ -19,7 +19,7 @@ namespace TBF.BenchControl.Sequences private static readonly ILog log = LogManager.GetLogger(typeof(SequenceBase)); protected static readonly ILog processDataLogger = LogManager.GetLogger("ProcessData"); protected static readonly ILog allResults = LogManager.GetLogger("AllResults"); - protected static readonly ILog summaryResults = LogManager.GetLogger("SummaryResults"); + protected static readonly ILog summaryResults = LogManager.GetLogger("SummaryResults"); ///------------------------------------------------------------ /// Global static variables set only once. @@ -720,7 +720,7 @@ namespace TBF.BenchControl.Sequences return data; } - protected string TestResult2CsvLine(Entities.TestResult tstRslt, int currentRefPulses) + protected string TestResult2CsvLine(Entities.TestResult tstRslt) { System.Text.StringBuilder sb = new System.Text.StringBuilder(); @@ -795,7 +795,7 @@ namespace TBF.BenchControl.Sequences sb.Append(";"); sb.Append(tstRslt.TimeDivEnd3); /// Time Div End3 sb.Append(";"); sb.Append(tstRslt.TimeDivEnd4); /// Time Div End4 sb.Append(";"); sb.Append(tstRslt.TimeDivEnd5); /// Time Div End5 - sb.Append(";"); sb.Append(currentRefPulses); /// Celkovy pocet et. pulzov skusky + sb.Append(";"); sb.Append(tstRslt.PulsesMaster); /// Celkovy pocet et. pulzov skusky sb.Append(";"); sb.Append(" "); /// - '' - pre druhy for (int i = 0; i < tstRslt.Meters.Count; i++) { diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs index c2fde59b6..b667f564d 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs @@ -323,7 +323,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment Bridge.OnTestCompleted(this, new TestCompletedEventArgs(tstRslt)); /// Append the results to the CSV-file - allResults.Info(TestResult2CsvLine(tstRslt, cBrd.EtPulses(0))); + allResults.Info(TestResult2CsvLine(tstRslt)); stopTest: diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs index 8daa4cfce..2f6d016fc 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs @@ -433,7 +433,7 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters Bridge.OnTestCompleted(this, new TestCompletedEventArgs(tstRslt)); /// Append the results to the CSV-file - allResults.Info(TestResult2CsvLine(tstRslt, cBrd.EtPulses(0))); + allResults.Info(TestResult2CsvLine(tstRslt)); if (++repetitionNr <= test.Repeats) diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index ede15728a..c61d1ba09 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -627,7 +627,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection AddOrOverwriteResult(tstRslt); /// Append the results to the CSV-file - allResults.Info(TestResult2CsvLine(tstRslt, cBrd.EtPulses(0))); + allResults.Info(TestResult2CsvLine(tstRslt)); if (++repetitionNr <= test.Repeats) { diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 04de7c69a..0c5f71797 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -527,7 +527,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection Bridge.OnTestCompleted(this, new TestCompletedEventArgs(tstRslt)); /// Append the results to the CSV-file - allResults.Info(TestResult2CsvLine(tstRslt, cBrd.EtPulses(0))); + allResults.Info(TestResult2CsvLine(tstRslt)); if (++repetitionNr <= test.Repeats) diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 504677bff..48033fea8 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -274,7 +274,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart Bridge.OnTestCompleted(this, new TestCompletedEventArgs(tstRslt)); /// Append the results to the CSV-file - allResults.Info(TestResult2CsvLine(tstRslt, cBrd.EtPulses(0))); + allResults.Info(TestResult2CsvLine(tstRslt)); if (++repetitionNr <= test.Repeats) diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs index dd8de0c34..a3268e089 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs @@ -418,7 +418,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod Bridge.OnTestCompleted(this, new TestCompletedEventArgs(tstRslt)); /// Append the results to the CSV-file - allResults.Info(TestResult2CsvLine(tstRslt, cBrd.EtPulses(0))); + allResults.Info(TestResult2CsvLine(tstRslt)); if (++repetitionNr <= test.Repeats) diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs index a2b149726..e2cbef749 100644 --- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs @@ -407,7 +407,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration Bridge.OnTestCompleted(this, new TestCompletedEventArgs(tstRslt)); /// Append the results to the CSV-file - allResults.Info(TestResult2CsvLine(tstRslt, cBrd.EtPulses(0))); + allResults.Info(TestResult2CsvLine(tstRslt)); if (++repetitionNr <= test.Repeats)