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

IFlowMeterSingle with GetRange(.) and CorrectedFlow(.), Test method calculations clean-up, refactorization, ver. 3.1.1901

Browse Source
This commit is contained in:
Milan Hanajik
2022-05-04 10:23:21 +02:00
parent 9a42e199e3
commit 2c0ae68db0
51 changed files with 1001 additions and 1213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Process/ProcessTabPageCtrl6.cs
+6 -5
View File
@@ -471,8 +471,9 @@ namespace TBF.UI.Process
/// Available only during a test
///
refPulsesLabel.Text = ProcessData.RefPulses.ToString();
double refVolume = ProcessData.LtrPerRefPulse * (double)ProcessData.RefPulses;
refVolumeLabel.Text = refVolume.ToString("F2");
double refVolume = (ProcessData.Devices != null && ProcessData.Devices.FlowMeter != null)
? ProcessData.Devices.FlowMeter.LtrPerPulse * (double)ProcessData.RefPulses : 0;
refVolumeLabel.Text = refVolume.ToString("F2");
//double massDiff = ProcessData.Mass.Val - ProcessData.StartMass.Val;
//massDiffLabel.Text = massDiff.ToString("F3");
@@ -492,7 +493,7 @@ namespace TBF.UI.Process
pulses[i].Text = rr.WMPulses.ToString();
refPulses[i].Text = rr.WMRefPulses.ToString();
volume[i].Text = rr.WMVolume.ToString("F1");
error[i].Text = Formulas.ErrorFromVolumes(rr.WMVolume, rr.WMRefPulses * ProcessData.LtrPerRefPulse).ToString("F1");
error[i].Text = Formulas.ErrorFromVolumes(rr.WMVolume, rr.WMRefPulses * ProcessData.Devices.FlowMeter.LtrPerPulse).ToString("F1");
}
}
}
@@ -511,7 +512,7 @@ namespace TBF.UI.Process
pulses[i].Text = rr.WMPulses.ToString();
refPulses[i].Text = rr.WMRefPulses.ToString();
volume[i].Text = rr.WMVolume.ToString("F1");
error[i].Text = Formulas.ErrorFromVolumes(rr.WMVolume, rr.WMRefPulses * ProcessData.LtrPerRefPulse).ToString("F1");
error[i].Text = Formulas.ErrorFromVolumes(rr.WMVolume, rr.WMRefPulses * ProcessData.Devices.FlowMeter.LtrPerPulse).ToString("F1");
compoundVolume += rr.WMVolume;
}
}
@@ -558,7 +559,7 @@ namespace TBF.UI.Process
refPulsesLabel.Text = tRes.PulsesMaster.ToString("F0");
refFreqLabel.Text = "---";
refFlowLabel.Text = Utils.DoubleToStr(tRes.FlowVolume, 4);
refFlowLabel.Text = Utils.DoubleToStr(tRes.Flow, 4);
refVolumeLabel.Text = tRes.VolumeCTV.ToString("F2");
//regValvePosLabel.Text = tstRslt.