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

ReadMassOp removed, ProcessData.Mass removed, TestMethods.FixedStartMassCollection, ver. 3.1.1620

Browse Source
This commit is contained in:
Milan Hanajik
2021-04-15 13:15:18 +02:00
parent eeaf1e1682
commit 1f05cc420c
23 changed files with 303 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Process/ProcessTabPageCtrl6.cs
+9 -9
View File
@@ -464,7 +464,7 @@ namespace TBF.UI.Process
prUpLabel.Text = ProcessData.PressUp.ToString();
prDownLabel.Text = ProcessData.PressDown.ToString();
massLabel.Text = ProcessData.Mass.ToString();
//massLabel.Text = ProcessData.Mass.ToString();
if (args.TestPhase == Config.Entities.Progress.FlowSetting ||
args.TestPhase == Config.Entities.Progress.Test)
@@ -485,13 +485,13 @@ namespace TBF.UI.Process
double refVolume = ProcessData.LtrPerRefPulse * (double)ProcessData.RefPulses;
refVolumeLabel.Text = refVolume.ToString("F2");
double massDiff = ProcessData.Mass.Val - ProcessData.StartMass.Val;
massDiffLabel.Text = massDiff.ToString("F3");
double volumeCtv = 1000 * Config.Formulas.Buoyancy() * massDiff / Config.Formulas.WaterDensityFromTempPress((ProcessData.TempUp.Val + ProcessData.TempDown.Val) / 2,
(ProcessData.PressUp.Val + ProcessData.PressDown.Val) / 2);
volumeCtvLabel.Text = volumeCtv.ToString("F2");
double refError = Config.Formulas.ErrorFromVolumes(refVolume, volumeCtv);
refErrorLabel.Text = refError.ToString("F3");
//double massDiff = ProcessData.Mass.Val - ProcessData.StartMass.Val;
//massDiffLabel.Text = massDiff.ToString("F3");
//double volumeCtv = 1000 * Config.Formulas.Buoyancy() * massDiff / Config.Formulas.WaterDensityFromTempPress((ProcessData.TempUp.Val + ProcessData.TempDown.Val) / 2,
// (ProcessData.PressUp.Val + ProcessData.PressDown.Val) / 2);
//volumeCtvLabel.Text = volumeCtv.ToString("F2");
//double refError = Config.Formulas.ErrorFromVolumes(refVolume, volumeCtv);
//refErrorLabel.Text = refError.ToString("F3");
if (currentMetersKind == MetersKind.Single)
{
@@ -564,7 +564,7 @@ namespace TBF.UI.Process
prUpLabel.Text = tRes.PressUpMean.ToString("F2");
prDownLabel.Text = tRes.PressDownMean.ToString("F2");
massLabel.Text = ProcessData.Mass.ToString();
//massLabel.Text = ProcessData.Mass.ToString();
massDiffLabel.Text = (tRes.MassEnd - tRes.MassStart).ToString("F3");
refPulsesLabel.Text = tRes.PulsesMaster.ToString("F0");