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

Process data display : many changes, TODO: Meter data and the end of test.

Browse Source
This commit is contained in:
Milan Hanajik
2016-02-10 19:24:10 +01:00
parent 3775913a33
commit 2c1e4e7d26
18 changed files with 254 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/Screens/ProcessTabPageCtrl24.cs
+34 -23
View File
@@ -6,6 +6,7 @@ using System.Drawing;
using System.Windows.Forms;
using log4net;
using Config.Entities;
using TBF.BenchControl.Sequences;
using TBF.UiBridge;
using TBF.Resources;
@@ -383,20 +384,42 @@ namespace TBF.Screens
void OnProcessDataChanged(object sender, ProcessDataEventArgs args)
{
/// Top part
//airTempLabel.Text = args.AmbientTemp.ToString();
//airPressLabel.Text = args.AmbientPressure.ToString();
//airHumiLabel.Text = args.AmbientHumidity.ToString();
///
/// Always available
///
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();
tDivLabel.Text = ProcessData.TempDiv.ToString();
//regValvePosLabel.Text = args.RegValvePos.ToString();
//tDivLabel.Text = args.Tdiv.ToString();
prInLabel.Text = ProcessData.PressureUp.ToString();
prOutLabel.Text = ProcessData.PressureDown.ToString();
massLabel.Text = ProcessData.Mass.ToString();
///
/// Available when setting the flow
///
refFreqLabel.Text = ProcessData.RefFreq.ToString();
refFlowLabel.Text = Utils.FloatToStr(ProcessData.RefFlow.Val, 4);
///
/// Available during a test
///
refPulsesLabel.Text = ProcessData.RefCount.ToString();
double refVolume = ProcessData.LtrPerRefPulse * (double)ProcessData.RefCount.Val;
float massDiff = ProcessData.Mass.Val - ProcessData.StartMass.Val;
massDiffLabel.Text = massDiff.ToString("F3");
float volumeCtv = 1001.03f * massDiff / (float)TBF.BenchControl.Formulas.WaterDensityFromTemp(ProcessData.TempOut.Val);
volumeCtvLabel.Text = volumeCtv.ToString("F2");
double refError = TBF.BenchControl.Formulas.ErrorFromVolumes(refVolume, volumeCtv);
refErrorLabel.Text = refError.ToString("F3");
/// Bottom part
if (currentMetersKind == MetersKind.Single)
{
for (int i = 0; i < textBoxesCount; i++)
@@ -423,18 +446,6 @@ 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();
//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)