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/Cameras/CameraRoi/CameraRoi.cs
+3 -2
View File
@@ -6,6 +6,7 @@ using System.Diagnostics;
using System.Collections.Generic;
using System.Threading;
using log4net;
using Config.Entities;
using TBF.BenchControl;
using TBF.BenchControl.Generic;
using TBF.Boxes;
@@ -37,10 +38,10 @@ namespace TBF.BenchControl.Cameras.CameraRoi
{
cameraRoiCfg = cfg;
if (cfg.DebugLevel != Entities.DebugMode.Off)
if (cfg.DebugLevel != DebugMode.Off)
{
camera = TbfComponents.FindComponent(cfg.ParentName, components) as GenericDevices.ICamera;
if ((camera == null) && (cfg.DebugLevel != Entities.DebugMode.Inherit))
if ((camera == null) && (cfg.DebugLevel != DebugMode.Inherit))
{
throw new Exception("Cannot find " + Name + " parent");
}
TestBenchFramework/BenchControl/Cameras/CameraRoi/CameraRoiCfg.cs
+2 -1
View File
@@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.IO;
using System.IO.Ports;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Cameras.CameraRoi
@@ -26,7 +27,7 @@ namespace TBF.BenchControl.Cameras.CameraRoi
[XmlIgnore]
public RoiProcedureParams ProcParams;
public override IParamsProvider GetProcedureParams() { return ProcParams; }
public override IParamsProvider CreateProcedureParams(Entities.Procedure procedure)
public override IParamsProvider CreateProcedureParams(Procedure procedure)
{
RoiProcedureParams procParams = new RoiProcedureParams();
procParams.UpdateProcedureParams(Name, procedure);
TestBenchFramework/BenchControl/Cameras/CameraRoi/CameraRoiFactory.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace TBF.BenchControl.Cameras.CameraRoi
public IComponentCfg DefaultConfig() { return new CameraRoiCfg(this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component)
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
{
return ComponentCfgBase.CreateFromDbEntity(typeof(CameraRoiCfg), component, this);
}
TestBenchFramework/BenchControl/Cameras/CameraRoi/RoiProcedureParams.cs
+3 -2
View File
@@ -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;
@@ -260,7 +261,7 @@ namespace TBF.BenchControl.Cameras.CameraRoi
return pars;
}
public override void UpdateProcedureParams(Entities.ComponentProcedure dbEntity)
public override void UpdateProcedureParams(ComponentProcedure dbEntity)
{
if (dbEntity == null) return;
try
@@ -284,7 +285,7 @@ namespace TBF.BenchControl.Cameras.CameraRoi
{
}
public RoiProcedureParams(Entities.ComponentProcedure procedureParamsEntity, string componentName, Entities.Procedure procedure)
public RoiProcedureParams(ComponentProcedure procedureParamsEntity, string componentName, Procedure procedure)
{
this.procedureParamsEntity = procedureParamsEntity;
this.componentName = componentName;