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/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
+4 -4
View File
@@ -26,7 +26,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
/// Event.OpArgumentError . Target flow is out of range
/// Event.Error . . . . . . Unspecified error
/// </returns>
public IList<Event> Execute(Entities.Test test)
public IList<Event> Execute(Config.Entities.Test test)
{
Elde.ControlBoardDev cBrd = StateMachine.ControlBoard;
@@ -59,7 +59,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
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);
int flowSetTime0 = StateMachine.Time;
@@ -258,7 +258,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
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]);
}
@@ -375,7 +375,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
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++)
//{
// if (sensPath.RegisterReaders[i] != null)
// {
TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs
+5 -4
View File
@@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using log4net;
using Config.Entities;
using TBF.BenchControl;
namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
@@ -13,9 +14,9 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
private static readonly ILog log = LogManager.GetLogger(typeof(TestMethod));
public override string ToString() { return string.Format("TestMethods.ReferenceFlowmeterCalibration({0})", Cfg.ToString(1)); }
public bool Evaluate(Entities.Test test) { return false; }
public bool Publish(Entities.Test test) { return false; }
public bool CanTest(Entities.MetersKind meters) { return true; }
public bool Evaluate(Test test) { return false; }
public bool Publish(Test test) { return false; }
public bool CanTest(MetersKind meters) { return true; }
public TestMethod()
{
@@ -27,7 +28,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
log.Debug(this.ToString());
}
public IList<Event> Execute(Entities.Test test)
public IList<Event> Execute(Test test)
{
return (new ReferenceFlowmeterCalibrationSeq()).Execute(test);
}
TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethodFactory.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
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);
}