diff --git a/Results/Resources/Strings.cs.resx b/Results/Resources/Strings.cs.resx index 7b778475e..14ccf0d16 100644 --- a/Results/Resources/Strings.cs.resx +++ b/Results/Resources/Strings.cs.resx @@ -201,4 +201,7 @@ Vodoměr + + Číslo dávky + \ No newline at end of file diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs index ecae55eac..40088fb39 100644 --- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs +++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs @@ -73,12 +73,22 @@ namespace TBF.BenchControl.Sequences /// /// Process data logging /// - public void LogProcessHeader(ILog logger) + public void LogProcessDataTestInfo(ILog logger, string procedureName, string testName) { - LogProcessHeader(logger, null); + logger.Info(Environment.NewLine); + logger.InfoFormat("{0}={1:dd.MM.yyyy HH:mm:ss} {2}={3} {4}={5} {6}={7}", + Strings.Date_and_time, TestStartTime, + Strings.Batch_nr, BatchRslts.Batch.BatchNr, + Strings.Procedure, procedureName, + Strings.Test, testName); } - public void LogProcessHeader(ILog logger, string sectionName) + public void LogProcessDataHeader(ILog logger) + { + LogProcessDataHeader(logger, null); + } + + public void LogProcessDataHeader(ILog logger, string sectionName) { logger.Info(Environment.NewLine); if (sectionName != null) logger.Info(sectionName); @@ -108,7 +118,7 @@ namespace TBF.BenchControl.Sequences outPath.RegulValve.Position.ToString("F1")); } - public void LogProcessHeaderHeatMeters(ILog logger, string sectionName) + public void LogProcessDataHeaderHeatMeters(ILog logger, string sectionName) { logger.Info(Environment.NewLine); if (sectionName != null) logger.Info(sectionName); diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 6caa14f41..016edab1b 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -72,7 +72,6 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses)); string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); - TestStartTime = DateTime.Now; TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, 0, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.JustStarted)); @@ -401,6 +400,13 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection //------------------------------------------------ Bridge.OnActivity(this, Strings.Measuring_the_weight); //------------------------------------------------ + + TestStartTime = DateTime.Now; + LogProcessDataTestInfo(processDataLogger, test.Procedure.Name, test.Name); + + if (heatMetersPath == null) LogProcessDataHeader(processDataLogger, "Start mass"); + else LogProcessDataHeaderHeatMeters(processDataLogger, "Start mass"); + State.Create(string.Format("{0}({1}) : Measuring the start mass", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperations(measureOperations) @@ -430,6 +436,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection Mass.Val = StartMass.Val; + + if (heatMetersPath == null) LogProcessDataHeader(processDataLogger, "Measurement"); + else LogProcessDataHeaderHeatMeters(processDataLogger, "Measurement"); + //------------------------------------------------ Bridge.OnActivity(this, Strings.Test_in_progress); //------------------------------------------------ @@ -615,6 +625,9 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection while (!e.Contains(Event.TimerExpired)); + if (heatMetersPath == null) LogProcessDataHeader(processDataLogger, "End mass"); + else LogProcessDataHeaderHeatMeters(processDataLogger, "End mass"); + //------------------------------------------------ Bridge.OnActivity(this, Strings.Measuring_the_weight); //------------------------------------------------ @@ -743,17 +756,18 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection tstRslt.StartTime = TestStartTime; tstRslt.EndTime = TestEndTime; tstRslt.FlowSetTime = flowSetTime; - tstRslt.TestTime = cBrd.TTime; /// [s] measurement time + + tstRslt.TestTime = cBrd.TTime; /// [s] measurement time <-------------------------------------------------------------- tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total) tstRslt.MassStartRaw = StartMass.Val; tstRslt.MassStart = massStart; tstRslt.MassEndRaw = EndMass.Val; tstRslt.MassEnd = massEnd; tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart) / tstRslt.TestTime; /// [kg/h] - tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] - tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter + tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] + tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter tstRslt.VolumeCTV = volumeCTV; /// [l] 1000.0f is because density is in [kg/m3] - tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter + tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); tstRslt.FlowMin = (float)((tstRslt.VolumeMaster != 0) ? (RefFlowStat.Min * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Min); diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 96851123b..5e7b16f24 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -458,10 +458,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection Bridge.OnActivity(this, Strings.Measuring_the_weight); //------------------------------------------------ - if (heatMetersPath == null) - LogProcessHeader(processDataLogger, "Start mass"); - else - LogProcessHeaderHeatMeters(processDataLogger, "Start mass"); + LogProcessDataTestInfo(processDataLogger, test.Procedure.Name, test.Name); + + if (heatMetersPath == null) LogProcessDataHeader(processDataLogger, "Start mass"); + else LogProcessDataHeaderHeatMeters(processDataLogger, "Start mass"); State.Create(string.Format("{0}({1}) : Measuring the start mass", test.Method, test.Name)) .AddOperation(checkUiOp) @@ -490,14 +490,13 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection } while (!e.Contains(Event.BalanceDone)); - if (heatMetersPath == null) - LogProcessHeader(processDataLogger, "Measurement"); - else - LogProcessHeaderHeatMeters(processDataLogger, "Measurement"); - log.WarnFormat("Start mass = {0}kg", StartMass); Mass.Val = StartMass.Val; + + if (heatMetersPath == null) LogProcessDataHeader(processDataLogger, "Measurement"); + else LogProcessDataHeaderHeatMeters(processDataLogger, "Measurement"); + //------------------------------------------------ Bridge.OnActivity(this, Strings.Test_in_progress); //------------------------------------------------ @@ -661,10 +660,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection } while (!e.Contains(Event.TimerExpired) || !e.Contains(Event.BalanceDone)); - if (heatMetersPath == null) - LogProcessHeader(processDataLogger, "End mass"); - else - LogProcessHeaderHeatMeters(processDataLogger, "End mass"); + + if (heatMetersPath == null) LogProcessDataHeader(processDataLogger, "End mass"); + else LogProcessDataHeaderHeatMeters(processDataLogger, "End mass"); State.Create(string.Format("{0}({1}) : Measuring the end mass", test.Method, test.Name)) .AddOperation(checkUiOp) diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs index ba91c3e56..0657cc396 100644 --- a/TestBenchFramework/Resources/Strings.Designer.cs +++ b/TestBenchFramework/Resources/Strings.Designer.cs @@ -420,6 +420,24 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Batch. + /// + internal static string Batch { + get { + return ResourceManager.GetString("Batch", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Batch nr.. + /// + internal static string Batch_nr { + get { + return ResourceManager.GetString("Batch_nr", resourceCulture); + } + } + /// /// Looks up a localized string similar to Bench. /// diff --git a/TestBenchFramework/Resources/Strings.cs.resx b/TestBenchFramework/Resources/Strings.cs.resx index d22e50a29..3219399f0 100644 --- a/TestBenchFramework/Resources/Strings.cs.resx +++ b/TestBenchFramework/Resources/Strings.cs.resx @@ -1281,4 +1281,7 @@ Zobrazit - + + Číslo dávky + + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx index 461d1ccad..d6515cceb 100644 --- a/TestBenchFramework/Resources/Strings.de.resx +++ b/TestBenchFramework/Resources/Strings.de.resx @@ -1422,4 +1422,7 @@ Temperatur + + Stapel Nr. + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx index 0d4141191..fb2a991ce 100644 --- a/TestBenchFramework/Resources/Strings.resx +++ b/TestBenchFramework/Resources/Strings.resx @@ -1759,4 +1759,10 @@ Manual control disabled + + Batch + + + Batch nr. + \ No newline at end of file