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

Register readers cleanup, IRegReaderPulses added.

Browse Source
This commit is contained in:
Milan Hanajik 2020-11-13 11:33:33 +01:00
parent 889a370f90
commit c28828fcdd
85 changed files with 355 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
TBF/BenchControl/DataEntry/Combined/EntryForm.cs
View File

@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Combined
public bool UsesCameras() { return false; }
readonly EntryFormCfg entryFormCfg;
IRegisterReader[] regReaders;
IRegReader[] regReaders;
/// <summary>
/// Properties set by the Begin and the End form
@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Combined
}
/// <returns>Reference to the operation</returns>
public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestStartStates;
@ -107,10 +107,10 @@ namespace TBF.BenchControl.DataEntry.Combined
}
/// <returns>null (not implemented)</returns>
public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
/// <returns>Reference to the operation</returns>
public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestEndStates;

6
TBF/BenchControl/DataEntry/Combined/TestStartEndForm.cs
View File

@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.Combined
/// <summary> Number of water meters </summary>
public readonly int WaterMetersCount; /// Main + Aux water meter count as one (combined) water meter
readonly IRegisterReader[] regReaders;
readonly IRegReader[] regReaders;
readonly bool[] disabled;
// To be retrieved after the form closes
@ -78,7 +78,7 @@ namespace TBF.BenchControl.DataEntry.Combined
/// </summary>
/// <param name="waterMetersCount">Number of water meters</param>
/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
: this()
{
endStates = false;
@ -105,7 +105,7 @@ namespace TBF.BenchControl.DataEntry.Combined
/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] mainStartStateStr, string[] auxStartStateStr,
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] mainStartStateStr, string[] auxStartStateStr,
bool[] disabled, double refVolume, double errLimLo, double errLimHi)
: this()
{

8
TBF/BenchControl/DataEntry/Fewa/EntryFormNoStartEnd.cs
View File

@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
public bool UsesCameras() { return false; }
readonly EntryFormCfg entryFormCfg;
IRegisterReader[] regReaders;
IRegReader[] regReaders;
/// <summary>
/// Properties set by the Begin, End and WMStates form
@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
}
/// <returns>Reference to the operation</returns>
public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestStartStates;
@ -107,10 +107,10 @@ namespace TBF.BenchControl.DataEntry.Fewa
}
/// <returns>null (not implemented)</returns>
public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
/// <returns>Reference to the operation</returns>
public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestEndStates;

6
TBF/BenchControl/DataEntry/Fewa/TestStartEndForm.cs
View File

@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
/// <summary> Number of text boxes for serial numbers </summary>
public readonly int WMsCount;
readonly IRegisterReader[] regReaders;
readonly IRegReader[] regReaders;
readonly bool[] disabled;
// To be retrieved after the form closes
@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
/// </summary>
/// <param name="waterMetersCount">Number of water meters</param>
/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
: this()
{
endStates = false;
@ -122,7 +122,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
double refVolume, double errLimLo, double errLimHi)
: this()
{

10
TBF/BenchControl/DataEntry/HeatMeters12/EntryForm.cs
View File

@ -21,7 +21,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
public bool UsesCameras() { return false; }
readonly EntryFormCfg entryFormCfg;
IRegisterReader[] regReaders;
IRegReader[] regReaders;
/// <summary>
/// Properties set by the Begin, End and WMStates form
@ -116,7 +116,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
}
/// <returns>Reference to the operation</returns>
public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestStartStates;
@ -125,10 +125,10 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
}
/// <returns>null (not implemented)</returns>
public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
/// <returns>Reference to the operation</returns>
public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestEndStates;
@ -143,7 +143,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
}
/// <returns>Reference to the operation</returns>
public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi,
public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi,
double refEnergy, double energyErrLimLo, double energyErrLimHi)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");

6
TBF/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs
View File

@ -22,7 +22,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
/// <summary> Number of text boxes for serial numbers </summary>
public readonly int WaterMetersCount;
readonly IRegisterReader[] regReaders;
readonly IRegReader[] regReaders;
readonly bool[] disabled;
// To be retrieved after the form closes
@ -106,7 +106,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
/// </summary>
/// <param name="waterMetersCount">Number of water meters</param>
/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
public TestStartEndForm(EntryFormCfg cfg, int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
public TestStartEndForm(EntryFormCfg cfg, int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
: this()
{
endStates = false;
@ -135,7 +135,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
public TestStartEndForm(EntryFormCfg cfg, int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, string[] energyStartStateStr,
public TestStartEndForm(EntryFormCfg cfg, int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, string[] energyStartStateStr,
bool[] disabled, double refVolume, double errLimLo, double errLimHi,
double refEnergy, double energyErrLimLo, double energyErrLimHi)
: this()

10
TBF/BenchControl/DataEntry/HeatMeters6/EntryForm.cs
View File

@ -21,7 +21,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
public bool UsesCameras() { return false; }
readonly EntryFormCfg entryFormCfg;
IRegisterReader[] regReaders;
IRegReader[] regReaders;
/// <summary>
/// Properties set by the Begin, End and WMStates form
@ -116,7 +116,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
}
/// <returns>Reference to the operation</returns>
public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestStartStates;
@ -125,10 +125,10 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
}
/// <returns>null (not implemented)</returns>
public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
/// <returns>Reference to the operation</returns>
public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestEndStates;
@ -143,7 +143,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
}
/// <returns>Reference to the operation</returns>
public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi,
public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi,
double refEnergy, double energyErrLimLo, double energyErrLimHi)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");

6
TBF/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.cs
View File

@ -22,7 +22,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
/// <summary> Number of text boxes for serial numbers </summary>
public readonly int WaterMetersCount;
readonly IRegisterReader[] regReaders;
readonly IRegReader[] regReaders;
readonly bool[] disabled;
// To be retrieved after the form closes
@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
/// </summary>
/// <param name="waterMetersCount">Number of water meters</param>
/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
public TestStartEndForm(EntryFormCfg cfg, int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
public TestStartEndForm(EntryFormCfg cfg, int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
: this()
{
endStates = false;
@ -127,7 +127,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
public TestStartEndForm(EntryFormCfg cfg, int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, string[] energyStartStateStr,
public TestStartEndForm(EntryFormCfg cfg, int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, string[] energyStartStateStr,
bool[] disabled, double refVolume, double errLimLo, double errLimHi,
double refEnergy, double energyErrLimLo, double energyErrLimHi)
: this()

8
TBF/BenchControl/DataEntry/Munich3/EntryForm.cs
View File

@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
public bool UsesCameras() { return false; }
readonly EntryFormCfg entryFormCfg;
IRegisterReader[] regReaders;
IRegReader[] regReaders;
/// <summary>
/// Properties set by the Begin and the End form
@ -103,7 +103,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
}
/// <returns>Reference to the operation</returns>
public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestStartStates;
@ -112,10 +112,10 @@ namespace TBF.BenchControl.DataEntry.Munich3
}
/// <returns>null (not implemented)</returns>
public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
/// <returns>Reference to the operation</returns>
public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestEndStates;

6
TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.cs
View File

@ -19,7 +19,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
/// <summary> Number of water meters </summary>
public readonly int WaterMetersCount;
readonly IRegisterReader[] regReaders;
readonly IRegReader[] regReaders;
readonly bool[] disabled;
// To be retrieved after the form closes
@ -62,7 +62,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
/// Constructor to fill in start states
/// </summary>
/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
: this()
{
endStates = false;
@ -81,7 +81,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
/// Constructor to fill in end states
/// </summary>
/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
double refVolume, double errLimLo, double errLimHi)
: this()
{

8
TBF/BenchControl/DataEntry/Single/EntryFormNoStartEnd.cs
View File

@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Single
public bool UsesCameras() { return false; }
readonly EntryFormCfg entryFormCfg;
IRegisterReader[] regReaders;
IRegReader[] regReaders;
/// <summary>
/// Properties set by the Begin, End and WMStates form
@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Single
}
/// <returns>Reference to the operation</returns>
public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestStartStates;
@ -107,10 +107,10 @@ namespace TBF.BenchControl.DataEntry.Single
}
/// <returns>null (not implemented)</returns>
public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
/// <returns>Reference to the operation</returns>
public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestEndStates;

6
TBF/BenchControl/DataEntry/Single/TestStartEndForm.cs
View File

@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.Single
/// <summary> Number of text boxes for serial numbers </summary>
public readonly int WaterMetersCount;
readonly IRegisterReader[] regReaders;
readonly IRegReader[] regReaders;
readonly bool[] disabled;
// To be retrieved after the form closes
@ -91,7 +91,7 @@ namespace TBF.BenchControl.DataEntry.Single
/// </summary>
/// <param name="waterMetersCount">Number of water meters</param>
/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
public TestStartEndForm(int waterMetersCount, int lineSize, IRegisterReader[] regReaders, bool[] disabled)
public TestStartEndForm(int waterMetersCount, int lineSize, IRegReader[] regReaders, bool[] disabled)
: this(waterMetersCount, lineSize)
{
endStates = false;
@ -113,7 +113,7 @@ namespace TBF.BenchControl.DataEntry.Single
/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
public TestStartEndForm(int waterMetersCount, int lineSize, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
public TestStartEndForm(int waterMetersCount, int lineSize, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
double refVolume, double errLimLo, double errLimHi)
: this(waterMetersCount, lineSize)
{

8
TBF/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs
View File

@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
public bool UsesCameras() { return false; }
readonly EntryFormCfg entryFormCfg;
IRegisterReader[] regReaders;
IRegReader[] regReaders;
/// <summary>
/// Properties set by the Begin, End and WMStates form
@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
}
/// <returns>Reference to the operation</returns>
public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestStartStates;
@ -107,10 +107,10 @@ namespace TBF.BenchControl.DataEntry.Standard12
}
/// <returns>null (not implemented)</returns>
public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
/// <returns>Reference to the operation</returns>
public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestEndStates;

6
TBF/BenchControl/DataEntry/Standard12/TestStartEndForm.cs
View File

@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
/// <summary> Number of text boxes for serial numbers </summary>
public readonly int WaterMetersCount;
readonly IRegisterReader[] regReaders;
readonly IRegReader[] regReaders;
readonly bool[] disabled;
// To be retrieved after the form closes
@ -81,7 +81,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
/// </summary>
/// <param name="waterMetersCount">Number of water meters</param>
/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
: this()
{
endStates = false;
@ -105,7 +105,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
double refVolume, double errLimLo, double errLimHi)
: this()
{

8
TBF/BenchControl/DataEntry/Standard24/EntryFormNoStartEnd.cs
View File

@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
public bool UsesCameras() { return false; }
readonly EntryFormCfg entryFormCfg;
IRegisterReader[] regReaders;
IRegReader[] regReaders;
/// <summary>
/// Properties set by the Begin, End and WMStates form
@ -100,7 +100,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
}
/// <returns>Reference to the operation</returns>
public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
this.currentOp = CurrentOp.EnterTestStartStates;
@ -110,7 +110,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
}
/// <returns>Reference to the operation</returns>
public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isConditionOp = false)
public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isConditionOp = false)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
this.currentOp = CurrentOp.EnterAdvancedTestStartStates;
@ -121,7 +121,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
}
/// <returns>Reference to the operation</returns>
public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
this.currentOp = CurrentOp.EnterTestEndStates;

