From edc4d59f90910eb2caaff3e0cef4361142e3f5a1 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sat, 13 Feb 2016 19:25:43 +0100 Subject: [PATCH] Process data screen update when test completed, version 2.1.213. --- Results/BatchResults.cs | 3 +- Results/Entities/Batch.cs | 1 + Results/Properties/AssemblyInfo.cs | 4 +- .../TestMethods/Adjustment/AdjustmentSeq.cs | 9 +- .../CombinedMeters/CombinedMetersSeq.cs | 6 +- .../CombinedWithDetectionSeq.cs | 7 +- .../FixedStartAdvancedSeq.cs | 6 +- .../FixedStartCombinedMetersSeq.cs | 6 +- .../FixedStartMassCollectionSeq.cs | 7 +- .../TestMethods/FlyingStart/FlyingStartSeq.cs | 7 +- .../FlyingStartMassCollectionSeq.cs | 7 +- .../TestMethods/LeakTest/LeakTestSeq.cs | 6 +- .../TestMethods/PMaxTest/PMaxTestSeq.cs | 6 +- .../ReferenceFlowmeterCalibrationSeq.cs | 6 +- .../iPerlCommunicationForm.cs | 2 - .../iPerlCommunicationSeq.cs | 4 +- TestBenchFramework/Properties/AssemblyInfo.cs | 4 +- .../Screens/ProcessTabPageCtrl24.cs | 148 +++++++----- .../Screens/ProcessTabPageCtrl48.cs | 148 +++++++----- .../Screens/ProcessTabPageCtrl6.cs | 219 ++++++++---------- .../UiBridge/TestCompletedEventArgs.cs | 8 +- 21 files changed, 329 insertions(+), 285 deletions(-) diff --git a/Results/BatchResults.cs b/Results/BatchResults.cs index b582e307c..a0fc21149 100644 --- a/Results/BatchResults.cs +++ b/Results/BatchResults.cs @@ -44,6 +44,7 @@ namespace Results ProcedureRevision = procedure.Revision, ProtocolTitle = procedure.ProtocolTitle, StartTime = DateTime.Now, + Compound = (procedure.MetersKind == Config.Entities.MetersKind.Combined), }; /// @@ -78,7 +79,7 @@ namespace Results if (t.Part != 0 && waterMeterParts[i] != 0 && t.Part != waterMeterParts[i]) continue; /// Create empty watermeter test results and add them to the list and to dictionaries - if (procedure.MetersKind == Config.Entities.MetersKind.Single) + if (!d.Batch.Compound) { MeterTestRslt mtr = new MeterTestRslt(d.WaterMeters[i], tr, Config.Entities.CompoundMeterId.Single); d.WaterMeters[i].MeterTestRslts.Add(mtr); diff --git a/Results/Entities/Batch.cs b/Results/Entities/Batch.cs index 1ccfb433c..c9282412e 100644 --- a/Results/Entities/Batch.cs +++ b/Results/Entities/Batch.cs @@ -26,6 +26,7 @@ namespace Results.Entities public virtual IList Tests { get; set; } public virtual IList WaterMeters { get; set; } public virtual IList TestRslts { get; set; } + public virtual bool Compound { get; set; } /// Not mapped to DB now public Batch() { diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index e5c9503a7..d549b9f3b 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.188.0")] -[assembly: AssemblyFileVersion("2.1.188.0")] +[assembly: AssemblyVersion("2.1.213.0")] +[assembly: AssemblyFileVersion("2.1.213.0")] diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs index c58114447..d22590a83 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs @@ -329,6 +329,9 @@ namespace TBF.BenchControl.TestMethods.Adjustment outPath.Balance != null ? outPath.Balance.Name : string.Empty, outPath.RegulValve != null ? outPath.RegulValve.Name : string.Empty, outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); + + /// Update results + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt)); } /// Add data - end } @@ -344,12 +347,6 @@ namespace TBF.BenchControl.TestMethods.Adjustment } modelessDlg = null; /// Modeless dialog is closed now - - /// - /// Add to results (after user quits the adjustment loop) - /// - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, test.Part)); - /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(testName, test.Part)); diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs index 9766dcdba..ae071f98b 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs @@ -452,12 +452,12 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters outPath.Balance != null ? outPath.Balance.Name : string.Empty, outPath.RegulValve != null ? outPath.RegulValve.Name : string.Empty, outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); - } - /// Add data - end + /// Update results + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt)); + } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, test.Part)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(testName, test.Part)); diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index 2dda2d218..ac2846c7c 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -631,13 +631,12 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection outPath.Balance != null ? outPath.Balance.Name : string.Empty, outPath.RegulValve != null ? outPath.RegulValve.Name : string.Empty, outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); + + /// Update results + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt)); } - /// Add data - end - - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, test.Part)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(testName, test.Part)); diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs index 0dcd3f302..cb6a8939d 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs @@ -551,12 +551,12 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced outPath.Balance != null ? outPath.Balance.Name : string.Empty, outPath.RegulValve != null ? outPath.RegulValve.Name : string.Empty, outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); - } - /// Add data - end + /// Update results + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt)); + } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, test.Part)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(testName, test.Part)); diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/FixedStartCombinedMetersSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/FixedStartCombinedMetersSeq.cs index 184dbc57f..a45547fff 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/FixedStartCombinedMetersSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/FixedStartCombinedMetersSeq.cs @@ -579,12 +579,12 @@ namespace TBF.BenchControl.TestMethods.FixedStartCombinedMeters outPath.Balance != null ? outPath.Balance.Name : string.Empty, outPath.RegulValve != null ? outPath.RegulValve.Name : string.Empty, outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); - } - /// Add data - end + /// Update results + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt)); + } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, test.Part)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(testName, test.Part)); diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 012393136..3bc3e437e 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -550,17 +550,16 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection outPath.Balance != null ? outPath.Balance.Name : string.Empty, outPath.RegulValve != null ? outPath.RegulValve.Name : string.Empty, outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); - } - /// Add data - end + /// Update results + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt)); + } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, test.Part)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(testName, test.Part)); - if (++repetitionNr <= test.Repeats) { goto loop; diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 75374442a..8915d90f7 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -305,17 +305,16 @@ namespace TBF.BenchControl.TestMethods.FlyingStart outPath.Balance != null ? outPath.Balance.Name : string.Empty, outPath.RegulValve != null ? outPath.RegulValve.Name : string.Empty, outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); - } - /// Add data - end + /// Update results + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt)); + } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, test.Part)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(testName, test.Part)); - if (++repetitionNr <= test.Repeats) { goto loop; diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 4746dae78..8971c8f88 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -492,17 +492,16 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection outPath.Balance != null ? outPath.Balance.Name : string.Empty, outPath.RegulValve != null ? outPath.RegulValve.Name : string.Empty, outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); - } - /// Add data - end + /// Update results + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt)); + } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, test.Part)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(testName, test.Part)); - if (++repetitionNr <= test.Repeats) { goto loop; diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs index 715626d4d..e3d8d84ea 100644 --- a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs @@ -370,12 +370,12 @@ namespace TBF.BenchControl.TestMethods.LeakTest outPath.Balance != null ? outPath.Balance.Name : string.Empty, outPath.RegulValve != null ? outPath.RegulValve.Name : string.Empty, outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); - } - /// Add data - end + /// Update results + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt)); + } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.TransitionAfter)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, test.Part)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(testName, test.Part)); diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs index 70c4516a4..8f6f5d9cb 100644 --- a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs @@ -284,12 +284,12 @@ namespace TBF.BenchControl.TestMethods.PMaxTest outPath.Balance != null ? outPath.Balance.Name : string.Empty, outPath.RegulValve != null ? outPath.RegulValve.Name : string.Empty, outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); - } - /// Add data - end + /// Update results + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt)); + } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.TransitionAfter)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, test.Part)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(testName, test.Part)); diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs index 1d4f42ff9..9cbcd6f62 100644 --- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs @@ -369,12 +369,12 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration outPath.Balance != null ? outPath.Balance.Name : string.Empty, outPath.RegulValve != null ? outPath.RegulValve.Name : string.Empty, outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); - } - /// Add data - end + /// Update results + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt)); + } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, test.Part)); /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(testName, test.Part)); diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index c003d4ef0..5717ffdd2 100644 --- a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -550,8 +550,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication UpdateRfidCommResult(tests); /// TODO: Pass the test info in a correct way } - TBF.UiBridge.Bridge.OnTestCompleted(this, new TBF.UiBridge.TestCompletedEventArgs(StateMachine.Tests[0].Name, 0)); - formCompleted = true; Program.LocalSettings.iPerlCommunicationsFormLeft = Location.X; Program.LocalSettings.iPerlCommunicationsFormTop = Location.Y; diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs index 87f532d2b..c967ce620 100644 --- a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs @@ -69,7 +69,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication MakeCorrectedFrom(test.Name, fromTestName); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.Completed)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, test.Part)); + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(test.Name, 0))); allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file IList rList = new List(1); @@ -91,7 +91,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication else if (testParams.Activity.ToLower().Contains("compound fall")) MakeSimulatedCompound(test.Name, 1, 1, 0, 0.7f, 0.9f); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.Completed)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, test.Part)); + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file for (int i = 0; i < Config.Data.WMsCount; i++) diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index b0eef0551..f254c666c 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.1.212.1")] -[assembly: AssemblyFileVersion("2.1.212.1")] +[assembly: AssemblyVersion("2.1.213.1")] +[assembly: AssemblyFileVersion("2.1.213.1")] diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs b/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs index 2ac625e05..779353a8d 100644 --- a/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs +++ b/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs @@ -400,20 +400,20 @@ namespace TBF.Screens massLabel.Text = ProcessData.Mass.ToString(); - if (args.TestPhase == Config.Entities.Progress.FlowSetting) + if (args.TestPhase == Config.Entities.Progress.FlowSetting || + args.TestPhase == Config.Entities.Progress.Test) { /// - /// Available when setting the flow + /// Available when setting the flow and during a test /// refFreqLabel.Text = ProcessData.RefFreq.ToString(); refFlowLabel.Text = Utils.FloatToStr(ProcessData.RefFlow.Val, 4); } - if (args.TestPhase == Config.Entities.Progress.FlowSetting || - args.TestPhase == Config.Entities.Progress.Test) + if (args.TestPhase == Config.Entities.Progress.Test) { /// - /// Available during a test + /// Available only during a test /// refPulsesLabel.Text = ProcessData.RefCount.ToString(); double refVolume = ProcessData.LtrPerRefPulse * (double)ProcessData.RefCount.Val; @@ -480,58 +480,102 @@ namespace TBF.Screens void OnTestCompleted(object sender, TestCompletedEventArgs args) { - /// TODO: Reimplement - //TestResult tRes = args.TestResult; + Results.Entities.TestRslt tRes = args.TestRslt; - //tInLabel.Text = tRes.TempInAvrg.ToString("F2"); - //tOutLabel.Text = tRes.TempOutAvrg.ToString("F2"); - //tDivLabel.Text = tRes.TempDivAvrg.ToString("F2"); - //prInLabel.Text = tRes.PressInAvrg.ToString("F1"); - //prOutLabel.Text = tRes.PressOutAvrg.ToString("F1"); - //airTempLabel.Text = tRes.AmbientTempAve.ToString("F1"); - //airPressLabel.Text = tRes.AmbientPressAve.ToString("F1"); - //airHumiLabel.Text = tRes.AmbientHumiAve.ToString("F1"); + airTempLabel.Text = tRes.AmbientTempAve.ToString("F1"); + airPressLabel.Text = tRes.AmbientPressAve.ToString("F1"); + airHumiLabel.Text = tRes.AmbientHumiAve.ToString("F1"); - //refPulsesLabel.Text = tRes.PulsesMaster.ToString("F0"); - ////refFreqLabel.Text = tstRslt. - //refFlowLabel.Text = Utils.FloatToStr(tRes.FlowMass / 1000.0f, 4); + tInLabel.Text = tRes.TempInAvrg.ToString("F2"); + tOutLabel.Text = tRes.TempOutAvrg.ToString("F2"); + tDivLabel.Text = tRes.TempDivAvrg.ToString("F2"); - //refVolumeLabel.Text = tRes.VolumeCTV.ToString("F2"); - ////regValvePosLabel.Text = tstRslt. - ////massLabel.Text = tstRslt. + prInLabel.Text = tRes.PressUpAvrg.ToString("F1"); + prOutLabel.Text = tRes.PressDownAvrg.ToString("F1"); - //volumeCtvLabel.Text = args.TestResult.VolumeCTV.ToString("F1"); - //refErrorLabel.Text = (tRes.ErrorMaster == 0) ? "---" : tRes.ErrorMaster.ToString("F3"); + massLabel.Text = ProcessData.Mass.ToString(); + massDiffLabel.Text = (tRes.MassEnd - tRes.MassStart).ToString("F3"); - //if (tRes.MetersKind == MetersKind.Single) - //{ - // for (int i = 0; i < textBoxesCount; i++) - // { - // pulses[i].Text = tRes.Meters[i].PulsesMeter.ToString("F0"); - // refPulses[i].Text = tRes.Meters[i].PulsesMaster.ToString("F0"); - // volume[i].Text = tRes.Meters[i].VolumeMeter.ToString("F2"); - // error[i].Text = tRes.Meters[i].VolumeErrorPct.ToString("F2"); - // passed[i].Text = tRes.Meters[i].Passed ? Strings.Passed : Strings.Failed; - // } - //} - //else if (tRes.MetersKind == MetersKind.Combined) - //{ - // pulses1Label.Text = tRes.Meters[0].PulsesMeter.ToString("F0"); - // pulses2Label.Text = tRes.Meters[1].PulsesMeter.ToString("F0"); - // //pulses1zLabel.Text = tRes.CombinedMeters[0].PulsesMeter.ToString("F0"); - // refPulses1Label.Text = tRes.Meters[0].PulsesMaster.ToString("F0"); - // refPulses2Label.Text = tRes.Meters[1].PulsesMaster.ToString("F0"); - // //refPulses1zLabel.Text = tRes.CombinedMeters[0].PulsesMaster.ToString("F0"); - // volume1Label.Text = tRes.Meters[0].VolumeMeter.ToString("F2"); - // volume2Label.Text = tRes.Meters[1].VolumeMeter.ToString("F2"); - // volume1zLabel.Text = tRes.CombinedMeters[0].VolumeMeter.ToString("F2"); - // error1Label.Text = tRes.Meters[0].VolumeErrorPct.ToString("F2"); - // error2Label.Text = tRes.Meters[1].VolumeErrorPct.ToString("F2"); - // error1zLabel.Text = tRes.CombinedMeters[0].VolumeErrorPct.ToString("F2"); - // passed1Label.Text = tRes.Meters[0].Passed ? Strings.Passed : Strings.Failed; - // passed2Label.Text = tRes.Meters[1].Passed ? Strings.Passed : Strings.Failed; - // passed1zLabel.Text = tRes.CombinedMeters[0].Passed ? Strings.Passed : Strings.Failed; - //} + refPulsesLabel.Text = tRes.PulsesMaster.ToString("F0"); + refFreqLabel.Text = "---"; + refFlowLabel.Text = Utils.FloatToStr((float)tRes.FlowVolume, 4); + + refVolumeLabel.Text = tRes.VolumeCTV.ToString("F2"); + //regValvePosLabel.Text = tstRslt. + + volumeCtvLabel.Text = tRes.VolumeCTV.ToString("F1"); + refErrorLabel.Text = (tRes.ErrorMaster == 0) ? "---" : tRes.ErrorMaster.ToString("F3"); + + if (!tRes.Batch.Compound) + { + for (int i = 0; i < textBoxesCount; i++) + { + Results.Entities.WaterMeter wm = ProcessData.BatchRslts.WaterMeters[i]; + Results.Entities.MeterTestRslt mtr = (wm != null) ? wm.GetMeterTestRslt(args.TestName) : null; + + if (mtr != null) + { + pulses[i].Text = mtr.PulsesMeter.ToString("F0"); + refPulses[i].Text = mtr.PulsesMaster.ToString("F0"); + volume[i].Text = mtr.VolumeMeter.ToString("F2"); + error[i].Text = mtr.Error.ToString("F2"); + passed[i].Text = mtr.Passed ? Strings.Passed : Strings.Failed; + } + } + } + else + { + for (int compMtr = 0; compMtr < Config.Data.CompoundWMsCount; compMtr++) + { + Results.Entities.WaterMeter wm = ProcessData.BatchRslts.WaterMeters[compMtr]; + if (wm == null) continue; + + int end = Math.Min(textBoxesCount, Config.Data.WMsCount); + + Results.Entities.MeterTestRslt mtrMain = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundMain); + if ((mtrMain != null) && (2 * compMtr < end)) + { + pulses[2 * compMtr].Text = mtrMain.PulsesMeter.ToString("F0"); + refPulses[2 * compMtr].Text = mtrMain.PulsesMaster.ToString("F0"); + volume[2 * compMtr].Text = mtrMain.VolumeMeter.ToString("F2"); + error[2 * compMtr].Text = mtrMain.Error.ToString("F2"); + passed[2 * compMtr].Text = mtrMain.Passed ? Strings.Passed : Strings.Failed; + } + + Results.Entities.MeterTestRslt mtrAux = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundAux); + if ((mtrAux != null) && (2 * compMtr + 1 < end)) + { + pulses[2 * compMtr + 1].Text = mtrAux.PulsesMeter.ToString("F0"); + refPulses[2 * compMtr + 1].Text = mtrAux.PulsesMaster.ToString("F0"); + volume[2 * compMtr + 1].Text = mtrAux.VolumeMeter.ToString("F2"); + error[2 * compMtr + 1].Text = mtrAux.Error.ToString("F2"); + passed[2 * compMtr + 1].Text = mtrAux.Passed ? Strings.Passed : Strings.Failed; + } + + Results.Entities.MeterTestRslt mtrComp = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.Compound); + if (mtrComp != null) + { + switch (compMtr) + { + case 0: + volume1zLabel.Text = mtrComp.VolumeMeter.ToString("F2"); + error1zLabel.Text = mtrComp.Error.ToString("F2"); + passed1zLabel.Text = mtrComp.Passed ? Strings.Passed : Strings.Failed; + break; + case 1: + volume2zLabel.Text = mtrComp.VolumeMeter.ToString("F2"); + error2zLabel.Text = mtrComp.Error.ToString("F2"); + passed2zLabel.Text = mtrComp.Passed ? Strings.Passed : Strings.Failed; + break; + case 2: + volume3zLabel.Text = mtrComp.VolumeMeter.ToString("F2"); + error3zLabel.Text = mtrComp.Error.ToString("F2"); + passed3zLabel.Text = mtrComp.Passed ? Strings.Passed : Strings.Failed; + break; + } + } + } + } } void OnProcedureCompleted(object sender, ProcedureCompletedEventArgs args) diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl48.cs b/TestBenchFramework/Screens/ProcessTabPageCtrl48.cs index b64fb0e66..7317e8c95 100644 --- a/TestBenchFramework/Screens/ProcessTabPageCtrl48.cs +++ b/TestBenchFramework/Screens/ProcessTabPageCtrl48.cs @@ -429,20 +429,20 @@ namespace TBF.Screens massLabel.Text = ProcessData.Mass.ToString(); - if (args.TestPhase == Config.Entities.Progress.FlowSetting) + if (args.TestPhase == Config.Entities.Progress.FlowSetting || + args.TestPhase == Config.Entities.Progress.Test) { /// - /// Available when setting the flow + /// Available when setting the flow and during a test /// refFreqLabel.Text = ProcessData.RefFreq.ToString(); refFlowLabel.Text = Utils.FloatToStr(ProcessData.RefFlow.Val, 4); } - if (args.TestPhase == Config.Entities.Progress.FlowSetting || - args.TestPhase == Config.Entities.Progress.Test) + if (args.TestPhase == Config.Entities.Progress.Test) { /// - /// Available during a test + /// Available only during a test /// refPulsesLabel.Text = ProcessData.RefCount.ToString(); double refVolume = ProcessData.LtrPerRefPulse * (double)ProcessData.RefCount.Val; @@ -509,58 +509,102 @@ namespace TBF.Screens void OnTestCompleted(object sender, TestCompletedEventArgs args) { - /// TODO: Reimplement - //TestResult tRes = args.TestResult; + Results.Entities.TestRslt tRes = args.TestRslt; - //tInLabel.Text = tRes.TempInAvrg.ToString("F2"); - //tOutLabel.Text = tRes.TempOutAvrg.ToString("F2"); - //tDivLabel.Text = tRes.TempDivAvrg.ToString("F2"); - //prInLabel.Text = tRes.PressInAvrg.ToString("F1"); - //prOutLabel.Text = tRes.PressOutAvrg.ToString("F1"); - //airTempLabel.Text = tRes.AmbientTempAve.ToString("F1"); - //airPressLabel.Text = tRes.AmbientPressAve.ToString("F1"); - //airHumiLabel.Text = tRes.AmbientHumiAve.ToString("F1"); + airTempLabel.Text = tRes.AmbientTempAve.ToString("F1"); + airPressLabel.Text = tRes.AmbientPressAve.ToString("F1"); + airHumiLabel.Text = tRes.AmbientHumiAve.ToString("F1"); - //refPulsesLabel.Text = tRes.PulsesMaster.ToString("F0"); - ////refFreqLabel.Text = tstRslt. - //refFlowLabel.Text = Utils.FloatToStr(tRes.FlowMass / 1000.0f, 4); + tInLabel.Text = tRes.TempInAvrg.ToString("F2"); + tOutLabel.Text = tRes.TempOutAvrg.ToString("F2"); + tDivLabel.Text = tRes.TempDivAvrg.ToString("F2"); - //refVolumeLabel.Text = tRes.VolumeCTV.ToString("F2"); - ////regValvePosLabel.Text = tstRslt. - ////massLabel.Text = tstRslt. + prInLabel.Text = tRes.PressUpAvrg.ToString("F1"); + prOutLabel.Text = tRes.PressDownAvrg.ToString("F1"); - //volumeCtvLabel.Text = args.TestResult.VolumeCTV.ToString("F1"); - //refErrorLabel.Text = (tRes.ErrorMaster == 0) ? "---" : tRes.ErrorMaster.ToString("F3"); + massLabel.Text = ProcessData.Mass.ToString(); + massDiffLabel.Text = (tRes.MassEnd - tRes.MassStart).ToString("F3"); - //if (tRes.MetersKind == MetersKind.Single) - //{ - // for (int i = 0; i < textBoxesCount; i++) - // { - // pulses[i].Text = tRes.Meters[i].PulsesMeter.ToString("F0"); - // refPulses[i].Text = tRes.Meters[i].PulsesMaster.ToString("F0"); - // volume[i].Text = tRes.Meters[i].VolumeMeter.ToString("F2"); - // error[i].Text = tRes.Meters[i].VolumeErrorPct.ToString("F2"); - // passed[i].Text = tRes.Meters[i].Passed ? Strings.Passed : Strings.Failed; - // } - //} - //else if (tRes.MetersKind == MetersKind.Combined) - //{ - // pulses1Label.Text = tRes.Meters[0].PulsesMeter.ToString("F0"); - // pulses2Label.Text = tRes.Meters[1].PulsesMeter.ToString("F0"); - // //pulses1zLabel.Text = tRes.CombinedMeters[0].PulsesMeter.ToString("F0"); - // refPulses1Label.Text = tRes.Meters[0].PulsesMaster.ToString("F0"); - // refPulses2Label.Text = tRes.Meters[1].PulsesMaster.ToString("F0"); - // //refPulses1zLabel.Text = tRes.CombinedMeters[0].PulsesMaster.ToString("F0"); - // volume1Label.Text = tRes.Meters[0].VolumeMeter.ToString("F2"); - // volume2Label.Text = tRes.Meters[1].VolumeMeter.ToString("F2"); - // volume1zLabel.Text = tRes.CombinedMeters[0].VolumeMeter.ToString("F2"); - // error1Label.Text = tRes.Meters[0].VolumeErrorPct.ToString("F2"); - // error2Label.Text = tRes.Meters[1].VolumeErrorPct.ToString("F2"); - // error1zLabel.Text = tRes.CombinedMeters[0].VolumeErrorPct.ToString("F2"); - // passed1Label.Text = tRes.Meters[0].Passed ? Strings.Passed : Strings.Failed; - // passed2Label.Text = tRes.Meters[1].Passed ? Strings.Passed : Strings.Failed; - // passed1zLabel.Text = tRes.CombinedMeters[0].Passed ? Strings.Passed : Strings.Failed; - //} + refPulsesLabel.Text = tRes.PulsesMaster.ToString("F0"); + refFreqLabel.Text = "---"; + refFlowLabel.Text = Utils.FloatToStr((float)tRes.FlowVolume, 4); + + refVolumeLabel.Text = tRes.VolumeCTV.ToString("F2"); + //regValvePosLabel.Text = tstRslt. + + volumeCtvLabel.Text = tRes.VolumeCTV.ToString("F1"); + refErrorLabel.Text = (tRes.ErrorMaster == 0) ? "---" : tRes.ErrorMaster.ToString("F3"); + + if (!tRes.Batch.Compound) + { + for (int i = 0; i < textBoxesCount; i++) + { + Results.Entities.WaterMeter wm = ProcessData.BatchRslts.WaterMeters[i]; + Results.Entities.MeterTestRslt mtr = (wm != null) ? wm.GetMeterTestRslt(args.TestName) : null; + + if (mtr != null) + { + pulses[i].Text = mtr.PulsesMeter.ToString("F0"); + refPulses[i].Text = mtr.PulsesMaster.ToString("F0"); + volume[i].Text = mtr.VolumeMeter.ToString("F2"); + error[i].Text = mtr.Error.ToString("F2"); + passed[i].Text = mtr.Passed ? Strings.Passed : Strings.Failed; + } + } + } + else + { + for (int compMtr = 0; compMtr < Config.Data.CompoundWMsCount; compMtr++) + { + Results.Entities.WaterMeter wm = ProcessData.BatchRslts.WaterMeters[compMtr]; + if (wm == null) continue; + + int end = Math.Min(textBoxesCount, Config.Data.WMsCount); + + Results.Entities.MeterTestRslt mtrMain = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundMain); + if ((mtrMain != null) && (2 * compMtr < end)) + { + pulses[2 * compMtr].Text = mtrMain.PulsesMeter.ToString("F0"); + refPulses[2 * compMtr].Text = mtrMain.PulsesMaster.ToString("F0"); + volume[2 * compMtr].Text = mtrMain.VolumeMeter.ToString("F2"); + error[2 * compMtr].Text = mtrMain.Error.ToString("F2"); + passed[2 * compMtr].Text = mtrMain.Passed ? Strings.Passed : Strings.Failed; + } + + Results.Entities.MeterTestRslt mtrAux = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundAux); + if ((mtrAux != null) && (2 * compMtr + 1 < end)) + { + pulses[2 * compMtr + 1].Text = mtrAux.PulsesMeter.ToString("F0"); + refPulses[2 * compMtr + 1].Text = mtrAux.PulsesMaster.ToString("F0"); + volume[2 * compMtr + 1].Text = mtrAux.VolumeMeter.ToString("F2"); + error[2 * compMtr + 1].Text = mtrAux.Error.ToString("F2"); + passed[2 * compMtr + 1].Text = mtrAux.Passed ? Strings.Passed : Strings.Failed; + } + + Results.Entities.MeterTestRslt mtrComp = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.Compound); + if (mtrComp != null) + { + switch (compMtr) + { + case 0: + volume1zLabel.Text = mtrComp.VolumeMeter.ToString("F2"); + error1zLabel.Text = mtrComp.Error.ToString("F2"); + passed1zLabel.Text = mtrComp.Passed ? Strings.Passed : Strings.Failed; + break; + case 1: + volume2zLabel.Text = mtrComp.VolumeMeter.ToString("F2"); + error2zLabel.Text = mtrComp.Error.ToString("F2"); + passed2zLabel.Text = mtrComp.Passed ? Strings.Passed : Strings.Failed; + break; + case 2: + volume3zLabel.Text = mtrComp.VolumeMeter.ToString("F2"); + error3zLabel.Text = mtrComp.Error.ToString("F2"); + passed3zLabel.Text = mtrComp.Passed ? Strings.Passed : Strings.Failed; + break; + } + } + } + } } void OnProcedureCompleted(object sender, ProcedureCompletedEventArgs args) diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs b/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs index 2bf249754..27154adad 100644 --- a/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs +++ b/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs @@ -387,20 +387,20 @@ namespace TBF.Screens massLabel.Text = ProcessData.Mass.ToString(); - if (args.TestPhase == Config.Entities.Progress.FlowSetting) + if (args.TestPhase == Config.Entities.Progress.FlowSetting || + args.TestPhase == Config.Entities.Progress.Test) { /// - /// Available when setting the flow + /// Available when setting the flow and during a test /// refFreqLabel.Text = ProcessData.RefFreq.ToString(); refFlowLabel.Text = Utils.FloatToStr(ProcessData.RefFlow.Val, 4); } - if (args.TestPhase == Config.Entities.Progress.FlowSetting || - args.TestPhase == Config.Entities.Progress.Test) + if (args.TestPhase == Config.Entities.Progress.Test) { /// - /// Available during a test + /// Available only during a test /// refPulsesLabel.Text = ProcessData.RefCount.ToString(); double refVolume = ProcessData.LtrPerRefPulse * (double)ProcessData.RefCount.Val; @@ -467,139 +467,102 @@ namespace TBF.Screens void OnTestCompleted(object sender, TestCompletedEventArgs args) { - /// TODO: Reimplement - //TestResult tRes = args.TestResult; + Results.Entities.TestRslt tRes = args.TestRslt; - //tInLabel.Text = tRes.TempInAvrg.ToString("F2"); - //tOutLabel.Text = tRes.TempOutAvrg.ToString("F2"); - //tDivLabel.Text = tRes.TempDivAvrg.ToString("F2"); - //prInLabel.Text = tRes.PressInAvrg.ToString("F1"); - //prOutLabel.Text = tRes.PressOutAvrg.ToString("F1"); - //airTempLabel.Text = tRes.AmbientTempAve.ToString("F1"); - //airPressLabel.Text = tRes.AmbientPressAve.ToString("F1"); - //airHumiLabel.Text = tRes.AmbientHumiAve.ToString("F1"); + airTempLabel.Text = tRes.AmbientTempAve.ToString("F1"); + airPressLabel.Text = tRes.AmbientPressAve.ToString("F1"); + airHumiLabel.Text = tRes.AmbientHumiAve.ToString("F1"); - //refPulsesLabel.Text = tRes.PulsesMaster.ToString("F0"); - ////refFreqLabel.Text = tstRslt. - //refFlowLabel.Text = Utils.FloatToStr(tRes.FlowMass / 1000.0f, 4); + tInLabel.Text = tRes.TempInAvrg.ToString("F2"); + tOutLabel.Text = tRes.TempOutAvrg.ToString("F2"); + tDivLabel.Text = tRes.TempDivAvrg.ToString("F2"); - //refVolumeLabel.Text = tRes.VolumeCTV.ToString("F2"); - ////regValvePosLabel.Text = tstRslt. - ////massLabel.Text = tstRslt. + prInLabel.Text = tRes.PressUpAvrg.ToString("F1"); + prOutLabel.Text = tRes.PressDownAvrg.ToString("F1"); - //volumeCtvLabel.Text = args.TestResult.VolumeCTV.ToString("F1"); - //refErrorLabel.Text = (tRes.ErrorMaster == 0) ? "---" : tRes.ErrorMaster.ToString("F3"); + massLabel.Text = ProcessData.Mass.ToString(); + massDiffLabel.Text = (tRes.MassEnd - tRes.MassStart).ToString("F3"); - //if (tRes.MetersKind == MetersKind.Single) - //{ - // pulses1Label.Text = tRes.Meters[0].PulsesMeter.ToString("F0"); - // refPulses1Label.Text = tRes.Meters[0].PulsesMaster.ToString("F0"); - // volume1Label.Text = tRes.Meters[0].VolumeMeter.ToString("F2"); - // error1Label.Text = tRes.Meters[0].VolumeErrorPct.ToString("F2"); - // passed1Label.Text = tRes.Meters[0].Passed ? Strings.Passed : Strings.Failed; + refPulsesLabel.Text = tRes.PulsesMaster.ToString("F0"); + refFreqLabel.Text = "---"; + refFlowLabel.Text = Utils.FloatToStr((float)tRes.FlowVolume, 4); - // if (Config.Data.WMsCount >= 2) - // { - // pulses2Label.Text = tRes.Meters[1].PulsesMeter.ToString("F0"); - // refPulses2Label.Text = tRes.Meters[1].PulsesMaster.ToString("F0"); - // volume2Label.Text = tRes.Meters[1].VolumeMeter.ToString("F2"); - // error2Label.Text = tRes.Meters[1].VolumeErrorPct.ToString("F2"); - // passed2Label.Text = tRes.Meters[1].Passed ? Strings.Passed : Strings.Failed; - // } + refVolumeLabel.Text = tRes.VolumeCTV.ToString("F2"); + //regValvePosLabel.Text = tstRslt. - // if (Config.Data.WMsCount >= 3) - // { - // pulses3Label.Text = tRes.Meters[2].PulsesMeter.ToString("F0"); - // refPulses3Label.Text = tRes.Meters[2].PulsesMaster.ToString("F0"); - // volume3Label.Text = tRes.Meters[2].VolumeMeter.ToString("F2"); - // error3Label.Text = tRes.Meters[2].VolumeErrorPct.ToString("F2"); - // passed3Label.Text = tRes.Meters[2].Passed ? Strings.Passed : Strings.Failed; - // } + volumeCtvLabel.Text = tRes.VolumeCTV.ToString("F1"); + refErrorLabel.Text = (tRes.ErrorMaster == 0) ? "---" : tRes.ErrorMaster.ToString("F3"); - // if (Config.Data.WMsCount >= 4) - // { - // pulses4Label.Text = tRes.Meters[3].PulsesMeter.ToString("F0"); - // refPulses4Label.Text = tRes.Meters[3].PulsesMaster.ToString("F0"); - // volume4Label.Text = tRes.Meters[3].VolumeMeter.ToString("F2"); - // error4Label.Text = tRes.Meters[3].VolumeErrorPct.ToString("F2"); - // passed4Label.Text = tRes.Meters[3].Passed ? Strings.Passed : Strings.Failed; - // } + if (!tRes.Batch.Compound) + { + for (int i = 0; i < textBoxesCount; i++) + { + Results.Entities.WaterMeter wm = ProcessData.BatchRslts.WaterMeters[i]; + Results.Entities.MeterTestRslt mtr = (wm != null) ? wm.GetMeterTestRslt(args.TestName) : null; - // if (Config.Data.WMsCount >= 5) - // { - // pulses5Label.Text = tRes.Meters[4].PulsesMeter.ToString("F0"); - // refPulses5Label.Text = tRes.Meters[4].PulsesMaster.ToString("F0"); - // volume5Label.Text = tRes.Meters[4].VolumeMeter.ToString("F2"); - // error5Label.Text = tRes.Meters[4].VolumeErrorPct.ToString("F2"); - // passed5Label.Text = tRes.Meters[4].Passed ? Strings.Passed : Strings.Failed; - // } + if (mtr != null) + { + pulses[i].Text = mtr.PulsesMeter.ToString("F0"); + refPulses[i].Text = mtr.PulsesMaster.ToString("F0"); + volume[i].Text = mtr.VolumeMeter.ToString("F2"); + error[i].Text = mtr.Error.ToString("F2"); + passed[i].Text = mtr.Passed ? Strings.Passed : Strings.Failed; + } + } + } + else + { + for (int compMtr = 0; compMtr < Config.Data.CompoundWMsCount; compMtr++) + { + Results.Entities.WaterMeter wm = ProcessData.BatchRslts.WaterMeters[compMtr]; + if (wm == null) continue; - // if (Config.Data.WMsCount >= 6) - // { - // pulses6Label.Text = tRes.Meters[5].PulsesMeter.ToString("F0"); - // refPulses6Label.Text = tRes.Meters[5].PulsesMaster.ToString("F0"); - // volume6Label.Text = tRes.Meters[5].VolumeMeter.ToString("F2"); - // error6Label.Text = tRes.Meters[5].VolumeErrorPct.ToString("F2"); - // passed6Label.Text = tRes.Meters[5].Passed ? Strings.Passed : Strings.Failed; - // } - //} - //else if (tRes.MetersKind == MetersKind.Combined) - //{ - // if (Config.Data.WMsCount >= 2) - // { - // pulses1Label.Text = tRes.Meters[0].PulsesMeter.ToString("F0"); - // pulses2Label.Text = tRes.Meters[1].PulsesMeter.ToString("F0"); - // //pulses1zLabel.Text = tRes.CombinedMeters[0].PulsesMeter.ToString("F0"); - // refPulses1Label.Text = tRes.Meters[0].PulsesMaster.ToString("F0"); - // refPulses2Label.Text = tRes.Meters[1].PulsesMaster.ToString("F0"); - // //refPulses1zLabel.Text = tRes.CombinedMeters[0].PulsesMaster.ToString("F0"); - // volume1Label.Text = tRes.Meters[0].VolumeMeter.ToString("F2"); - // volume2Label.Text = tRes.Meters[1].VolumeMeter.ToString("F2"); - // volume1zLabel.Text = tRes.CombinedMeters[0].VolumeMeter.ToString("F2"); - // error1Label.Text = tRes.Meters[0].VolumeErrorPct.ToString("F2"); - // error2Label.Text = tRes.Meters[1].VolumeErrorPct.ToString("F2"); - // error1zLabel.Text = tRes.CombinedMeters[0].VolumeErrorPct.ToString("F2"); - // passed1Label.Text = tRes.Meters[0].Passed ? Strings.Passed : Strings.Failed; - // passed2Label.Text = tRes.Meters[1].Passed ? Strings.Passed : Strings.Failed; - // passed1zLabel.Text = tRes.CombinedMeters[0].Passed ? Strings.Passed : Strings.Failed; - // } - // if (Config.Data.WMsCount >= 4) - // { - // pulses3Label.Text = tRes.Meters[2].PulsesMeter.ToString("F0"); - // pulses4Label.Text = tRes.Meters[3].PulsesMeter.ToString("F0"); - // //pulses2zLabel.Text = tRes.CombinedMeters[1].PulsesMeter.ToString("F0"); - // refPulses3Label.Text = tRes.Meters[2].PulsesMaster.ToString("F0"); - // refPulses4Label.Text = tRes.Meters[3].PulsesMaster.ToString("F0"); - // //refPulses2zLabel.Text = tRes.CombinedMeters[1].PulsesMaster.ToString("F0"); - // volume3Label.Text = tRes.Meters[2].VolumeMeter.ToString("F2"); - // volume4Label.Text = tRes.Meters[3].VolumeMeter.ToString("F2"); - // volume2zLabel.Text = tRes.CombinedMeters[1].VolumeMeter.ToString("F2"); - // error3Label.Text = tRes.Meters[2].VolumeErrorPct.ToString("F2"); - // error4Label.Text = tRes.Meters[3].VolumeErrorPct.ToString("F2"); - // error2zLabel.Text = tRes.CombinedMeters[1].VolumeErrorPct.ToString("F2"); - // passed3Label.Text = tRes.Meters[2].Passed ? Strings.Passed : Strings.Failed; - // passed4Label.Text = tRes.Meters[3].Passed ? Strings.Passed : Strings.Failed; - // passed2zLabel.Text = tRes.CombinedMeters[1].Passed ? Strings.Passed : Strings.Failed; - // } - // if (Config.Data.WMsCount >= 6) - // { - // pulses5Label.Text = tRes.Meters[4].PulsesMeter.ToString("F0"); - // pulses6Label.Text = tRes.Meters[5].PulsesMeter.ToString("F0"); - // //pulses3zLabel.Text = tRes.CombinedMeters[2].PulsesMeter.ToString("F0"); - // refPulses5Label.Text = tRes.Meters[4].PulsesMaster.ToString("F0"); - // refPulses6Label.Text = tRes.Meters[5].PulsesMaster.ToString("F0"); - // //refPulses3zLabel.Text = tRes.CombinedMeters[2].PulsesMaster.ToString("F0"); - // volume5Label.Text = tRes.Meters[4].VolumeMeter.ToString("F2"); - // volume6Label.Text = tRes.Meters[5].VolumeMeter.ToString("F2"); - // volume3zLabel.Text = tRes.CombinedMeters[2].VolumeMeter.ToString("F2"); - // error5Label.Text = tRes.Meters[4].VolumeErrorPct.ToString("F2"); - // error6Label.Text = tRes.Meters[5].VolumeErrorPct.ToString("F2"); - // error3zLabel.Text = tRes.CombinedMeters[2].VolumeErrorPct.ToString("F2"); - // passed5Label.Text = tRes.Meters[4].Passed ? Strings.Passed : Strings.Failed; - // passed6Label.Text = tRes.Meters[5].Passed ? Strings.Passed : Strings.Failed; - // passed3zLabel.Text = tRes.CombinedMeters[2].Passed ? Strings.Passed : Strings.Failed; - // } - //} + int end = Math.Min(textBoxesCount, Config.Data.WMsCount); + + Results.Entities.MeterTestRslt mtrMain = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundMain); + if ((mtrMain != null) && (2 * compMtr < end)) + { + pulses[2 * compMtr].Text = mtrMain.PulsesMeter.ToString("F0"); + refPulses[2 * compMtr].Text = mtrMain.PulsesMaster.ToString("F0"); + volume[2 * compMtr].Text = mtrMain.VolumeMeter.ToString("F2"); + error[2 * compMtr].Text = mtrMain.Error.ToString("F2"); + passed[2 * compMtr].Text = mtrMain.Passed ? Strings.Passed : Strings.Failed; + } + + Results.Entities.MeterTestRslt mtrAux = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundAux); + if ((mtrAux != null) && (2 * compMtr + 1 < end)) + { + pulses[2 * compMtr + 1].Text = mtrAux.PulsesMeter.ToString("F0"); + refPulses[2 * compMtr + 1].Text = mtrAux.PulsesMaster.ToString("F0"); + volume[2 * compMtr + 1].Text = mtrAux.VolumeMeter.ToString("F2"); + error[2 * compMtr + 1].Text = mtrAux.Error.ToString("F2"); + passed[2 * compMtr + 1].Text = mtrAux.Passed ? Strings.Passed : Strings.Failed; + } + + Results.Entities.MeterTestRslt mtrComp = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.Compound); + if (mtrComp != null) + { + switch (compMtr) + { + case 0: + volume1zLabel.Text = mtrComp.VolumeMeter.ToString("F2"); + error1zLabel.Text = mtrComp.Error.ToString("F2"); + passed1zLabel.Text = mtrComp.Passed ? Strings.Passed : Strings.Failed; + break; + case 1: + volume2zLabel.Text = mtrComp.VolumeMeter.ToString("F2"); + error2zLabel.Text = mtrComp.Error.ToString("F2"); + passed2zLabel.Text = mtrComp.Passed ? Strings.Passed : Strings.Failed; + break; + case 2: + volume3zLabel.Text = mtrComp.VolumeMeter.ToString("F2"); + error3zLabel.Text = mtrComp.Error.ToString("F2"); + passed3zLabel.Text = mtrComp.Passed ? Strings.Passed : Strings.Failed; + break; + } + } + } + } } void OnProcedureCompleted(object sender, ProcedureCompletedEventArgs args) diff --git a/TestBenchFramework/UiBridge/TestCompletedEventArgs.cs b/TestBenchFramework/UiBridge/TestCompletedEventArgs.cs index 71cf81bec..8ac688fb1 100644 --- a/TestBenchFramework/UiBridge/TestCompletedEventArgs.cs +++ b/TestBenchFramework/UiBridge/TestCompletedEventArgs.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2016 Sensus Metering Systems /// using System; using Config.Entities; @@ -9,12 +9,12 @@ namespace TBF.UiBridge public class TestCompletedEventArgs : EventArgs { public string TestName; - public int TestPart; + public Results.Entities.TestRslt TestRslt; - public TestCompletedEventArgs(string testName, int testPart) + public TestCompletedEventArgs(string testName, Results.Entities.TestRslt testRslt) { this.TestName = testName; - this.TestPart = testPart; + this.TestRslt = testRslt; } } }