TBF : (1) Elde.RegisterReader has a new proc. parameter int Filter, (2) Filters 'int[]' are passed everywhere in the TBF application istead of test.TolerRed.
This commit is contained in:
@@ -191,10 +191,17 @@ namespace TBF.BenchControl.TestMethods.Endurance
|
||||
///
|
||||
|
||||
/// Find ROI-s
|
||||
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
|
||||
int[] filters = new int[] { 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
|
||||
foreach (var rr in sensPath.RegisterReaders)
|
||||
{
|
||||
GenericDevices.IRoi roi = rr as GenericDevices.IRoi;
|
||||
TBF.BenchControl.Elde.RegisterReader.RegisterReader regr = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
|
||||
if (regr != null)
|
||||
{
|
||||
if (regr.Position >= 1 && regr.Position <= 8) { filters[regr.Position - 1] = regr.Filter; }
|
||||
}
|
||||
|
||||
GenericDevices.IRoi roi = rr as GenericDevices.IRoi;
|
||||
if (roi != null && roi.Detected)
|
||||
{
|
||||
rois.Add(roi);
|
||||
@@ -242,7 +249,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
|
||||
.AddOperation(processDataLoggingOp)
|
||||
.AddOperation(enduranceDataLoggingOp)
|
||||
.AddOperation(cBrd.StartMeasurementOp(outPath, Elde.TestMethods.Synchro,
|
||||
test.Qfrom, test.Qto, totalPulses, (float)test.TolerRed))
|
||||
test.Qfrom, test.Qto, totalPulses, filters))
|
||||
.EnterState();
|
||||
do
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user