8
TBF/BenchControl/DataEntry/Standard24/TestStartEndForm.cs
View File

@ -29,7 +29,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
/// <summary> Number of text boxes for serial numbers </summary>
public readonly int WaterMetersCount;
readonly IRegisterReader[] regReaders;
readonly IRegReader[] regReaders;
readonly bool[] disabled;
// To be retrieved after the form closes
@ -110,7 +110,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
/// </summary>
/// <param name="waterMetersCount">Number of water meters</param>
/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
: this()
{
kind = Kind.Start;
@ -130,7 +130,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
/// </summary>
/// <param name="waterMetersCount">Number of water meters</param>
/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] wmEndStateStr, bool[] disabled)
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmEndStateStr, bool[] disabled)
: this()
{
kind = Kind.AdvancedStart;
@ -157,7 +157,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
double refVolume, double errLimLo, double errLimHi)
: this()
{

8
TBF/BenchControl/DataEntry/Standard48/EntryFormNoStartEnd.cs
View File

@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
public bool UsesCameras() { return false; }
readonly EntryFormCfg entryFormCfg;
IRegisterReader[] regReaders;
IRegReader[] regReaders;
/// <summary>
/// Properties set by the Begin, End and WMStates form
@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
}
/// <returns>Reference to the operation</returns>
public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestStartStates;
@ -107,10 +107,10 @@ namespace TBF.BenchControl.DataEntry.Standard48
}
/// <returns>null (not implemented)</returns>
public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
/// <returns>Reference to the operation</returns>
public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestEndStates;

6
TBF/BenchControl/DataEntry/Standard48/TestStartEndForm.cs
View File

@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
/// <summary> Number of text boxes for serial numbers </summary>
public readonly int WaterMetersCount;
readonly IRegisterReader[] regReaders;
readonly IRegReader[] regReaders;
readonly bool[] disabled;
// To be retrieved after the form closes
@ -106,7 +106,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
/// </summary>
/// <param name="waterMetersCount">Number of water meters</param>
/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
: this()
{
endStates = false;
@ -130,7 +130,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
double refVolume, double errLimLo, double errLimHi)
: this()
{

8
TBF/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs
View File

@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
public bool UsesCameras() { return false; }
readonly EntryFormCfg entryFormCfg;
IRegisterReader[] regReaders;
IRegReader[] regReaders;
/// <summary>
/// Properties set by the Begin, End and WMStates form
@ -94,7 +94,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
}
/// <returns>Reference to the operation</returns>
public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestStartStates;
@ -103,10 +103,10 @@ namespace TBF.BenchControl.DataEntry.Standard6
}
/// <returns>null (not implemented)</returns>
public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
/// <returns>Reference to the operation</returns>
public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestEndStates;

6
TBF/BenchControl/DataEntry/Standard6/TestStartEndForm.cs
View File

@ -19,7 +19,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
/// <summary> Number of water meters </summary>
public readonly int WaterMetersCount;
readonly IRegisterReader[] regReaders;
readonly IRegReader[] regReaders;
readonly bool[] disabled;
// To be retrieved after the form closes
@ -43,7 +43,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
/// Constructor to fill in start states
/// </summary>
/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
{
InitializeComponent();
ControlBox = false;
@ -63,7 +63,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
/// Constructor to fill in end states
/// </summary>
/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
double refVolume, double errLimLo, double errLimHi)
{
endStates = true;

10
TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs
View File

@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
readonly EntryFormCfg entryFormCfg;
IRegisterReader[] regReaders;
IRegReader[] regReaders;
public string[] StartImages
@ -148,7 +148,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
}
/// <returns>Reference to the operation</returns>
public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.TestStartStates;
@ -157,10 +157,10 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
}
/// <returns>null (not implemented)</returns>
public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
/// <returns>Reference to the operation</returns>
public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.TestEndStates;
@ -172,7 +172,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
}
/// <returns>Reference to the operation</returns>
public IOperation ShowDeferredTestEvalFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
public IOperation ShowDeferredTestEvalFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.DeferredTestEval;

8
TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs
View File

@ -40,7 +40,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
/// <summary> Number of text boxes for serial numbers </summary>
readonly Tst mode; /// Start, End or Deferred
public readonly int WaterMetersCount;
readonly IRegisterReader[] regReaders;
readonly IRegReader[] regReaders;
readonly bool[] disabled;
readonly string[] startImages;
readonly string[] endImages;
@ -136,7 +136,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
/// </summary>
/// <param name="waterMetersCount">Number of water meters</param>
/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] startImages, bool[] disabled)
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] startImages, bool[] disabled)
: this()
{
mode = Tst.Start;
@ -174,7 +174,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] endImages, double[] wmStartState, string[] wmStartStateStr, bool[] disabled,
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] endImages, double[] wmStartState, string[] wmStartStateStr, bool[] disabled,
double refVolume, double errLimLo, double errLimHi)
: this()
{
@ -210,7 +210,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
WMEndState = new double[waterMetersCount];
}
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] startImages, string[] endImages,
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] startImages, string[] endImages,
bool[] disabled, double refVolume, double errLimLo, double errLimHi)
: this()
{

8
TBF/BenchControl/DataEntry/iPerl/EntryForm.cs
View File

@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
public bool UsesCameras() { return false; }
readonly EntryFormCfg entryFormCfg;
IRegisterReader[] regReaders;
IRegReader[] regReaders;
/// <summary>
/// Properties set by the Begin, End and WMStates form
@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
}
/// <returns>Reference to the operation</returns>
public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestStartStates;
@ -107,10 +107,10 @@ namespace TBF.BenchControl.DataEntry.iPerl
}
/// <returns>null (not implemented)</returns>
public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
/// <returns>Reference to the operation</returns>
public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestEndStates;

6
TBF/BenchControl/DataEntry/iPerl/TestStartEndForm.cs
View File

@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
/// <summary> Number of text boxes for serial numbers </summary>
public readonly int WaterMetersCount;
readonly IRegisterReader[] regReaders;
readonly IRegReader[] regReaders;
readonly bool[] disabled;
// To be retrieved after the form closes
@ -89,7 +89,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
/// </summary>
/// <param name="waterMetersCount">Number of water meters</param>
/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
: this()
{
endStates = false;
@ -113,7 +113,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
double refVolume, double errLimLo, double errLimHi)
: this()
{

2
TBF/BenchControl/GenericDevices/IDataEntryForCamera.cs
View File

@ -20,6 +20,6 @@ namespace TBF.BenchControl.GenericDevices
/// Displays form at the end of the test to enter water meter start start.
/// </summary>
/// <returns>Operation to be used in the sequence</returns>
IOperation ShowDeferredTestEvalFormOp(IRegisterReader[] regReaders, double volumeRef, double errLimLo, double errLimHi);
IOperation ShowDeferredTestEvalFormOp(IRegReader[] regReaders, double volumeRef, double errLimLo, double errLimHi);
}
}

2
TBF/BenchControl/GenericDevices/IHasHeatMtrStatesForm.cs
View File

@ -19,7 +19,7 @@ namespace TBF.BenchControl.GenericDevices
/// Displays form at the end of the test to enter water meter start start.
/// </summary>
/// <returns>Operation to be used in the sequence</returns>
IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi,
IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi,
double refEnergy, double energyErrLimLo, double energyErrLimHi);
}
}

6
TBF/BenchControl/GenericDevices/IHasWMStatesForm.cs
View File

@ -27,18 +27,18 @@ namespace TBF.BenchControl.GenericDevices
/// Displays form at the beginning of the test to enter water meter start start.
/// </summary>
/// <returns>Operation to be used in the sequence</returns>
IOperation ShowTestStartFormOp(IRegisterReader[] regReaders);
IOperation ShowTestStartFormOp(IRegReader[] regReaders);
/// <summary>
/// Displays form at the beginning of the test to enter water meter start start.
/// </summary>
/// <returns>Operation to be used in the sequence</returns>
IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList<WaterMeter> waterMeters, bool isCondOp = false);
IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<WaterMeter> waterMeters, bool isCondOp = false);
/// <summary>
/// Displays form at the end of the test to enter water meter start start.
/// </summary>
/// <returns>Operation to be used in the sequence</returns>
IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double volumeRef, double errLimLo, double errLimHi);
IOperation ShowTestEndFormOp(IRegReader[] regReaders, double volumeRef, double errLimLo, double errLimHi);
}
}

4
TBF/BenchControl/GenericDevices/IRegisterReader.cs → TBF/BenchControl/GenericDevices/IRegReader.cs
View File

