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

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
@@ -5,6 +5,7 @@ using System;
using System.IO;
using System.Text;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
using TBF.Resources;
@@ -100,7 +101,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
return pars;
}
public override void UpdateTestParams(Entities.ComponentTest dbEntity)
public override void UpdateTestParams(ComponentTest dbEntity)
{
if (dbEntity == null) return;
try
@@ -126,7 +127,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
{
}
public LeakTestParams(Entities.ComponentTest testParamsEntity, string componentName, Entities.Test test)
public LeakTestParams(ComponentTest testParamsEntity, string componentName, Test test)
{
this.testParamsEntity = testParamsEntity;
this.componentName = componentName;
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using log4net;
using Config.Entities;
using TBF.BenchControl;
using TBF.Boxes;
using TBF.Resources;
@@ -26,7 +27,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
/// Event.OpArgumentError . Target flow is out of range
/// Event.Error . . . . . . Unspecified error
/// </returns>
public IList<Event> Execute(Entities.Test test, LeakTestParams testParams)
public IList<Event> Execute(Config.Entities.Test test, LeakTestParams testParams)
{
Elde.ControlBoardDev cBrd = StateMachine.ControlBoard;
@@ -46,7 +47,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
/// Start the test, initialize test results
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, 0));
Entities.TestResult tstRslt = new Entities.TestResult(test, 1, StateMachine.Procedure.MetersKind);
TestResult tstRslt = new TestResult(test, 1, StateMachine.Procedure.MetersKind);
//------------------------------------------------
Bridge.OnActivity(this, Strings.Starting_the_pump);
@@ -303,9 +304,9 @@ namespace TBF.BenchControl.TestMethods.LeakTest
tstRslt.TimeDivEnd4 = 0;
tstRslt.TimeDivEnd5 = 0;
if (StateMachine.Procedure.MetersKind == Entities.MetersKind.Single)
if (StateMachine.Procedure.MetersKind == MetersKind.Single)
{
for (int i = 0; i < Program.WMsCount; i++)
for (int i = 0; i < Config.Data.WMsCount; i++)
{
if (sensPath.RegisterReaders[i] != null)
{
@@ -324,7 +325,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
}
else
{
for (int iCmbnd = 0; iCmbnd < Program.CompoundWMsCount; iCmbnd++)
for (int iCmbnd = 0; iCmbnd < Config.Data.CompoundWMsCount; iCmbnd++)
{
tstRslt.CombinedMeters[iCmbnd].VolumeRef = 0;
@@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using log4net;
using Config.Entities;
using TBF.BenchControl;
namespace TBF.BenchControl.TestMethods.LeakTest
@@ -15,9 +16,9 @@ namespace TBF.BenchControl.TestMethods.LeakTest
readonly TestMethodCfg testMethodCfg;
public bool Evaluate(Entities.Test test) { return true; }
public bool Publish(Entities.Test test) { return true; }
public bool CanTest(Entities.MetersKind meters) { return true; }
public bool Evaluate(Test test) { return true; }
public bool Publish(Test test) { return true; }
public bool CanTest(MetersKind meters) { return true; }
public TestMethod()
{
@@ -30,7 +31,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
log.Debug(this.ToString());
}
public IList<Event> Execute(Entities.Test test)
public IList<Event> Execute(Test test)
{
return (new LeakTestSeq()).Execute(test, testMethodCfg.TestParams);
}
@@ -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.LeakTest
@@ -18,7 +19,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
[XmlIgnore]
public LeakTestParams TestParams;
public override IParamsProvider GetTestParams() { return TestParams; }
public override IParamsProvider CreateTestParams(Entities.Test test)
public override IParamsProvider CreateTestParams(Test test)
{
LeakTestParams testParams = new LeakTestParams();
testParams.UpdateTestParams(Name, test);
@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
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);
}