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

Many changes, new results used, all test sequences modified, simulated tests rewritten.

Browse Source
This commit is contained in:
Milan Hanajik
2016-01-04 13:53:45 +01:00
parent 494c6edf76
commit 26982a5729
71 changed files with 2609 additions and 2692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/Screens/ProcessTabPageCtrl24.cs
+60 -56
View File
@@ -401,23 +401,26 @@ namespace TBF.Screens
{
for (int i = 0; i < textBoxesCount; i++)
{
pulses[i].Text = args.TestResult.Meters[i].PulsesMeter.ToString();
refPulses[i].Text = args.TestResult.Meters[i].PulsesMaster.ToString();
volume[i].Text = args.TestResult.Meters[i].VolumeMeter.ToString();
error[i].Text = args.TestResult.Meters[i].VolumeErrorPct.ToString("F2");
/// TODO: Reimplement
//pulses[i].Text = args.TestResult.Meters[i].PulsesMeter.ToString();
//refPulses[i].Text = args.TestResult.Meters[i].PulsesMaster.ToString();
//volume[i].Text = args.TestResult.Meters[i].VolumeMeter.ToString();
//error[i].Text = args.TestResult.Meters[i].VolumeErrorPct.ToString("F2");
}
}
else if (currentMetersKind == MetersKind.Combined)
{
for (int i = 0; i < 2; i++)
{
pulses[i].Text = args.TestResult.Meters[i].PulsesMeter.ToString();
refPulses[i].Text = args.TestResult.Meters[i].PulsesMaster.ToString();
volume[i].Text = args.TestResult.Meters[i].VolumeMeter.ToString();
error[i].Text = args.TestResult.Meters[i].VolumeErrorPct.ToString("F2");
/// TODO: Reimplement
//pulses[i].Text = args.TestResult.Meters[i].PulsesMeter.ToString();
//refPulses[i].Text = args.TestResult.Meters[i].PulsesMaster.ToString();
//volume[i].Text = args.TestResult.Meters[i].VolumeMeter.ToString();
//error[i].Text = args.TestResult.Meters[i].VolumeErrorPct.ToString("F2");
}
volume1zLabel.Text = args.TestResult.CombinedMeters[0].VolumeMeter.ToString();
error1zLabel.Text = args.TestResult.CombinedMeters[0].VolumeErrorPct.ToString("F2");
/// TODO: Reimplement
//volume1zLabel.Text = args.TestResult.CombinedMeters[0].VolumeMeter.ToString();
//error1zLabel.Text = args.TestResult.CombinedMeters[0].VolumeErrorPct.ToString("F2");
}
tInLabel.Text = args.Tin.ToString();
@@ -447,57 +450,58 @@ namespace TBF.Screens
void OnTestCompleted(object sender, TestCompletedEventArgs args)
{
TestResult tRes = args.TestResult;
/// TODO: Reimplement
//TestResult tRes = args.TestResult;
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");
//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");
refPulsesLabel.Text = tRes.PulsesMaster.ToString("F0");
//refFreqLabel.Text = tstRslt.
refFlowLabel.Text = Utils.FloatToStr(tRes.FlowMass / 1000.0f, 4);
//refPulsesLabel.Text = tRes.PulsesMaster.ToString("F0");
////refFreqLabel.Text = tstRslt.
//refFlowLabel.Text = Utils.FloatToStr(tRes.FlowMass / 1000.0f, 4);
refVolumeLabel.Text = tRes.VolumeCTV.ToString("F2");
//regValvePosLabel.Text = tstRslt.
//massLabel.Text = tstRslt.
//refVolumeLabel.Text = tRes.VolumeCTV.ToString("F2");
////regValvePosLabel.Text = tstRslt.
////massLabel.Text = tstRslt.
volumeCtvLabel.Text = args.TestResult.VolumeCTV.ToString("F1");
refErrorLabel.Text = (tRes.ErrorMaster == 0) ? "---" : tRes.ErrorMaster.ToString("F3");
//volumeCtvLabel.Text = args.TestResult.VolumeCTV.ToString("F1");
//refErrorLabel.Text = (tRes.ErrorMaster == 0) ? "---" : tRes.ErrorMaster.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;
}
//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;
//}
}
void OnProcedureCompleted(object sender, ProcedureCompletedEventArgs args)