@ -1,12 +1,12 @@
///
/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
///
using TBF.BenchControl.Generic;
using TBF.Boxes;
namespace TBF.BenchControl.GenericDevices
{
public interface IRegisterReader : IComponent
public interface IRegReader : IComponent
{
Config.Entities.RegisterReaderType RegisterReaderType { get; }

2
TBF/BenchControl/GenericDevices/IDatastreamReader.cs → TBF/BenchControl/GenericDevices/IRegReaderDatastream.cs
View File

@ -5,7 +5,7 @@ using System;
namespace TBF.BenchControl.GenericDevices
{
interface IDatastreamReader : IRegisterReader
interface IRegReaderDatastream : IRegReader
{
bool NoSamples { get; }
double VolumeLtrStart { get; }

4
TBF/BenchControl/GenericDevices/IRoi.cs → TBF/BenchControl/GenericDevices/IRegReaderLiveCamera.cs
View File

@ -1,11 +1,11 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
/// Copyright (c) 2017-2020 Sensus Slovensko a.s.
///
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.GenericDevices
{
public interface IRoi : IComponent, IRoiForFixedStart
public interface IRegReaderLiveCamera : IRegReaderStillCamera
{
bool Detected { get; }
string ImageFileNamePrefix { get; } /// Either "detected.jpg" or string.Format("img{0}.jpg", nr) is appended

16
TBF/BenchControl/GenericDevices/IRegReaderPulses.cs Normal file
View File

@ -0,0 +1,16 @@
///
/// Copyright (c) 2020 Sensus Slovensko a.s.
///
namespace TBF.BenchControl.GenericDevices
{
interface IRegReaderPulses : IRegReader
{
int Position { get; }
int Filter { get; }
double PulsesPerLtr { get; } /// [imp/l] ... water meter or volume measurement part of a heat meter
double LtrsPerPulse { get; } /// [l/imp]
int WMPulses { get; } /// Counted pulses of the water meter
}
}

4
TBF/BenchControl/GenericDevices/IRoiForFixedStart.cs → TBF/BenchControl/GenericDevices/IRegReaderStillCamera.cs
View File

@ -1,11 +1,11 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
/// Copyright (c) 2017-2020 Sensus Slovensko a.s.
///
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.GenericDevices
{
public interface IRoiForFixedStart : IComponent, IRegisterReader
public interface IRegReaderStillCamera : IRegReader
{
GenericDevices.ICamera Camera { get; }

6
TBF/BenchControl/MetersPath.cs
View File

@ -10,14 +10,14 @@ namespace TBF.BenchControl
{
public int ItemNr;
public string Name;
public IRegisterReader[] RegisterReaders;
public IRegReader[] RegisterReaders;
/// Constructor from name, the rest is empty
public MetersPath(string name, int itemNr)
{
ItemNr = itemNr;
Name = name;
RegisterReaders = new IRegisterReader[Config.Data.WMsCount];
RegisterReaders = new IRegReader[Config.Data.WMsCount];
}
public MetersPath(Config.Entities.MetersPath entity, IList<BenchControl.Generic.IComponent> components)
@ -25,7 +25,7 @@ namespace TBF.BenchControl
{
for (int i = 0; i < Config.Data.WMsCount; i++)
{
RegisterReaders[i] = (IRegisterReader)TbfComponents.FindComponent(entity.GetSensor(i), components);
RegisterReaders[i] = (IRegReader)TbfComponents.FindComponent(entity.GetSensor(i), components);
}
}
}

2
TBF/BenchControl/Network/Camera/Roi/Roi.cs
View File

@ -10,7 +10,7 @@ using Config.Entities;
namespace TBF.BenchControl.Network.Camera.Roi
{
public class Roi : ComponentBase, GenericDevices.IRoi, IOperation
public class Roi : ComponentBase, GenericDevices.IRegReaderLiveCamera, IOperation
{
/// TODO: Implement support for sharing one camera by multiple ROI-s

2
TBF/BenchControl/Network/Camera/RoiForFixedStart/Roi.cs
View File

@ -9,7 +9,7 @@ using Config.Entities;
namespace TBF.BenchControl.Network.Camera.RoiForFixedStart
{
public class Roi : ComponentBase, GenericDevices.IRoiForFixedStart, IOperation
public class Roi : ComponentBase, GenericDevices.IRegReaderStillCamera, IOperation
{
/// TODO: Implement support for sharing one camera by multiple ROI-s

2
TBF/BenchControl/Operations/ReadMoreRegistersOp.cs
View File

@ -22,7 +22,7 @@ namespace TBF.BenchControl.Operations
/// </summary>
/// <param name="register">Register reader reference</param>
/// <param name="pulses">Reference to the water meter register state in pulses</param>
public ReadMoreRegistersOp(GenericDevices.IRegisterReader[] readers)
public ReadMoreRegistersOp(GenericDevices.IRegReader[] readers)
{
if (readers == null) throw new ArgumentNullException("readers");

2
TBF/BenchControl/Output/DB/SensusOracle/Database.cs
View File

@ -47,7 +47,7 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
///
/// iPerls to verify
///
GenericDevices.IRegisterReader[] iperlHeads;
GenericDevices.IRegReader[] iperlHeads;
/// <summary>
/// Start info is read into WaterMeter objects referenced by this array

10
TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryForm.cs
View File

@ -21,7 +21,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
KPackE.Radio.Radio radio; /// Reference to KPackE.Radio component
IRegisterReader[] regReaders;
IRegReader[] regReaders;
/// <summary>
/// Properties set by the Begin, End and WMStates form
@ -95,7 +95,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
}
/// <returns>Reference to the operation</returns>
public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestStartStates;
@ -104,10 +104,10 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
}
/// <returns>null (not implemented)</returns>
public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
/// <returns>Reference to the operation</returns>
public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.EnterTestEndStates;
@ -247,7 +247,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
}
void BindRegisterReadersToRadio(IList<Results.Entities.WaterMeter> wMeters, IRegisterReader[] rReaders, bool isEndOfTest)
void BindRegisterReadersToRadio(IList<Results.Entities.WaterMeter> wMeters, IRegReader[] rReaders, bool isEndOfTest)
{
radio.RegReaders.Clear();

6
TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/TestStartEndForm.cs
View File

@ -21,7 +21,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
/// <summary> Number of text boxes for serial numbers </summary>
public readonly int WaterMetersCount;
readonly IList<Results.Entities.WaterMeter> waterMeters;
readonly IRegisterReader[] regReaders;
readonly IRegReader[] regReaders;
readonly bool[] disabled;
// To be retrieved after the form closes
@ -107,7 +107,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
/// </summary>
/// <param name="waterMetersCount">Number of water meters</param>
/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
public TestStartEndForm(IList<Results.Entities.WaterMeter> waterMeters, IRegisterReader[] regReaders, bool[] disabled)
public TestStartEndForm(IList<Results.Entities.WaterMeter> waterMeters, IRegReader[] regReaders, bool[] disabled)
: this()
{
endStates = false;
@ -132,7 +132,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
public TestStartEndForm(IList<Results.Entities.WaterMeter> waterMeters, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
public TestStartEndForm(IList<Results.Entities.WaterMeter> waterMeters, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
double refVolume, double errLimLo, double errLimHi)
: this()
{

2
TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReader.cs
View File

@ -8,7 +8,7 @@ using TBF.Boxes;
namespace TBF.BenchControl.RegisterReaders.KPackE.RegisterReader
{
public class RegisterReader : ComponentBase, GenericDevices.IRegisterReader, IOperation
public class RegisterReader : ComponentBase, GenericDevices.IRegReader, IOperation
{
private static readonly ILog log = LogManager.GetLogger(typeof(RegisterReader));
public override string ToString() { return string.Format("KPackE.RegisterReader({0})", Cfg.ToString(1)); }

4
TBF/BenchControl/Elde/RegisterReader/Factory.cs → TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/Factory.cs
View File

@ -1,10 +1,10 @@
///
/// Copyright (c) 2013-2016 Sensus Metering Systems
/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Elde.RegisterReader
namespace TBF.BenchControl.RegisterReaders.PulsesFromEldeCB
{
public class Factory : IComponentFactory
{

4
TBF/BenchControl/Elde/RegisterReader/RRProcedureParams.cs → TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RRProcedureParams.cs
View File

@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
///
using System;
using System.IO;
@ -9,7 +9,7 @@ using Config.Entities;
using TBF.BenchControl.Generic;
using TBF.Resources;
namespace TBF.BenchControl.Elde.RegisterReader
namespace TBF.BenchControl.RegisterReaders.PulsesFromEldeCB
{
public class RRProcedureParams : ProcedureParamsBase, IParamsProvider, IProcedureParams
{

4
TBF/BenchControl/Elde/RegisterReader/RegisterReader.cs → TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReader.cs
View File

@ -7,9 +7,9 @@ using log4net;
using TBF.BenchControl.ControlBoard.Legacy;
using TBF.Boxes;
namespace TBF.BenchControl.Elde.RegisterReader
namespace TBF.BenchControl.RegisterReaders.PulsesFromEldeCB
{
public class RegisterReader : ComponentBase, GenericDevices.IRegisterReader, IOperation
public class RegisterReader : ComponentBase, GenericDevices.IRegReader, IOperation
{
private static readonly ILog log = LogManager.GetLogger(typeof(RegisterReader));
public override string ToString() { return string.Format("RegisterReader({0})", Cfg.ToString(1)); }

4
TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfg.cs → TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfg.cs
View File

@ -1,11 +1,11 @@
///
/// Copyright (c) 2013-2016 Sensus Metering Systems
/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
///
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Elde.RegisterReader
namespace TBF.BenchControl.RegisterReaders.PulsesFromEldeCB
{
public class RegisterReaderCfg : ComponentCfgBase, Generic.IChildComponentCfg
{

4
TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.Designer.cs → TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
///
namespace TBF.BenchControl.Elde.RegisterReader
namespace TBF.BenchControl.RegisterReaders.PulsesFromEldeCB
{
partial class RegisterReaderCfgCtrl
{

4
TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.cs → TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.cs
View File

@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
///
using System;
using System.Windows.Forms;
@ -7,7 +7,7 @@ using Config.Entities;
using TBF.BenchControl.Generic;
using TBF.UI.Bench.Components;
namespace TBF.BenchControl.Elde.RegisterReader
namespace TBF.BenchControl.RegisterReaders.PulsesFromEldeCB
{
public partial class RegisterReaderCfgCtrl : UserControl, IComponentCfgCtrl
{

0
TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.resx → TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.resx
View File

2
TBF/BenchControl/RegisterReaders/SerialStream/SerialStream.cs
View File

@ -13,7 +13,7 @@ namespace TBF.BenchControl.RegisterReaders.SerialStream
/// <summary>
/// This component = instance of this class is a placeholder for a combined main watermeter
/// </summary>
public class SerialStream : ComponentBase, IDevice, GenericDevices.IDatastreamReader, GenericDevices.IHasTestName, IOperation
public class SerialStream : ComponentBase, IDevice, GenericDevices.IRegReaderDatastream, GenericDevices.IHasTestName, IOperation
{
private static readonly ILog log = LogManager.GetLogger(typeof(SerialStream));
public override string ToString() { return string.Format("RegisterReaders.SerialStream({0})", Cfg.ToString(1)); }

2
TBF/BenchControl/RegisterReaders/StandingStartStop/RegisterReader.cs
View File

@ -8,7 +8,7 @@ using TBF.Boxes;
namespace TBF.BenchControl.RegisterReaders.StandingStartStop
{
public class RegisterReader : ComponentBase, GenericDevices.IRegisterReader, IOperation
public class RegisterReader : ComponentBase, GenericDevices.IRegReader, IOperation
{
private static readonly ILog log = LogManager.GetLogger(typeof(RegisterReader));
public override string ToString() { return string.Format("FixedStartRegisterReader({0})", Cfg.ToString(1)); }

6
TBF/BenchControl/Sequences/MainSeqUtils.cs
View File

@ -808,8 +808,8 @@ namespace TBF.BenchControl.Sequences
///
/// Wait until iPerl communications are completed
///
bool completed = !(modelessDlg is GenericDevices.IHasCompleted)
|| (modelessDlg as GenericDevices.IHasCompleted).Completed;
bool completed = !(modelessDlg is IHasCompleted)
|| (modelessDlg as IHasCompleted).Completed;
if (!completed)
{
State.Create("MainSeq : Wait until the entry form is closed")
@ -824,7 +824,7 @@ namespace TBF.BenchControl.Sequences
return Event.UiCmdStop;
}
completed = (modelessDlg as GenericDevices.IHasCompleted).Completed;
completed = (modelessDlg as IHasCompleted).Completed;
}
while (!completed);
}

4
TBF/BenchControl/Sequences/ProcessData.cs
View File

@ -50,7 +50,7 @@ namespace TBF.BenchControl.Sequences
/// RegisterReaders should never be null, RegisterReader.Length should be Config.Data.WMsCount
/// RegisterReader[i] where i = 0..Config.Data.WMsCount-1 may be null and should always be tested
///
RegisterReaders = new IRegisterReader[Config.Data.WMsCount];
RegisterReaders = new IRegReader[Config.Data.WMsCount];
IsQ2PreCorrectionCalculated = false;
CalculatedQ2PreCorrectionLR = 0;
CalculatedQ2PreCorrectionRL = 0;
@ -184,7 +184,7 @@ namespace TBF.BenchControl.Sequences
/// Process values.
/// These variables contain immediate values or values overwritten in each test.
///
public static IRegisterReader[] RegisterReaders;
public static IRegReader[] RegisterReaders;
///
public static FloatBox AmbTemp = new FloatBox() { Name = "Ambient Temperature", Format = "F1" }; /// [Celsius]
public static FloatBox AmbPress = new FloatBox() { Name = "Ambient Pressure", Format = "F0", Factor = 1000 }; /// [bar], printed by ToString() in [mbar]

8
TBF/BenchControl/Sequences/SequenceBase.cs
View File

@ -1535,7 +1535,7 @@ namespace TBF.BenchControl.Sequences
float errorPct = errorPctBase + 0.05f * i;
Results.Entities.MeterTestRslt meterRslt = ProcessData.BatchRslts.GetMeterTestRslt(fullTestName, i, CompoundMeterId.Single);
IRegisterReader regReader = sensPath.RegisterReaders[i];
IRegReader regReader = sensPath.RegisterReaders[i];
if (meterRslt != null && regReader != null)
{
@ -1656,7 +1656,7 @@ namespace TBF.BenchControl.Sequences
for (int isAux = 0; isAux <= 1; isAux++) /// 0=main, 1=aux
{
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[2 * i + isAux];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[2 * i + isAux];
Results.Entities.MeterTestRslt meterRslt = (isAux == 0) ? mainRslt : auxRslt;
if (meterRslt != null && regReader != null)
@ -1778,8 +1778,8 @@ namespace TBF.BenchControl.Sequences
Results.Entities.MeterTestRslt energyRslt = ProcessData.BatchRslts.GetMeterTestRslt(fullTestName, i, CompoundMeterId.HeatMeterEnergy);
Results.Entities.MeterTestRslt volumeRslt = ProcessData.BatchRslts.GetMeterTestRslt(fullTestName, i, CompoundMeterId.HeatMeterVolume);
GenericDevices.IRegisterReader volumeRegReader = (sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
GenericDevices.IRegisterReader energyRegReader = (sensPath.RegisterReaders.Length > 2 * i + 1) ? sensPath.RegisterReaders[2 * i + 1] : null;
GenericDevices.IRegReader volumeRegReader = (sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
GenericDevices.IRegReader energyRegReader = (sensPath.RegisterReaders.Length > 2 * i + 1) ? sensPath.RegisterReaders[2 * i + 1] : null;
double volumeMeter = tstRslt.TargetVolume() * (1.0 + 0.01 * errorPct);
double energyMeter = energy * (1.0 + 0.01 * errorPct);

2
TBF/BenchControl/TbfComponents.cs
View File

@ -178,7 +178,7 @@ namespace TBF.BenchControl
Factories.Add(new Danfoss.VLT2800.PumpFactory());
Factories.Add(new Elde.PumpWithFM.PumpFactory());
Factories.Add(new BuiltIn.PumpTandem.PumpFactory());
Factories.Add(new Elde.RegisterReader.Factory()); /// 'RegisterReader'
Factories.Add(new RegisterReaders.PulsesFromEldeCB.Factory()); /// 'RegisterReader'
Factories.Add(new RegisterReaders.StandingStartStop.RegisterReaderFactory()); /// 'RegisterReader for standing start/stop'
Factories.Add(new TestMethods.iPerlCommunication.iPerlHead.Factory()); /// 'RegisterReader for iPerl'
Factories.Add(new RegisterReaders.SerialStream.Factory()); /// 'RegisterReader for generic serial stream'

9
TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
View File

@ -7,6 +7,7 @@ using System.Text;
using log4net;
using Config.Entities;
using TBF.BenchControl;
using TBF.BenchControl.GenericDevices;
using TBF.Boxes;
using TBF.Resources;
using TBF.UiBridge;
@ -130,7 +131,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -321,10 +322,10 @@ namespace TBF.BenchControl.TestMethods.Adjustment
///
/// Find ROI-s
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
IList<GenericDevices.IRegReaderLiveCamera> rois = new List<GenericDevices.IRegReaderLiveCamera>();
foreach (var rr in sensPath.RegisterReaders)
{
GenericDevices.IRoi cameraRoI = rr as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoI = rr as GenericDevices.IRegReaderLiveCamera;
if ((cameraRoI != null) && cameraRoI.Detected)
{
rois.Add(cameraRoI);
@ -472,7 +473,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
if (meterRslt != null && regReader != null)
{

8
TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
View File

@ -125,7 +125,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -242,10 +242,10 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
///
/// Find ROI-s
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
IList<GenericDevices.IRegReaderLiveCamera> rois = new List<GenericDevices.IRegReaderLiveCamera>();
foreach (var rr in sensPath.RegisterReaders)
{
GenericDevices.IRoi cameraRoI = rr as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoI = rr as GenericDevices.IRegReaderLiveCamera;
if ((cameraRoI != null) && cameraRoI.Detected)
{
rois.Add(cameraRoI);
@ -776,7 +776,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
for (int isAux = 0; isAux <= 1; isAux++) /// 0=main, 1=aux
{
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[2 * i + isAux];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[2 * i + isAux];
Results.Entities.MeterTestRslt meterRslt = (isAux == 0) ? mainMeterRslt : auxMeterRslt;
if (meterRslt != null && regReader != null)

12
TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs
View File

@ -123,7 +123,7 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -361,10 +361,10 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
///
/// Find successfully detected ROI-s
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
IList<GenericDevices.IRegReaderLiveCamera> rois = new List<GenericDevices.IRegReaderLiveCamera>();
foreach (var rr in sensPath.RegisterReaders)
{
GenericDevices.IRoi cameraRoI = rr as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoI = rr as GenericDevices.IRegReaderLiveCamera;
if ((cameraRoI != null) && cameraRoI.Detected)
{
rois.Add(cameraRoI);
@ -791,10 +791,10 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
/// MetersKind.Single meters
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IDatastreamReader dstrReader = regReader as GenericDevices.IDatastreamReader;
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReaderDatastream dstrReader = regReader as GenericDevices.IRegReaderDatastream;
TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = regReader as TestMethods.iPerlCommunication.iPerlHead.IperlHead;
GenericDevices.IRoi cameraRoi = regReader as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoi = regReader as GenericDevices.IRegReaderLiveCamera;
if (meterRslt != null && regReader != null)
{

11
TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Text;
using log4net;
using TBF.BenchControl;
using TBF.BenchControl.GenericDevices;
using TBF.Boxes;
using TBF.Resources;
using TBF.UiBridge;
@ -100,7 +101,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -258,10 +259,10 @@ namespace TBF.BenchControl.TestMethods.Endurance
///
/// Find ROI-s
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
IList<GenericDevices.IRegReaderLiveCamera> rois = new List<GenericDevices.IRegReaderLiveCamera>();
foreach (var rr in sensPath.RegisterReaders)
{
GenericDevices.IRoi cameraRoI = rr as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoI = rr as GenericDevices.IRegReaderLiveCamera;
if ((cameraRoI != null) && cameraRoI.Detected)
{
rois.Add(cameraRoI);
@ -433,8 +434,8 @@ namespace TBF.BenchControl.TestMethods.Endurance
if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IDatastreamReader dstrReader = regReader as GenericDevices.IDatastreamReader;
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReaderDatastream dstrReader = regReader as GenericDevices.IRegReaderDatastream;
TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = regReader as TestMethods.iPerlCommunication.iPerlHead.IperlHead;
if (meterRslt != null && regReader != null)

22
TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs
View File

@ -99,7 +99,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -430,7 +430,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
.AddOperations(readTempPressOps);
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -486,7 +486,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
{
for (int i = 0; i < Config.Data.WMsCount; i++)
{
GenericDevices.IRegisterReader rr = sensPath.RegisterReaders[i];
GenericDevices.IRegReader rr = sensPath.RegisterReaders[i];
if (rr is BenchControl.RegisterReaders.StandingStartStop.RegisterReader)
(rr as BenchControl.RegisterReaders.StandingStartStop.RegisterReader).BeginWMState = dataEntryCmpnt.WMStartState(i);
@ -501,7 +501,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
/// SaveImages==true ... copy images to the directory that will be archived at the end of the cycle
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string srcDir = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -701,7 +701,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -769,7 +769,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
{
for (int i = 0; i < Config.Data.WMsCount; i++)
{
GenericDevices.IRegisterReader rr = sensPath.RegisterReaders[i];
GenericDevices.IRegReader rr = sensPath.RegisterReaders[i];
if (rr is BenchControl.RegisterReaders.StandingStartStop.RegisterReader)
(rr as BenchControl.RegisterReaders.StandingStartStop.RegisterReader).EndWMState = dataEntryCmpnt.WMEndState(i);
@ -784,7 +784,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
/// SaveImages==true ... copy images to the directory that will be archived at the end of the cycle
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string srcDir = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -874,7 +874,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
for (int isAux = 0; isAux <= 1; isAux++) /// 0=main, 1=aux
{
Results.Entities.MeterTestRslt meterRslt = (isAux == 0) ? mainMeterRslt : auxMeterRslt;
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[2 * i + isAux];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[2 * i + isAux];
if (meterRslt != null && regReader != null)
{
@ -934,10 +934,10 @@ namespace TBF.BenchControl.TestMethods.FixedStart
Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
GenericDevices.IRegisterReader volumeRegReader =
GenericDevices.IRegReader volumeRegReader =
(sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
GenericDevices.IRegisterReader energyRegReader =
GenericDevices.IRegReader energyRegReader =
(sensPath.RegisterReaders.Length > 2 * i + 1) ? sensPath.RegisterReaders[2 * i + 1] : null;
if (volumeRslt != null && volumeRegReader != null)
@ -989,7 +989,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
if (meterRslt != null && regReader != null)
{

8
TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
View File

@ -107,7 +107,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -308,10 +308,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
///
/// Find ROI-s
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
IList<GenericDevices.IRegReaderLiveCamera> rois = new List<GenericDevices.IRegReaderLiveCamera>();
foreach (var rr in sensPath.RegisterReaders)
{
GenericDevices.IRoi cameraRoI = rr as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoI = rr as GenericDevices.IRegReaderLiveCamera;
if ((cameraRoI != null) && cameraRoI.Detected)
{
rois.Add(cameraRoI);
@ -647,7 +647,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
if (meterRslt != null && regReader != null)
{

22
TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs
View File

@ -117,7 +117,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -460,7 +460,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -487,7 +487,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
/// SaveImages==true ... copy images to the directory that will be archived at the end of the cycle
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string srcDir = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -512,7 +512,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
{
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -529,7 +529,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
/// SaveImages==true ... copy images to the directory that will be archived at the end of the cycle
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string srcDir = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -742,7 +742,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -766,7 +766,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
{
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -784,7 +784,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
/// SaveImages==true ... copy images to the directory that will be archived at the end of the cycle
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string srcDir = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -938,7 +938,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
/// Update register reader star and end-volumes from data entry forms
for (int i = 0; i < Config.Data.WMsCount; i++)
{
GenericDevices.IRegisterReader r = sensPath.RegisterReaders[i];
GenericDevices.IRegReader r = sensPath.RegisterReaders[i];
BenchControl.Network.Camera.RoiForFixedStart.Roi rr = r as BenchControl.Network.Camera.RoiForFixedStart.Roi;
if (rr != null)
@ -964,7 +964,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
for (int isAux = 0; isAux <= 1; isAux++) /// 0=main, 1=aux
{
Results.Entities.MeterTestRslt meterRslt = (isAux == 0) ? mainMeterRslt : auxMeterRslt;
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[2 * i + isAux];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[2 * i + isAux];
if (meterRslt != null && regReader != null)
{
@ -1009,7 +1009,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
if (meterRslt != null && regReader != null)
{

22
TBF/BenchControl/TestMethods/FixedStartMassCollAdvanced/FixedStartMassCollAdvancedSeq.cs
View File

@ -117,7 +117,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -314,7 +314,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -375,7 +375,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced
{
for (int i = 0; i < Config.Data.WMsCount; i++)
{
GenericDevices.IRegisterReader rr = sensPath.RegisterReaders[i];
GenericDevices.IRegReader rr = sensPath.RegisterReaders[i];
if (rr is BenchControl.RegisterReaders.StandingStartStop.RegisterReader)
(rr as BenchControl.RegisterReaders.StandingStartStop.RegisterReader).BeginWMState = dataEntryCmpnt.WMStartState(i);
@ -390,7 +390,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced
/// SaveImages==true ... copy images to the directory that will be archived at the end of the cycle
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string srcDir = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -725,7 +725,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced
.AddOperation(checkUiOp);
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -793,7 +793,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced
{
for (int i = 0; i < Config.Data.WMsCount; i++)
{
GenericDevices.IRegisterReader rr = sensPath.RegisterReaders[i];
GenericDevices.IRegReader rr = sensPath.RegisterReaders[i];
if (rr is BenchControl.RegisterReaders.StandingStartStop.RegisterReader)
(rr as BenchControl.RegisterReaders.StandingStartStop.RegisterReader).EndWMState = dataEntryCmpnt.WMEndState(i);
@ -808,7 +808,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced
/// SaveImages==true ... copy images to the directory that will be archived at the end of the cycle
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string srcDir = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -913,7 +913,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced
for (int isAux = 0; isAux <= 1; isAux++) /// 0=main, 1=aux
{
Results.Entities.MeterTestRslt meterRslt = (isAux == 0) ? mainMeterRslt : auxMeterRslt;
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[2 * i + isAux];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[2 * i + isAux];
if (meterRslt != null && regReader != null)
{
@ -973,10 +973,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced
Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
GenericDevices.IRegisterReader volumeRegReader =
GenericDevices.IRegReader volumeRegReader =
(sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
GenericDevices.IRegisterReader energyRegReader =
GenericDevices.IRegReader energyRegReader =
(sensPath.RegisterReaders.Length > 2 * i + 1) ? sensPath.RegisterReaders[2 * i + 1] : null;
if (volumeRslt != null && volumeRegReader != null)
@ -1028,7 +1028,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced
if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
if (meterRslt != null && regReader != null)
{

22
TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
View File

@ -141,7 +141,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if (eldeRR != null && eldeRR.Position >= 1 && eldeRR.Position <= 8)
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -571,7 +571,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -598,7 +598,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
/// SaveImages==true ... copy images to the directory that will be archived at the end of the cycle
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string srcDir = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -623,7 +623,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
{
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -640,7 +640,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
/// SaveImages==true ... copy images to the directory that will be archived at the end of the cycle
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string srcDir = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -894,7 +894,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -918,7 +918,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
{
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -936,7 +936,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
/// SaveImages==true ... copy images to the directory that will be archived at the end of the cycle
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string srcDir = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -1090,7 +1090,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
/// Update register reader star and end-volumes from data entry forms
for (int i = 0; i < Config.Data.WMsCount; i++)
{
GenericDevices.IRegisterReader r = sensPath.RegisterReaders[i];
GenericDevices.IRegReader r = sensPath.RegisterReaders[i];
BenchControl.Network.Camera.RoiForFixedStart.Roi rr = r as BenchControl.Network.Camera.RoiForFixedStart.Roi;
if (rr != null)
@ -1116,7 +1116,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
for (int isAux = 0; isAux <= 1; isAux++) /// 0=main, 1=aux
{
Results.Entities.MeterTestRslt meterRslt = (isAux == 0) ? mainMeterRslt : auxMeterRslt;
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[2 * i + isAux];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[2 * i + isAux];
if (meterRslt != null && regReader != null)
{
@ -1161,7 +1161,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
if (meterRslt != null && regReader != null)
{

22
TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
View File

@ -117,7 +117,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -552,7 +552,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -609,7 +609,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
{
for (int i = 0; i < Config.Data.WMsCount; i++)
{
GenericDevices.IRegisterReader rr = sensPath.RegisterReaders[i];
GenericDevices.IRegReader rr = sensPath.RegisterReaders[i];
if (rr is BenchControl.RegisterReaders.StandingStartStop.RegisterReader)
(rr as BenchControl.RegisterReaders.StandingStartStop.RegisterReader).BeginWMState = dataEntryCmpnt.WMStartState(i);
@ -624,7 +624,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
/// SaveImages==true ... copy images to the directory that will be archived at the end of the cycle
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string srcDir = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -887,7 +887,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
.AddOperation(checkUiOp);
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -955,7 +955,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
{
for (int i = 0; i < Config.Data.WMsCount; i++)
{
GenericDevices.IRegisterReader rr = sensPath.RegisterReaders[i];
GenericDevices.IRegReader rr = sensPath.RegisterReaders[i];
if (rr is BenchControl.RegisterReaders.StandingStartStop.RegisterReader)
(rr as BenchControl.RegisterReaders.StandingStartStop.RegisterReader).EndWMState = dataEntryCmpnt.WMEndState(i);
@ -970,7 +970,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
/// SaveImages==true ... copy images to the directory that will be archived at the end of the cycle
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string srcDir = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -1075,7 +1075,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
for (int isAux = 0; isAux <= 1; isAux++) /// 0=main, 1=aux
{
Results.Entities.MeterTestRslt meterRslt = (isAux == 0) ? mainMeterRslt : auxMeterRslt;
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[2 * i + isAux];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[2 * i + isAux];
if (meterRslt != null && regReader != null)
{
@ -1135,10 +1135,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
GenericDevices.IRegisterReader volumeRegReader =
GenericDevices.IRegReader volumeRegReader =
(sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
GenericDevices.IRegisterReader energyRegReader =
GenericDevices.IRegReader energyRegReader =
(sensPath.RegisterReaders.Length > 2 * i + 1) ? sensPath.RegisterReaders[2 * i + 1] : null;
if (volumeRslt != null && volumeRegReader != null)
@ -1190,7 +1190,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
if (meterRslt != null && regReader != null)
{

18
TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
View File

@ -122,7 +122,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if (eldeRR != null && eldeRR.Position >= 1 && eldeRR.Position <= 8)
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -401,7 +401,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -439,7 +439,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
for (int i = 0; i < Config.Data.WMsCount; i++)
{
GenericDevices.IRegisterReader rr = sensPath.RegisterReaders[i];
GenericDevices.IRegReader rr = sensPath.RegisterReaders[i];
if (rr is BenchControl.RegisterReaders.StandingStartStop.RegisterReader)
(rr as BenchControl.RegisterReaders.StandingStartStop.RegisterReader).BeginWMState = dataEntryCmpnt.WMStartState(i);
@ -453,7 +453,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
/// SaveImages==true ... copy images to the directory that will be archived at the end of the cycle
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string srcDir = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -659,7 +659,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -698,7 +698,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
for (int i = 0; i < Config.Data.WMsCount; i++)
{
GenericDevices.IRegisterReader rr = sensPath.RegisterReaders[i];
GenericDevices.IRegReader rr = sensPath.RegisterReaders[i];
if (rr is BenchControl.RegisterReaders.StandingStartStop.RegisterReader)
(rr as BenchControl.RegisterReaders.StandingStartStop.RegisterReader).EndWMState = dataEntryCmpnt.WMEndState(i);
@ -712,7 +712,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
/// SaveImages==true ... copy images to the directory that will be archived at the end of the cycle
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string srcDir = Path.Combine(Program.TempImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i + 1).ToString());
@ -803,7 +803,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
for (int isAux = 0; isAux <= 1; isAux++) /// 0=main, 1=aux
{
Results.Entities.MeterTestRslt meterRslt = (isAux == 0) ? mainMeterRslt : auxMeterRslt;
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[2 * i + isAux];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[2 * i + isAux];
if (meterRslt != null && regReader != null)
{
@ -848,7 +848,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
if (meterRslt != null && regReader != null)
{

3
TBF/BenchControl/TestMethods/FlowAdjustment/FlowAdjustmentSeq.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Text;
using log4net;
using TBF.BenchControl;
using TBF.BenchControl.GenericDevices;
using TBF.Boxes;
using TBF.Resources;
using TBF.UiBridge;
@ -105,7 +106,7 @@ namespace TBF.BenchControl.TestMethods.FlowAdjustment
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;

17
TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Text;
using log4net;
using TBF.BenchControl;
using TBF.BenchControl.GenericDevices;
using TBF.Boxes;
using TBF.Resources;
using TBF.UiBridge;
@ -107,7 +108,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -351,10 +352,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
///
/// Find ROI-s
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
IList<GenericDevices.IRegReaderLiveCamera> rois = new List<GenericDevices.IRegReaderLiveCamera>();
foreach (var rr in sensPath.RegisterReaders)
{
GenericDevices.IRoi cameraRoI = rr as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoI = rr as GenericDevices.IRegReaderLiveCamera;
if ((cameraRoI != null) && cameraRoI.Detected)
{
rois.Add(cameraRoI);
@ -566,10 +567,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
BenchControl.GenericDevices.IRegisterReader volumeRegReader =
BenchControl.GenericDevices.IRegReader volumeRegReader =
(sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
BenchControl.GenericDevices.IRegisterReader energyRegReader =
BenchControl.GenericDevices.IRegReader energyRegReader =
(sensPath.RegisterReaders.Length > 2 * i + 1) ? sensPath.RegisterReaders[2 * i + 1] : null;
if (volumeRslt != null && volumeRegReader != null)
@ -622,10 +623,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IDatastreamReader dstrReader = regReader as GenericDevices.IDatastreamReader;
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReaderDatastream dstrReader = regReader as GenericDevices.IRegReaderDatastream;
TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = regReader as TestMethods.iPerlCommunication.iPerlHead.IperlHead;
GenericDevices.IRoi cameraRoi = regReader as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoi = regReader as GenericDevices.IRegReaderLiveCamera;
if (meterRslt != null && regReader != null)
{

18
TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
View File

@ -138,7 +138,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -450,10 +450,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
///
/// Find successfully detected ROI-s
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
IList<GenericDevices.IRegReaderLiveCamera> rois = new List<GenericDevices.IRegReaderLiveCamera>();
foreach (var rr in sensPath.RegisterReaders)
{
GenericDevices.IRoi cameraRoI = rr as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoI = rr as GenericDevices.IRegReaderLiveCamera;
if ((cameraRoI != null) && cameraRoI.Detected)
{
rois.Add(cameraRoI);
@ -887,7 +887,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
for (int isAux = 0; isAux <= 1; isAux++) /// 0=main, 1=aux
{
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[2 * i + isAux];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[2 * i + isAux];
Results.Entities.MeterTestRslt meterRslt = (isAux == 0) ? mainMeterRslt : auxMeterRslt;
if (meterRslt != null && regReader != null)
@ -957,10 +957,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
BenchControl.GenericDevices.IRegisterReader volumeRegReader =
BenchControl.GenericDevices.IRegReader volumeRegReader =
(sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
BenchControl.GenericDevices.IRegisterReader energyRegReader =
BenchControl.GenericDevices.IRegReader energyRegReader =
(sensPath.RegisterReaders.Length > 2 * i + 1) ? sensPath.RegisterReaders[2 * i + 1] : null;
if (volumeRslt != null && volumeRegReader != null)
@ -1013,10 +1013,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IDatastreamReader dstrReader = regReader as GenericDevices.IDatastreamReader;
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReaderDatastream dstrReader = regReader as GenericDevices.IRegReaderDatastream;
TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = regReader as TestMethods.iPerlCommunication.iPerlHead.IperlHead;
GenericDevices.IRoi cameraRoi = regReader as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoi = regReader as GenericDevices.IRegReaderLiveCamera;
if (meterRslt != null && regReader != null)
{

18
TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs
View File

@ -158,7 +158,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -463,10 +463,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
///
/// Find successfully detected ROI-s
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
IList<GenericDevices.IRegReaderLiveCamera> rois = new List<GenericDevices.IRegReaderLiveCamera>();
foreach (var rr in sensPath.RegisterReaders)
{
GenericDevices.IRoi cameraRoI = rr as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoI = rr as GenericDevices.IRegReaderLiveCamera;
if ((cameraRoI != null) && cameraRoI.Detected)
{
rois.Add(cameraRoI);
@ -971,7 +971,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
for (int isAux = 0; isAux <= 1; isAux++) /// 0=main, 1=aux
{
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[2 * i + isAux];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[2 * i + isAux];
Results.Entities.MeterTestRslt meterRslt = (isAux == 0) ? mainMeterRslt : auxMeterRslt;
if (meterRslt != null && regReader != null)
@ -1041,10 +1041,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
BenchControl.GenericDevices.IRegisterReader volumeRegReader =
BenchControl.GenericDevices.IRegReader volumeRegReader =
(sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
BenchControl.GenericDevices.IRegisterReader energyRegReader =
BenchControl.GenericDevices.IRegReader energyRegReader =
(sensPath.RegisterReaders.Length > 2 * i + 1) ? sensPath.RegisterReaders[2 * i + 1] : null;
if (volumeRslt != null && volumeRegReader != null)
@ -1098,10 +1098,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
/// MetersKind.Single meters
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IDatastreamReader dstrReader = regReader as GenericDevices.IDatastreamReader;
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReaderDatastream dstrReader = regReader as GenericDevices.IRegReaderDatastream;
TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = regReader as TestMethods.iPerlCommunication.iPerlHead.IperlHead;
GenericDevices.IRoi cameraRoi = regReader as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoi = regReader as GenericDevices.IRegReaderLiveCamera;
if (meterRslt != null && regReader != null)
{

18
TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
View File

@ -135,7 +135,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -443,10 +443,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
///
/// Find successfully detected ROI-s
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
IList<GenericDevices.IRegReaderLiveCamera> rois = new List<GenericDevices.IRegReaderLiveCamera>();
foreach (var rr in sensPath.RegisterReaders)
{
GenericDevices.IRoi cameraRoI = rr as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoI = rr as GenericDevices.IRegReaderLiveCamera;
if ((cameraRoI != null) && cameraRoI.Detected)
{
rois.Add(cameraRoI);
@ -911,7 +911,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
for (int isAux = 0; isAux <= 1; isAux++) /// 0=main, 1=aux
{
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[2 * i + isAux];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[2 * i + isAux];
Results.Entities.MeterTestRslt meterRslt = (isAux == 0) ? mainMeterRslt : auxMeterRslt;
if (meterRslt != null && regReader != null)
@ -981,10 +981,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
BenchControl.GenericDevices.IRegisterReader volumeRegReader =
BenchControl.GenericDevices.IRegReader volumeRegReader =
(sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
BenchControl.GenericDevices.IRegisterReader energyRegReader =
BenchControl.GenericDevices.IRegReader energyRegReader =
(sensPath.RegisterReaders.Length > 2 * i + 1) ? sensPath.RegisterReaders[2 * i + 1] : null;
if (volumeRslt != null && volumeRegReader != null)
@ -1038,10 +1038,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
/// MetersKind.Single meters
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IDatastreamReader dstrReader = regReader as GenericDevices.IDatastreamReader;
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReaderDatastream dstrReader = regReader as GenericDevices.IRegReaderDatastream;
TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = regReader as TestMethods.iPerlCommunication.iPerlHead.IperlHead;
GenericDevices.IRoi cameraRoi = regReader as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoi = regReader as GenericDevices.IRegReaderLiveCamera;
if (meterRslt != null && regReader != null)
{

18
TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
View File

@ -134,7 +134,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -439,10 +439,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
///
/// Find successfully detected ROI-s
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
IList<GenericDevices.IRegReaderLiveCamera> rois = new List<GenericDevices.IRegReaderLiveCamera>();
foreach (var rr in sensPath.RegisterReaders)
{
GenericDevices.IRoi cameraRoI = rr as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoI = rr as GenericDevices.IRegReaderLiveCamera;
if ((cameraRoI != null) && cameraRoI.Detected)
{
rois.Add(cameraRoI);
@ -839,7 +839,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
for (int isAux = 0; isAux <= 1; isAux++) /// 0=main, 1=aux
{
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[2 * i + isAux];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[2 * i + isAux];
Results.Entities.MeterTestRslt meterRslt = (isAux == 0) ? mainMeterRslt : auxMeterRslt;
if (meterRslt != null && regReader != null)
@ -909,10 +909,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
BenchControl.GenericDevices.IRegisterReader volumeRegReader =
BenchControl.GenericDevices.IRegReader volumeRegReader =
(sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
BenchControl.GenericDevices.IRegisterReader energyRegReader =
BenchControl.GenericDevices.IRegReader energyRegReader =
(sensPath.RegisterReaders.Length > 2 * i + 1) ? sensPath.RegisterReaders[2 * i + 1] : null;
if (volumeRslt != null && volumeRegReader != null)
@ -966,10 +966,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
/// MetersKind.Single meters
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IDatastreamReader dstrReader = regReader as GenericDevices.IDatastreamReader;
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReaderDatastream dstrReader = regReader as GenericDevices.IRegReaderDatastream;
TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = regReader as TestMethods.iPerlCommunication.iPerlHead.IperlHead;
GenericDevices.IRoi cameraRoi = regReader as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoi = regReader as GenericDevices.IRegReaderLiveCamera;
if (meterRslt != null && regReader != null)
{

14
TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs
View File

@ -141,7 +141,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -343,10 +343,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
///
/// Find successfully detected ROI-s
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
IList<GenericDevices.IRegReaderLiveCamera> rois = new List<GenericDevices.IRegReaderLiveCamera>();
foreach (var rr in sensPath.RegisterReaders)
{
GenericDevices.IRoi cameraRoI = rr as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoI = rr as GenericDevices.IRegReaderLiveCamera;
if ((cameraRoI != null) && cameraRoI.Detected)
{
rois.Add(cameraRoI);
@ -608,7 +608,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
for (int isAux = 0; isAux <= 1; isAux++) /// 0=main, 1=aux
{
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[2 * i + isAux];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[2 * i + isAux];
Results.Entities.MeterTestRslt meterRslt = (isAux == 0) ? mainMeterRslt : auxMeterRslt;
if (meterRslt != null && regReader != null)
@ -664,10 +664,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
/// MetersKind.Single meters
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IDatastreamReader dstrReader = regReader as GenericDevices.IDatastreamReader;
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReaderDatastream dstrReader = regReader as GenericDevices.IRegReaderDatastream;
TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = regReader as TestMethods.iPerlCommunication.iPerlHead.IperlHead;
GenericDevices.IRoi cameraRoi = regReader as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoi = regReader as GenericDevices.IRegReaderLiveCamera;
if (meterRslt != null && regReader != null)
{

2
TBF/BenchControl/TestMethods/GrabImage/GrabImageSeq.cs
View File

@ -32,7 +32,7 @@ namespace TBF.BenchControl.TestMethods.GrabImage
.AddOperation(checkUiOp);
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoiForFixedStart roi = sensPath.RegisterReaders[i] as GenericDevices.IRoiForFixedStart;
GenericDevices.IRegReaderStillCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderStillCamera;
if (roi != null)
{
string directory = Path.Combine(Program.ImagesDir, BatchRslts.Batch.BatchNr.ToString(), (i+1).ToString());

4
TBF/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs
View File

@ -26,9 +26,9 @@ namespace TBF.BenchControl.TestMethods.LiveStream
foreach (var rr in sensPath.RegisterReaders)
{
if (rr is GenericDevices.IRoiForFixedStart)
if (rr is GenericDevices.IRegReaderStillCamera)
{
GenericDevices.ICamera camera = (rr as GenericDevices.IRoiForFixedStart).Camera;
GenericDevices.ICamera camera = (rr as GenericDevices.IRegReaderStillCamera).Camera;
if (!cameras.Contains(camera))
{
cameras.Add(camera);

9
TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
View File

@ -7,6 +7,7 @@ using System.Text;
using log4net;
using Config.Entities;
using TBF.BenchControl;
using TBF.BenchControl.GenericDevices;
using TBF.Boxes;
using TBF.Resources;
using TBF.UiBridge;
@ -92,7 +93,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -283,10 +284,10 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
///
/// Find ROI-s
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
IList<GenericDevices.IRegReaderLiveCamera> rois = new List<GenericDevices.IRegReaderLiveCamera>();
foreach (var rr in sensPath.RegisterReaders)
{
GenericDevices.IRoi cameraRoI = rr as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoI = rr as GenericDevices.IRegReaderLiveCamera;
if ((cameraRoI != null) && cameraRoI.Detected)
{
rois.Add(cameraRoI);
@ -432,7 +433,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
if (meterRslt != null && regReader != null)
{

9
TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
View File

@ -7,6 +7,7 @@ using System.Text;
using log4net;
using Config.Entities;
using TBF.BenchControl;
using TBF.BenchControl.GenericDevices;
using TBF.Boxes;
using TBF.Resources;
using TBF.UiBridge;
@ -93,7 +94,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -285,10 +286,10 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
///
/// Find ROI-s
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
IList<GenericDevices.IRegReaderLiveCamera> rois = new List<GenericDevices.IRegReaderLiveCamera>();
foreach (var rr in sensPath.RegisterReaders)
{
GenericDevices.IRoi cameraRoI = rr as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoI = rr as GenericDevices.IRegReaderLiveCamera;
if ((cameraRoI != null) && cameraRoI.Detected)
{
rois.Add(cameraRoI);
@ -434,7 +435,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
if (meterRslt != null && regReader != null)
{

9
TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Text;
using log4net;
using Config.Entities;
using TBF.BenchControl.GenericDevices;
using TBF.Resources;
using TBF.UiBridge;
using System.IO;
@ -33,7 +34,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -175,7 +176,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoi roi = sensPath.RegisterReaders[i] as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderLiveCamera;
if (roi != null)
{
roi.ClearRoi();
@ -198,7 +199,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{
GenericDevices.IRoi roi = sensPath.RegisterReaders[i] as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderLiveCamera;
if (roi != null && !roi.Detected)
{
detection.AddOperation(roi.RoiDetectionOp());
@ -251,7 +252,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
{
for (int i = 0; i < display.SelectedImages.Length; i++)
{
GenericDevices.IRoi roi = sensPath.RegisterReaders[i] as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera roi = sensPath.RegisterReaders[i] as GenericDevices.IRegReaderLiveCamera;
if (roi != null && display.SelectedImages[i])
{
roi.ClearRoi();

9
TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Text;
using log4net;
using TBF.BenchControl;
using TBF.BenchControl.GenericDevices;
using TBF.Resources;
using TBF.UiBridge;
@ -72,7 +73,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@ -153,10 +154,10 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest
///
/// Find ROI-s
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
IList<GenericDevices.IRegReaderLiveCamera> rois = new List<GenericDevices.IRegReaderLiveCamera>();
foreach (var rr in sensPath.RegisterReaders)
{
GenericDevices.IRoi cameraRoI = rr as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoI = rr as GenericDevices.IRegReaderLiveCamera;
if ((cameraRoI != null) && cameraRoI.Detected)
{
rois.Add(cameraRoI);
@ -502,7 +503,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest
{
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
if (meterRslt != null && regReader != null)
{

2
TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
View File

@ -14,7 +14,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead
/// <summary>
/// This component = instance of this class is a placeholder for a combined main watermeter
/// </summary>
public class IperlHead : ComponentBase, IDevice, GenericDevices.IDatastreamReader, GenericDevices.IHasTestName, IOperation
public class IperlHead : ComponentBase, IDevice, GenericDevices.IRegReaderDatastream, GenericDevices.IHasTestName, IOperation
{
private static readonly ILog log = LogManager.GetLogger(typeof(IperlHead));
public override string ToString() { return string.Format("iPerl({0})", Cfg.ToString(1)); }

35
TBF/TBF.csproj
View File

@ -663,6 +663,7 @@
<Compile Include="BenchControl\GenericDevices\IHasCalendarEvents.cs" />
<Compile Include="BenchControl\GenericDevices\IParallelOutput.cs" />
<Compile Include="BenchControl\GenericDevices\IReceivesDataFromRadio.cs" />
<Compile Include="BenchControl\GenericDevices\IRegReaderPulses.cs" />
<Compile Include="BenchControl\GenericDevices\IResultsProcessor.cs" />
<Compile Include="BenchControl\GenericDevices\IStartInfoReader.cs" />
<Compile Include="BenchControl\GenericDevices\IHart.cs" />
@ -672,7 +673,7 @@
<Compile Include="BenchControl\GenericDevices\IErrorFlags.cs" />
<Compile Include="BenchControl\GenericDevices\ILevelMeter.cs" />
<Compile Include="BenchControl\GenericDevices\IPlotter.cs" />
<Compile Include="BenchControl\GenericDevices\IRoiForFixedStart.cs" />
<Compile Include="BenchControl\GenericDevices\IRegReaderStillCamera.cs" />
<Compile Include="BenchControl\GenericDevices\IScaleCfg.cs" />
<Compile Include="BenchControl\GenericDevices\ICalibRangesCfg.cs" />
<Compile Include="BenchControl\GenericDevices\IHasHeatMtrStatesForm.cs" />
@ -682,7 +683,7 @@
<Compile Include="BenchControl\GenericDevices\IScaleOrTank.cs" />
<Compile Include="BenchControl\GenericDevices\ISequenceCondition.cs" />
<Compile Include="BenchControl\GenericDevices\ISimultTestMethod.cs" />
<Compile Include="BenchControl\GenericDevices\IDatastreamReader.cs" />
<Compile Include="BenchControl\GenericDevices\IRegReaderDatastream.cs" />
<Compile Include="BenchControl\GenericDevices\IStatisticsMonitoring.cs" />
<Compile Include="BenchControl\GenericDevices\ITankDraining.cs" />
<Compile Include="BenchControl\GenericDevices\ITankDrainingCfg.cs" />
@ -1180,6 +1181,16 @@
<Compile Include="BenchControl\RegisterReaders\KPackE\RegisterReader\RegisterReaderCfgCtrl.designer.cs">
<DependentUpon>RegisterReaderCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\RegisterReaders\PulsesFromEldeCB\Factory.cs" />
<Compile Include="BenchControl\RegisterReaders\PulsesFromEldeCB\RegisterReader.cs" />
<Compile Include="BenchControl\RegisterReaders\PulsesFromEldeCB\RegisterReaderCfg.cs" />
<Compile Include="BenchControl\RegisterReaders\PulsesFromEldeCB\RegisterReaderCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BenchControl\RegisterReaders\PulsesFromEldeCB\RegisterReaderCfgCtrl.Designer.cs">
<DependentUpon>RegisterReaderCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\RegisterReaders\PulsesFromEldeCB\RRProcedureParams.cs" />
<Compile Include="BenchControl\RegisterReaders\SerialStream\Enums.cs" />
<Compile Include="BenchControl\RegisterReaders\SerialStream\Factory.cs" />
<Compile Include="BenchControl\RegisterReaders\SerialStream\FrameFormat.cs" />
@ -1843,7 +1854,6 @@
<DependentUpon>PumpCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\Elde\PumpWithFM\PumpFactory.cs" />
<Compile Include="BenchControl\Elde\RegisterReader\RRProcedureParams.cs" />
<Compile Include="BenchControl\Elde\RegulValveTandem\ChangeValvePositionOp.cs" />
<Compile Include="BenchControl\Elde\RegulValveTandem\RegulValveTandem.cs" />
<Compile Include="BenchControl\Elde\RegulValveTandem\RegulValveTandemCfg.cs" />
@ -1878,15 +1888,6 @@
<Compile Include="BenchControl\Elde\PressureMeter\PressureMeterCfgCtrl.Designer.cs">
<DependentUpon>PressureMeterCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\Elde\RegisterReader\RegisterReader.cs" />
<Compile Include="BenchControl\Elde\RegisterReader\RegisterReaderCfg.cs" />
<Compile Include="BenchControl\Elde\RegisterReader\RegisterReaderCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BenchControl\Elde\RegisterReader\RegisterReaderCfgCtrl.Designer.cs">
<DependentUpon>RegisterReaderCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\Elde\RegisterReader\Factory.cs" />
<Compile Include="BenchControl\Elde\RegulValve\RegulValveCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
@ -1901,7 +1902,7 @@
</Compile>
<Compile Include="BenchControl\GenericDevices\IAmbient.cs" />
<Compile Include="BenchControl\GenericDevices\ICamera.cs" />
<Compile Include="BenchControl\GenericDevices\IRoi.cs" />
<Compile Include="BenchControl\GenericDevices\IRegReaderLiveCamera.cs" />
<Compile Include="BenchControl\GenericDevices\IDataEntry.cs" />
<Compile Include="BenchControl\GenericDevices\IHasCompleted.cs" />
<Compile Include="BenchControl\GenericDevices\IHasCycleBeginForm.cs" />
@ -1910,7 +1911,7 @@
<Compile Include="BenchControl\GenericDevices\IPumpFM.cs" />
<Compile Include="BenchControl\GenericDevices\IResultsPrinter.cs" />
<Compile Include="BenchControl\GenericDevices\IPump.cs" />
<Compile Include="BenchControl\GenericDevices\IRegisterReader.cs" />
<Compile Include="BenchControl\GenericDevices\IRegReader.cs" />
<Compile Include="BenchControl\GenericDevices\IResultsWriter.cs" />
<Compile Include="BenchControl\GenericDevices\ITestMethod.cs" />
<Compile Include="BenchControl\GenericDevices\IWaterMeter.cs" />
@ -2897,9 +2898,6 @@
<EmbeddedResource Include="BenchControl\Elde\PumpWithFM\PumpCfgCtrl.resx">
<DependentUpon>PumpCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\Elde\RegisterReader\RegisterReaderCfgCtrl.resx">
<DependentUpon>RegisterReaderCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\Elde\RegulValveCoax\RegulValveCfgCtrl.resx">
<DependentUpon>RegulValveCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
@ -3059,6 +3057,9 @@
<EmbeddedResource Include="BenchControl\RegisterReaders\KPackE\RegisterReader\RegisterReaderCfgCtrl.resx">
<DependentUpon>RegisterReaderCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\RegisterReaders\PulsesFromEldeCB\RegisterReaderCfgCtrl.resx">
<DependentUpon>RegisterReaderCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\RegisterReaders\SerialStream\SerialStreamCfgCtrl.resx">
<DependentUpon>SerialStreamCfgCtrl.cs</DependentUpon>
</EmbeddedResource>

4
TBF/UI/Bench/Components/ComponentsManagerDlg.cs
View File

@ -749,10 +749,10 @@ namespace TBF.UI.Bench.Components
(cfg as BenchControl.Elde.RegulValve.RegulValveCfg).Idx1 = zeroBasedIdx + 1;
return true;
}
else if (cfg is BenchControl.Elde.RegisterReader.RegisterReaderCfg)
else if (cfg is BenchControl.RegisterReaders.PulsesFromEldeCB.RegisterReaderCfg)
{
(cfg as IChildComponentCfg).ParentName = "CB";
(cfg as BenchControl.Elde.RegisterReader.RegisterReaderCfg).Position = zeroBasedIdx + 1;
(cfg as BenchControl.RegisterReaders.PulsesFromEldeCB.RegisterReaderCfg).Position = zeroBasedIdx + 1;
return true;
}
else if (cfg is BenchControl.RegisterReaders.StandingStartStop.RegisterReaderCfg)

4
TBF/UI/Bench/Paths/PathsMetersCtrl.cs
View File

@ -54,10 +54,10 @@ namespace TBF.UI.Bench.Paths
SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
IList<IRegisterReader> readers = new List<IRegisterReader>();
IList<IRegReader> readers = new List<IRegReader>();
foreach (var cmpnt in parent.TbfComponents)
{
if (cmpnt is IRegisterReader) readers.Add(cmpnt as IRegisterReader);
if (cmpnt is IRegReader) readers.Add(cmpnt as IRegReader);
}
/// ListViewEx columns

4
TBF/UI/Process/ProcessTabPageCtrl24.cs
View File

@ -464,7 +464,7 @@ namespace TBF.UI.Process
{
for (int i = 0; i < Math.Min(textBoxesCount, ProcessData.RegisterReaders.Length); i++)
{
BenchControl.GenericDevices.IRegisterReader rr = ProcessData.RegisterReaders[i];
BenchControl.GenericDevices.IRegReader rr = ProcessData.RegisterReaders[i];
if (rr != null)
{
pulses[i].Text = rr.WMPulses.ToString();
@ -483,7 +483,7 @@ namespace TBF.UI.Process
double compoundVolume = 0;
for (int i = 2 * compMtr; i < end; i++)
{
BenchControl.GenericDevices.IRegisterReader rr = ProcessData.RegisterReaders[i];
BenchControl.GenericDevices.IRegReader rr = ProcessData.RegisterReaders[i];
if (rr != null)
{
pulses[i].Text = rr.WMPulses.ToString();

4
TBF/UI/Process/ProcessTabPageCtrl48.cs
View File

@ -493,7 +493,7 @@ namespace TBF.UI.Process
{
for (int i = 0; i < Math.Min(textBoxesCount, ProcessData.RegisterReaders.Length); i++)
{
BenchControl.GenericDevices.IRegisterReader rr = ProcessData.RegisterReaders[i];
BenchControl.GenericDevices.IRegReader rr = ProcessData.RegisterReaders[i];
if (rr != null)
{
pulses[i].Text = rr.WMPulses.ToString();
@ -512,7 +512,7 @@ namespace TBF.UI.Process
double compoundVolume = 0;
for (int i = 2 * compMtr; i < end; i++)
{
BenchControl.GenericDevices.IRegisterReader rr = ProcessData.RegisterReaders[i];
BenchControl.GenericDevices.IRegReader rr = ProcessData.RegisterReaders[i];
if (rr != null)
{
pulses[i].Text = rr.WMPulses.ToString();

4
TBF/UI/Process/ProcessTabPageCtrl6.cs
View File

@ -497,7 +497,7 @@ namespace TBF.UI.Process
{
for (int i = 0; i < Math.Min(textBoxesCount, ProcessData.RegisterReaders.Length); i++)
{
BenchControl.GenericDevices.IRegisterReader rr = ProcessData.RegisterReaders[i];
BenchControl.GenericDevices.IRegReader rr = ProcessData.RegisterReaders[i];
if (rr != null)
{
pulses[i].Text = rr.WMPulses.ToString();
@ -516,7 +516,7 @@ namespace TBF.UI.Process
double compoundVolume = 0;
for (int i = 2 * compMtr; i < end; i++)
{
BenchControl.GenericDevices.IRegisterReader rr = ProcessData.RegisterReaders[i];
BenchControl.GenericDevices.IRegReader rr = ProcessData.RegisterReaders[i];
if (rr != null)
{
pulses[i].Text = rr.WMPulses.ToString();

6
TBF/UI/Process/ProcessTabPageExCtrl.cs
View File

@ -465,7 +465,7 @@ namespace TBF.UI.Process
for (int i = 0; i < Math.Min(metersListView.Items.Count, ProcessData.RegisterReaders.Length); i++)
{
ListViewItem lvi = metersListView.Items[i];
BenchControl.GenericDevices.IRegisterReader rr = ProcessData.RegisterReaders[i];
BenchControl.GenericDevices.IRegReader rr = ProcessData.RegisterReaders[i];
if (rr != null)
{
lvi.SubItems[(int)Columns.Pulses].Text = rr.WMPulses.ToString();
@ -486,8 +486,8 @@ namespace TBF.UI.Process
{
for (int z = 0; z < Math.Min(Config.Data.CompoundWMsCount, metersListView.Items.Count / 3); z++)
{
BenchControl.GenericDevices.IRegisterReader rrMain = (ProcessData.RegisterReaders.Length > 2 * z) ? ProcessData.RegisterReaders[2 * z] : null;
BenchControl.GenericDevices.IRegisterReader rrAux = (ProcessData.RegisterReaders.Length > 2 * z + 1) ? ProcessData.RegisterReaders[2 * z + 1] : null;
BenchControl.GenericDevices.IRegReader rrMain = (ProcessData.RegisterReaders.Length > 2 * z) ? ProcessData.RegisterReaders[2 * z] : null;
BenchControl.GenericDevices.IRegReader rrAux = (ProcessData.RegisterReaders.Length > 2 * z + 1) ? ProcessData.RegisterReaders[2 * z + 1] : null;
Double compoundVolume = 0;
if (rrMain != null) compoundVolume += rrMain.WMVolume;