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

'Config', 'Results' projects added, includes iPerl opto logging bug-fixes, builds OK, cannot open DB, version 2.0.158.

Browse Source
This commit is contained in:
Milan Hanajik
2015-12-05 14:18:36 +01:00
parent 29ece2f91c
commit f6cec9d769
360 changed files with 6406 additions and 4091 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
+4 -4
View File
@@ -26,7 +26,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
/// Event.OpArgumentError . Target flow is out of range
/// Event.Error . . . . . . Unspecified error
/// </returns>
public IList<Event> Execute(Entities.Test test, TestParams testParams)
public IList<Event> Execute(Config.Entities.Test test, TestParams testParams)
{
Elde.ControlBoardDev cBrd = StateMachine.ControlBoard;
@@ -59,7 +59,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
loop:
/// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Single);
Config.Entities.TestResult tstRslt = new Config.Entities.TestResult(test, repetitionNr, Config.Entities.MetersKind.Single);
tstRslt.DoNotEvaluate = !testParams.Evaluate;
tstRslt.DoNotPublish = !testParams.Publish;
@@ -342,7 +342,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
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; i++)
for (int i = 0; i < Config.Data.WMsCount; i++)
{
logstr += string.Format(" M{0}=({1},{2})", i + 1, WMRefPulses[i], WMPulses[i]);
}
@@ -457,7 +457,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
tstRslt.TimeDivEnd3 = 0;
tstRslt.TimeDivEnd4 = 0;
tstRslt.TimeDivEnd5 = 0;
for (int i = 0; i < Program.WMsCount; i++)
for (int i = 0; i < Config.Data.WMsCount; i++)
{
/// Reference to iPerl water meter or null:
WaterMeters.iPerl.WaterMeter iPerl = ((sensPath.RegisterReaders != null) && (i < sensPath.RegisterReaders.Length))
TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethod.cs
+5 -4
View File
@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using log4net;
using Config.Entities;
using TBF.BenchControl;
namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
@@ -16,7 +17,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
readonly TestMethodCfg testMethodCfg;
public bool Evaluate(Entities.Test test)
public bool Evaluate(Test test)
{
TestParams tp = new TestParams();
foreach (var tstPrms in test.MoreParams)
@@ -30,7 +31,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
return true;
}
public bool Publish(Entities.Test test)
public bool Publish(Test test)
{
TestParams tp = new TestParams();
foreach (var tstPrms in test.MoreParams)
@@ -44,7 +45,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
return true;
}
public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; }
public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
public TestMethod()
{
@@ -57,7 +58,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
log.Debug(this.ToString());
}
public IList<Event> Execute(Entities.Test test)
public IList<Event> Execute(Test test)
{
return (new FlyingStartCollectionMethodSeq()).Execute(test, testMethodCfg.TestParams);
}
TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethodCfg.cs
+2 -1
View File
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
@@ -18,7 +19,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
[XmlIgnore]
public TestParams TestParams;
public override IParamsProvider GetTestParams() { return TestParams; }
public override IParamsProvider CreateTestParams(Entities.Test test)
public override IParamsProvider CreateTestParams(Test test)
{
TestParams testParams = new TestParams();
testParams.UpdateTestParams(Name, test);
TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethodFactory.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
public IComponentCfg DefaultConfig() { return new TestMethodCfg(this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component)
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
{
return ComponentCfgBase.CreateFromDbEntity(typeof(TestMethodCfg), component, this);
}
TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestParams.cs
+3 -2
View File
@@ -5,6 +5,7 @@
using System;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
using TBF.Resources;
@@ -82,7 +83,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
return pars;
}
public override void UpdateTestParams(Entities.ComponentTest dbEntity)
public override void UpdateTestParams(ComponentTest dbEntity)
{
if (dbEntity == null) return;
try
@@ -108,7 +109,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
{
}
public TestParams(Entities.ComponentTest testParamsEntity, string componentName, Entities.Test test)
public TestParams(ComponentTest testParamsEntity, string componentName, Test test)
{
this.testParamsEntity = testParamsEntity;
this.componentName = componentName;