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

Introduction of Program.CompoundWMsCount, fix in DataEntry.Combined.CycleBeginningForm, version 1.5.68.

Browse Source
This commit is contained in:
Milan Hanajik
2015-07-09 16:24:55 +02:00
parent 563141fbbe
commit 95c05078de
15 changed files with 74 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
+3 -3
View File
@@ -292,7 +292,7 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
string logstr = string.Format("E={0} f={1} q={2}", cBrd.EtPulses(0), cBrd.ReferenceFreq,
cBrd.ReferenceFlow * outPath.FlowMeter.NominalFlow);
for (int i = 0; i < (Program.WMsCount / 2) * 2; i++)
for (int i = 0; i < Program.CompoundWMsCount * 2; i++)
{
logstr += string.Format(" M{0}=({1},{2})", i + 1, WMRefPulses[i], WMPulses[i]);
}
@@ -300,7 +300,7 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
float progress = Formulas.TestProgress(cBrd.EtPulses(0), totalPulses, estFlowSetTime, test.TstTime);
TestProgressEventArgs data = GetTestProgressData(test, tstRslt, true, cBrd, cBrd.TTime, progress);
for (int i = 0; i < Program.WMsCount / 2; i++)
for (int i = 0; i < Program.CompoundWMsCount; i++)
{
data.TestResult.CombinedMeters[i].VolumeMeter = data.TestResult.Meters[2 * i].VolumeMeter
+ data.TestResult.Meters[2 * i + 1].VolumeMeter;
@@ -415,7 +415,7 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
tstRslt.TimeDivEnd4 = 0;
tstRslt.TimeDivEnd5 = 0;
for (int iCmbnd = 0; iCmbnd < Program.WMsCount / 2; iCmbnd++)
for (int iCmbnd = 0; iCmbnd < Program.CompoundWMsCount; iCmbnd++)
{
tstRslt.CombinedMeters[iCmbnd].VolumeRef = tstRslt.VolumeCTV; /// [l] must be calculated before main & aux. meter error
TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
+7 -7
View File
@@ -20,9 +20,9 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
public IList<Event> Execute(Entities.Test test, CombinedWithDetTestParams testParams)
{
if (test.Part < 1 || test.Part > (Program.WMsCount / 2))
if (test.Part < 1 || test.Part > Program.CompoundWMsCount)
{
UiBridge.Bridge.OnError(this, string.Format("Test 'Part' should be 1 .. {0}", Program.WMsCount / 2));
UiBridge.Bridge.OnError(this, string.Format("Test 'Part' should be 1 .. {0}", Program.CompoundWMsCount));
IList<Event> retval = new List<Event>(1);
retval.Add(Event.ConfigurationError);
return retval;
@@ -31,7 +31,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
Elde.ControlBoardDev cBrd = StateMachine.ControlBoard;
/// Specific for combined meters
int[] lastWMPulses = new int[Program.WMsCount];
int[] lastWMPulses = new int[2 * Program.CompoundWMsCount];
IList<Event> e = new List<Event>(); /// Events from currently running operations
@@ -220,7 +220,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
while (!e.Contains(Event.PositionReached));
// Last pulses are kept to calculate differences
for (int i = 0; i < Program.WMsCount; i++) lastWMPulses[i] = WMPulses[i];
for (int i = 0; i < 2 * Program.CompoundWMsCount; i++) lastWMPulses[i] = WMPulses[i];
// Shift data in the detection buffers
for (int i = DetectionBufferSize - 2; i >= 0; i--)
@@ -466,7 +466,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
string logstr = string.Format("E={0} f={1} q={2}", cBrd.EtPulses(0), cBrd.ReferenceFreq,
cBrd.ReferenceFlow * outPath.FlowMeter.NominalFlow);
for (int i = 0; i < (Program.WMsCount / 2) * 2; i++)
for (int i = 0; i < Program.CompoundWMsCount * 2; i++)
{
logstr += string.Format(" M{0}=({1},{2})", i + 1, WMRefPulses[i], WMPulses[i]);
}
@@ -475,7 +475,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
float progress = Formulas.TestProgress(cBrd.EtPulses(0), totalPulses, estFlowSetTime, test.TstTime);
TestProgressEventArgs data = GetTestProgressData(test, tstRslt, true, cBrd, cBrd.TTime, progress);
for (int i = 0; i < Program.WMsCount / 2; i++)
for (int i = 0; i < Program.CompoundWMsCount; i++)
{
data.TestResult.CombinedMeters[i].VolumeMeter = data.TestResult.Meters[2 * i].VolumeMeter
+ data.TestResult.Meters[2 * i + 1].VolumeMeter;
@@ -595,7 +595,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
tstRslt.TimeDivEnd4 = 0;
tstRslt.TimeDivEnd5 = 0;
for (int iCmbnd = 0; iCmbnd < Program.WMsCount / 2; iCmbnd++)
for (int iCmbnd = 0; iCmbnd < Program.CompoundWMsCount; iCmbnd++)
{
for (int i = 2 * iCmbnd; i < 2 * iCmbnd + 2; i++)
{
TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/FixedStartCombinedMetersSeq.cs
+3 -3
View File
@@ -369,7 +369,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartCombinedMeters
float progress = Formulas.TestProgress(cBrd.EtPulses(0), totalPulses, estFlowSetTime, test.TstTime);
TestProgressEventArgs data = GetTestProgressData(test, tstRslt, true, cBrd, cBrd.TTime, progress);
for (int i = 0; i < Program.WMsCount / 2; i++)
for (int i = 0; i < Program.CompoundWMsCount; i++)
{
data.TestResult.CombinedMeters[i].VolumeMeter = data.TestResult.Meters[2 * i].VolumeMeter
+ data.TestResult.Meters[2 * i + 1].VolumeMeter;
@@ -486,7 +486,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartCombinedMeters
while (!e.Contains(Event.ModelessFormClosed));
for (int i = 0; i < Program.WMsCount / 2 * 2; i++)
for (int i = 0; i < Program.CompoundWMsCount * 2; i++)
{
tstRslt.Meters[i].VolumeEnd = dataEntryCmpnt.WMEndState(i);
@@ -547,7 +547,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartCombinedMeters
tstRslt.TimeDivEnd4 = 0;
tstRslt.TimeDivEnd5 = 0;
for (int iCmbnd = 0; iCmbnd < Program.WMsCount / 2; iCmbnd++)
for (int iCmbnd = 0; iCmbnd < Program.CompoundWMsCount; iCmbnd++)
{
tstRslt.CombinedMeters[iCmbnd].VolumeRef = tstRslt.VolumeCTV; /// [l] must be calculated before main & aux. meter error
tstRslt.CombinedMeters[iCmbnd].PulsesMaster = tstRslt.PulsesMaster;