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

iPearl debugging, progress management, OracleDB simulation, etc, version 2.1.182

Browse Source
This commit is contained in:
Milan Hanajik
2016-01-09 20:06:59 +01:00
parent 68c4bf5956
commit 98c8b0e7a8
40 changed files with 670 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/Screens/ProcessTabPageCtrl48.cs
+60 -55
View File
@@ -7,6 +7,7 @@ using System.Drawing;
using System.Windows.Forms;
using log4net;
using Config.Entities;
using TBF.BenchControl.Sequences;
using TBF.UiBridge;
using TBF.Resources;
@@ -412,68 +413,72 @@ namespace TBF.Screens
void OnTestProgress(object sender, TestProgressEventArgs args)
{
/// Top part
airTempLabel.Text = args.AmbientTemp.ToString();
airPressLabel.Text = args.AmbientPressure.ToString();
airHumiLabel.Text = args.AmbientHumidity.ToString();
airTempLabel.Text = ProcessData.AmbientTemp.ToString();
airPressLabel.Text = ProcessData.AmbientPressure.ToString();
airHumiLabel.Text = ProcessData.AmbientHumidity.ToString();
refPulsesLabel.Text = args.RefPulses.ToString();
refFreqLabel.Text = args.FlowMtrFreq.ToString();
refFlowLabel.Text = Utils.FloatToStr(args.Flow.Val, 4);
refVolumeLabel.Text = args.Volume.ToString();
tInLabel.Text = ProcessData.TempIn.ToString();
tOutLabel.Text = ProcessData.TempOut.ToString();
prInLabel.Text = ProcessData.PressureUp.ToString();
prOutLabel.Text = ProcessData.PressureDown.ToString();
//regValvePosLabel.Text = args.RegValvePos.ToString();
tDivLabel.Text = args.Tdiv.ToString();
refPulsesLabel.Text = ProcessData.RefCount.ToString();
refFreqLabel.Text = ProcessData.RefFreq.ToString();
refFlowLabel.Text = Utils.FloatToStr(ProcessData.RefFlow.Val, 4);
/// Bottom part
if (currentMetersKind == MetersKind.Single)
{
for (int i = 0; i < textBoxesCount; i++)
{
/// 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++)
{
/// 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");
}
/// TODO: Reimplement
//volume1zLabel.Text = args.TestResult.CombinedMeters[0].VolumeMeter.ToString();
//error1zLabel.Text = args.TestResult.CombinedMeters[0].VolumeErrorPct.ToString("F2");
}
tInLabel.Text = args.Tin.ToString();
tOutLabel.Text = args.Tout.ToString();
prInLabel.Text = args.Pin.ToString();
prOutLabel.Text = args.Pout.ToString();
massLabel.Text = args.Mass.ToString();
if (args.Mass.Valid && args.StartMass.Valid)
if (args.Phase == Config.Entities.Progress.Test)
{
massDiffLabel.Text = (args.Mass.Val - args.StartMass.Val).ToString(args.Mass.Format);
}
///// Top part
//refVolumeLabel.Text = args.Volume.ToString();
if (pumpOn != args.PumpOn || diverterToTank != args.DivToTank)
{
//if (pumpOn != args.PumpOn)
////regValvePosLabel.Text = args.RegValvePos.ToString();
//tDivLabel.Text = args.Tdiv.ToString();
///// Bottom part
//if (currentMetersKind == MetersKind.Single)
//{
// if (pumpOn) pumpPictureBox.Image = System.Resources.
// else pumpPictureBox.Image = System.Resources.
// for (int i = 0; i < textBoxesCount; i++)
// {
// /// 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++)
// {
// /// 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");
// }
// /// TODO: Reimplement
// //volume1zLabel.Text = args.TestResult.CombinedMeters[0].VolumeMeter.ToString();
// //error1zLabel.Text = args.TestResult.CombinedMeters[0].VolumeErrorPct.ToString("F2");
//}
//massLabel.Text = args.Mass.ToString();
//if (args.Mass.Valid && args.StartMass.Valid)
//{
// massDiffLabel.Text = (args.Mass.Val - args.StartMass.Val).ToString(args.Mass.Format);
//}
//if (pumpOn != args.PumpOn || diverterToTank != args.DivToTank)
//{
// //if (pumpOn != args.PumpOn)
// //{
// // if (pumpOn) pumpPictureBox.Image = System.Resources.
// // else pumpPictureBox.Image = System.Resources.
// //}
// pumpOn = args.PumpOn;
// diverterToTank = args.DivToTank;
// Invalidate();
//}
pumpOn = args.PumpOn;
diverterToTank = args.DivToTank;
Invalidate();
}
}