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

ProcessDataEventArgs added.

Browse Source
This commit is contained in:
Milan Hanajik
2016-02-08 23:33:23 +01:00
parent 6e2bf48b43
commit f31843f665
7 changed files with 121 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/Screens/ProcessTabPageCtrl24.cs
+28 -28
View File
@@ -384,17 +384,17 @@ 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 = args.AmbientTemp.ToString();
//airPressLabel.Text = args.AmbientPressure.ToString();
//airHumiLabel.Text = args.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();
//refPulsesLabel.Text = args.RefPulses.ToString();
//refFreqLabel.Text = args.FlowMtrFreq.ToString();
//refFlowLabel.Text = Utils.FloatToStr(args.Flow.Val, 4);
//refVolumeLabel.Text = args.Volume.ToString();
//regValvePosLabel.Text = args.RegValvePos.ToString();
tDivLabel.Text = args.Tdiv.ToString();
//tDivLabel.Text = args.Tdiv.ToString();
/// Bottom part
if (currentMetersKind == MetersKind.Single)
@@ -423,29 +423,29 @@ namespace TBF.Screens
//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();
//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();
//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 (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();
}
//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();
//}
}
void OnTestCompleted(object sender, TestCompletedEventArgs args)