michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Process data screen update when test completed, version 2.1.213.

Browse Source
This commit is contained in:
Milan Hanajik
2016-02-13 19:28:33 +01:00
parent 56e38831f1
commit edc4d59f90
21 changed files with 329 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/Screens/ProcessTabPageCtrl24.cs
+96 -52
View File
@@ -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)