diff --git a/TBF/BenchControl/DataEntry/Combined/EntryForm.cs b/TBF/BenchControl/DataEntry/Combined/EntryForm.cs index 372cd88db..78da664e7 100644 --- a/TBF/BenchControl/DataEntry/Combined/EntryForm.cs +++ b/TBF/BenchControl/DataEntry/Combined/EntryForm.cs @@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Combined public bool UsesCameras() { return false; } readonly EntryFormCfg entryFormCfg; - IRegisterReader[] regReaders; + IRegReader[] regReaders; /// /// Properties set by the Begin and the End form @@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Combined } /// Reference to the operation - 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 } /// null (not implemented) - public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } + public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } /// Reference to the operation - 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; diff --git a/TBF/BenchControl/DataEntry/Combined/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/Combined/TestStartEndForm.cs index b976126de..eeb5fc0e0 100644 --- a/TBF/BenchControl/DataEntry/Combined/TestStartEndForm.cs +++ b/TBF/BenchControl/DataEntry/Combined/TestStartEndForm.cs @@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.Combined /// Number of water meters 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 /// /// Number of water meters /// Information from CycleBeginningForm about availability of water meters - 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 /// Reference volume, it is used to verify the end state, show/hide exclamation if necessary /// Error limit low, it is used to verify the end state, show/hide exclamation if necessary /// Error limit high, it is used to verify the end state, show/hide exclamation if necessary - 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() { diff --git a/TBF/BenchControl/DataEntry/Fewa/EntryFormNoStartEnd.cs b/TBF/BenchControl/DataEntry/Fewa/EntryFormNoStartEnd.cs index e1dbbf948..d9b0a7a7e 100644 --- a/TBF/BenchControl/DataEntry/Fewa/EntryFormNoStartEnd.cs +++ b/TBF/BenchControl/DataEntry/Fewa/EntryFormNoStartEnd.cs @@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Fewa public bool UsesCameras() { return false; } readonly EntryFormCfg entryFormCfg; - IRegisterReader[] regReaders; + IRegReader[] regReaders; /// /// Properties set by the Begin, End and WMStates form @@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Fewa } /// Reference to the operation - 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 } /// null (not implemented) - public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } + public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } /// Reference to the operation - 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; diff --git a/TBF/BenchControl/DataEntry/Fewa/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/Fewa/TestStartEndForm.cs index 76b74578d..f8248581f 100644 --- a/TBF/BenchControl/DataEntry/Fewa/TestStartEndForm.cs +++ b/TBF/BenchControl/DataEntry/Fewa/TestStartEndForm.cs @@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.Fewa /// Number of text boxes for serial numbers 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 /// /// Number of water meters /// Information from CycleBeginningForm about availability of water meters - 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 /// Reference volume, it is used to verify the end state, show/hide exclamation if necessary /// Error limit low, it is used to verify the end state, show/hide exclamation if necessary /// Error limit high, it is used to verify the end state, show/hide exclamation if necessary - 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() { diff --git a/TBF/BenchControl/DataEntry/HeatMeters12/EntryForm.cs b/TBF/BenchControl/DataEntry/HeatMeters12/EntryForm.cs index 3ce56f59f..6a80efb14 100644 --- a/TBF/BenchControl/DataEntry/HeatMeters12/EntryForm.cs +++ b/TBF/BenchControl/DataEntry/HeatMeters12/EntryForm.cs @@ -21,7 +21,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12 public bool UsesCameras() { return false; } readonly EntryFormCfg entryFormCfg; - IRegisterReader[] regReaders; + IRegReader[] regReaders; /// /// Properties set by the Begin, End and WMStates form @@ -116,7 +116,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12 } /// Reference to the operation - 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 } /// null (not implemented) - public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } + public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } /// Reference to the operation - 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 } /// Reference to the operation - 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"); diff --git a/TBF/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs index 09dc3048a..ec2d31125 100644 --- a/TBF/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs +++ b/TBF/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs @@ -22,7 +22,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12 /// Number of text boxes for serial numbers 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 /// /// Number of water meters /// Information from CycleBeginningForm about availability of water meters - 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 /// Reference volume, it is used to verify the end state, show/hide exclamation if necessary /// Error limit low, it is used to verify the end state, show/hide exclamation if necessary /// Error limit high, it is used to verify the end state, show/hide exclamation if necessary - 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() diff --git a/TBF/BenchControl/DataEntry/HeatMeters6/EntryForm.cs b/TBF/BenchControl/DataEntry/HeatMeters6/EntryForm.cs index 69f67bc00..e10145580 100644 --- a/TBF/BenchControl/DataEntry/HeatMeters6/EntryForm.cs +++ b/TBF/BenchControl/DataEntry/HeatMeters6/EntryForm.cs @@ -21,7 +21,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6 public bool UsesCameras() { return false; } readonly EntryFormCfg entryFormCfg; - IRegisterReader[] regReaders; + IRegReader[] regReaders; /// /// Properties set by the Begin, End and WMStates form @@ -116,7 +116,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6 } /// Reference to the operation - 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 } /// null (not implemented) - public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } + public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } /// Reference to the operation - 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 } /// Reference to the operation - 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"); diff --git a/TBF/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.cs index 7747f8d3e..a371e5c3b 100644 --- a/TBF/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.cs +++ b/TBF/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.cs @@ -22,7 +22,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6 /// Number of text boxes for serial numbers 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 /// /// Number of water meters /// Information from CycleBeginningForm about availability of water meters - 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 /// Reference volume, it is used to verify the end state, show/hide exclamation if necessary /// Error limit low, it is used to verify the end state, show/hide exclamation if necessary /// Error limit high, it is used to verify the end state, show/hide exclamation if necessary - 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() diff --git a/TBF/BenchControl/DataEntry/Munich3/EntryForm.cs b/TBF/BenchControl/DataEntry/Munich3/EntryForm.cs index bbda718b5..f6999b796 100644 --- a/TBF/BenchControl/DataEntry/Munich3/EntryForm.cs +++ b/TBF/BenchControl/DataEntry/Munich3/EntryForm.cs @@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Munich3 public bool UsesCameras() { return false; } readonly EntryFormCfg entryFormCfg; - IRegisterReader[] regReaders; + IRegReader[] regReaders; /// /// Properties set by the Begin and the End form @@ -103,7 +103,7 @@ namespace TBF.BenchControl.DataEntry.Munich3 } /// Reference to the operation - 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 } /// null (not implemented) - public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } + public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } /// Reference to the operation - 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; diff --git a/TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.cs index e064967fd..86c5d9deb 100644 --- a/TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.cs +++ b/TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.cs @@ -19,7 +19,7 @@ namespace TBF.BenchControl.DataEntry.Munich3 /// Number of water meters 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 /// /// Number of text boxes for serial numbers - 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 /// /// Number of text boxes for serial numbers - 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() { diff --git a/TBF/BenchControl/DataEntry/Single/EntryFormNoStartEnd.cs b/TBF/BenchControl/DataEntry/Single/EntryFormNoStartEnd.cs index 1e80fd084..d6efa6eb3 100644 --- a/TBF/BenchControl/DataEntry/Single/EntryFormNoStartEnd.cs +++ b/TBF/BenchControl/DataEntry/Single/EntryFormNoStartEnd.cs @@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Single public bool UsesCameras() { return false; } readonly EntryFormCfg entryFormCfg; - IRegisterReader[] regReaders; + IRegReader[] regReaders; /// /// Properties set by the Begin, End and WMStates form @@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Single } /// Reference to the operation - 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 } /// null (not implemented) - public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } + public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } /// Reference to the operation - 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; diff --git a/TBF/BenchControl/DataEntry/Single/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/Single/TestStartEndForm.cs index 5eb874075..a080d621e 100644 --- a/TBF/BenchControl/DataEntry/Single/TestStartEndForm.cs +++ b/TBF/BenchControl/DataEntry/Single/TestStartEndForm.cs @@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.Single /// Number of text boxes for serial numbers 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 /// /// Number of water meters /// Information from CycleBeginningForm about availability of water meters - 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 /// Reference volume, it is used to verify the end state, show/hide exclamation if necessary /// Error limit low, it is used to verify the end state, show/hide exclamation if necessary /// Error limit high, it is used to verify the end state, show/hide exclamation if necessary - 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) { diff --git a/TBF/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs b/TBF/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs index cc6732082..47ac355ab 100644 --- a/TBF/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs +++ b/TBF/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs @@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Standard12 public bool UsesCameras() { return false; } readonly EntryFormCfg entryFormCfg; - IRegisterReader[] regReaders; + IRegReader[] regReaders; /// /// Properties set by the Begin, End and WMStates form @@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Standard12 } /// Reference to the operation - 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 } /// null (not implemented) - public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } + public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } /// Reference to the operation - 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; diff --git a/TBF/BenchControl/DataEntry/Standard12/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/Standard12/TestStartEndForm.cs index f4dff89af..c57dcb5d0 100644 --- a/TBF/BenchControl/DataEntry/Standard12/TestStartEndForm.cs +++ b/TBF/BenchControl/DataEntry/Standard12/TestStartEndForm.cs @@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.Standard12 /// Number of text boxes for serial numbers 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 /// /// Number of water meters /// Information from CycleBeginningForm about availability of water meters - 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 /// Reference volume, it is used to verify the end state, show/hide exclamation if necessary /// Error limit low, it is used to verify the end state, show/hide exclamation if necessary /// Error limit high, it is used to verify the end state, show/hide exclamation if necessary - 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() { diff --git a/TBF/BenchControl/DataEntry/Standard24/EntryFormNoStartEnd.cs b/TBF/BenchControl/DataEntry/Standard24/EntryFormNoStartEnd.cs index 39beb410f..8eeb5403e 100644 --- a/TBF/BenchControl/DataEntry/Standard24/EntryFormNoStartEnd.cs +++ b/TBF/BenchControl/DataEntry/Standard24/EntryFormNoStartEnd.cs @@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Standard24 public bool UsesCameras() { return false; } readonly EntryFormCfg entryFormCfg; - IRegisterReader[] regReaders; + IRegReader[] regReaders; /// /// Properties set by the Begin, End and WMStates form @@ -100,7 +100,7 @@ namespace TBF.BenchControl.DataEntry.Standard24 } /// Reference to the operation - 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 } /// Reference to the operation - public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList waterMeters, bool isConditionOp = false) + public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList 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 } /// Reference to the operation - 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; diff --git a/TBF/BenchControl/DataEntry/Standard24/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/Standard24/TestStartEndForm.cs index 958ed1bd4..f638f8148 100644 --- a/TBF/BenchControl/DataEntry/Standard24/TestStartEndForm.cs +++ b/TBF/BenchControl/DataEntry/Standard24/TestStartEndForm.cs @@ -29,7 +29,7 @@ namespace TBF.BenchControl.DataEntry.Standard24 /// Number of text boxes for serial numbers 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 /// /// Number of water meters /// Information from CycleBeginningForm about availability of water meters - 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 /// /// Number of water meters /// Information from CycleBeginningForm about availability of water meters - 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 /// Reference volume, it is used to verify the end state, show/hide exclamation if necessary /// Error limit low, it is used to verify the end state, show/hide exclamation if necessary /// Error limit high, it is used to verify the end state, show/hide exclamation if necessary - 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() { diff --git a/TBF/BenchControl/DataEntry/Standard48/EntryFormNoStartEnd.cs b/TBF/BenchControl/DataEntry/Standard48/EntryFormNoStartEnd.cs index ede7668b8..7492192e2 100644 --- a/TBF/BenchControl/DataEntry/Standard48/EntryFormNoStartEnd.cs +++ b/TBF/BenchControl/DataEntry/Standard48/EntryFormNoStartEnd.cs @@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Standard48 public bool UsesCameras() { return false; } readonly EntryFormCfg entryFormCfg; - IRegisterReader[] regReaders; + IRegReader[] regReaders; /// /// Properties set by the Begin, End and WMStates form @@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Standard48 } /// Reference to the operation - 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 } /// null (not implemented) - public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } + public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } /// Reference to the operation - 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; diff --git a/TBF/BenchControl/DataEntry/Standard48/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/Standard48/TestStartEndForm.cs index b7dfbe0ca..b8004c3d7 100644 --- a/TBF/BenchControl/DataEntry/Standard48/TestStartEndForm.cs +++ b/TBF/BenchControl/DataEntry/Standard48/TestStartEndForm.cs @@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.Standard48 /// Number of text boxes for serial numbers 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 /// /// Number of water meters /// Information from CycleBeginningForm about availability of water meters - 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 /// Reference volume, it is used to verify the end state, show/hide exclamation if necessary /// Error limit low, it is used to verify the end state, show/hide exclamation if necessary /// Error limit high, it is used to verify the end state, show/hide exclamation if necessary - 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() { diff --git a/TBF/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs b/TBF/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs index 2810941c9..d8a07192e 100644 --- a/TBF/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs +++ b/TBF/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs @@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Standard6 public bool UsesCameras() { return false; } readonly EntryFormCfg entryFormCfg; - IRegisterReader[] regReaders; + IRegReader[] regReaders; /// /// Properties set by the Begin, End and WMStates form @@ -94,7 +94,7 @@ namespace TBF.BenchControl.DataEntry.Standard6 } /// Reference to the operation - 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 } /// null (not implemented) - public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } + public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } /// Reference to the operation - 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; diff --git a/TBF/BenchControl/DataEntry/Standard6/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/Standard6/TestStartEndForm.cs index f3fa45951..3043856d8 100644 --- a/TBF/BenchControl/DataEntry/Standard6/TestStartEndForm.cs +++ b/TBF/BenchControl/DataEntry/Standard6/TestStartEndForm.cs @@ -19,7 +19,7 @@ namespace TBF.BenchControl.DataEntry.Standard6 /// Number of water meters 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 /// /// Number of text boxes for serial numbers - 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 /// /// Number of text boxes for serial numbers - 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; diff --git a/TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs b/TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs index 6b6b18bd3..f5eac0811 100644 --- a/TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs +++ b/TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs @@ -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 } /// Reference to the operation - 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 } /// null (not implemented) - public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } + public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } /// Reference to the operation - 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 } /// Reference to the operation - 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; diff --git a/TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs index 4f3559fab..c7817e48c 100644 --- a/TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs +++ b/TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs @@ -40,7 +40,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera /// Number of text boxes for serial numbers 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 /// /// Number of water meters /// Information from CycleBeginningForm about availability of water meters - 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 /// Reference volume, it is used to verify the end state, show/hide exclamation if necessary /// Error limit low, it is used to verify the end state, show/hide exclamation if necessary /// Error limit high, it is used to verify the end state, show/hide exclamation if necessary - 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() { diff --git a/TBF/BenchControl/DataEntry/iPerl/EntryForm.cs b/TBF/BenchControl/DataEntry/iPerl/EntryForm.cs index b768ad001..5863895dc 100644 --- a/TBF/BenchControl/DataEntry/iPerl/EntryForm.cs +++ b/TBF/BenchControl/DataEntry/iPerl/EntryForm.cs @@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.iPerl public bool UsesCameras() { return false; } readonly EntryFormCfg entryFormCfg; - IRegisterReader[] regReaders; + IRegReader[] regReaders; /// /// Properties set by the Begin, End and WMStates form @@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.iPerl } /// Reference to the operation - 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 } /// null (not implemented) - public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } + public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } /// Reference to the operation - 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; diff --git a/TBF/BenchControl/DataEntry/iPerl/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/iPerl/TestStartEndForm.cs index 61851be3e..23198a450 100644 --- a/TBF/BenchControl/DataEntry/iPerl/TestStartEndForm.cs +++ b/TBF/BenchControl/DataEntry/iPerl/TestStartEndForm.cs @@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.iPerl /// Number of text boxes for serial numbers 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 /// /// Number of water meters /// Information from CycleBeginningForm about availability of water meters - 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 /// Reference volume, it is used to verify the end state, show/hide exclamation if necessary /// Error limit low, it is used to verify the end state, show/hide exclamation if necessary /// Error limit high, it is used to verify the end state, show/hide exclamation if necessary - 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() { diff --git a/TBF/BenchControl/GenericDevices/IDataEntryForCamera.cs b/TBF/BenchControl/GenericDevices/IDataEntryForCamera.cs index 0c96f27d3..ffe935a70 100644 --- a/TBF/BenchControl/GenericDevices/IDataEntryForCamera.cs +++ b/TBF/BenchControl/GenericDevices/IDataEntryForCamera.cs @@ -20,6 +20,6 @@ namespace TBF.BenchControl.GenericDevices /// Displays form at the end of the test to enter water meter start start. /// /// Operation to be used in the sequence - IOperation ShowDeferredTestEvalFormOp(IRegisterReader[] regReaders, double volumeRef, double errLimLo, double errLimHi); + IOperation ShowDeferredTestEvalFormOp(IRegReader[] regReaders, double volumeRef, double errLimLo, double errLimHi); } } diff --git a/TBF/BenchControl/GenericDevices/IHasHeatMtrStatesForm.cs b/TBF/BenchControl/GenericDevices/IHasHeatMtrStatesForm.cs index d8031132f..9549b2874 100644 --- a/TBF/BenchControl/GenericDevices/IHasHeatMtrStatesForm.cs +++ b/TBF/BenchControl/GenericDevices/IHasHeatMtrStatesForm.cs @@ -19,7 +19,7 @@ namespace TBF.BenchControl.GenericDevices /// Displays form at the end of the test to enter water meter start start. /// /// Operation to be used in the sequence - 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); } } diff --git a/TBF/BenchControl/GenericDevices/IHasWMStatesForm.cs b/TBF/BenchControl/GenericDevices/IHasWMStatesForm.cs index a38989849..850165a03 100644 --- a/TBF/BenchControl/GenericDevices/IHasWMStatesForm.cs +++ b/TBF/BenchControl/GenericDevices/IHasWMStatesForm.cs @@ -27,18 +27,18 @@ namespace TBF.BenchControl.GenericDevices /// Displays form at the beginning of the test to enter water meter start start. /// /// Operation to be used in the sequence - IOperation ShowTestStartFormOp(IRegisterReader[] regReaders); + IOperation ShowTestStartFormOp(IRegReader[] regReaders); /// /// Displays form at the beginning of the test to enter water meter start start. /// /// Operation to be used in the sequence - IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList waterMeters, bool isCondOp = false); + IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList waterMeters, bool isCondOp = false); /// /// Displays form at the end of the test to enter water meter start start. /// /// Operation to be used in the sequence - IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double volumeRef, double errLimLo, double errLimHi); + IOperation ShowTestEndFormOp(IRegReader[] regReaders, double volumeRef, double errLimLo, double errLimHi); } } diff --git a/TBF/BenchControl/GenericDevices/IRegisterReader.cs b/TBF/BenchControl/GenericDevices/IRegReader.cs similarity index 88% rename from TBF/BenchControl/GenericDevices/IRegisterReader.cs rename to TBF/BenchControl/GenericDevices/IRegReader.cs index 67005c085..c24b07d78 100644 --- a/TBF/BenchControl/GenericDevices/IRegisterReader.cs +++ b/TBF/BenchControl/GenericDevices/IRegReader.cs @@ -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; } diff --git a/TBF/BenchControl/GenericDevices/IDatastreamReader.cs b/TBF/BenchControl/GenericDevices/IRegReaderDatastream.cs similarity index 86% rename from TBF/BenchControl/GenericDevices/IDatastreamReader.cs rename to TBF/BenchControl/GenericDevices/IRegReaderDatastream.cs index c9034ee53..44d4ed263 100644 --- a/TBF/BenchControl/GenericDevices/IDatastreamReader.cs +++ b/TBF/BenchControl/GenericDevices/IRegReaderDatastream.cs @@ -5,7 +5,7 @@ using System; namespace TBF.BenchControl.GenericDevices { - interface IDatastreamReader : IRegisterReader + interface IRegReaderDatastream : IRegReader { bool NoSamples { get; } double VolumeLtrStart { get; } diff --git a/TBF/BenchControl/GenericDevices/IRoi.cs b/TBF/BenchControl/GenericDevices/IRegReaderLiveCamera.cs similarity index 84% rename from TBF/BenchControl/GenericDevices/IRoi.cs rename to TBF/BenchControl/GenericDevices/IRegReaderLiveCamera.cs index c38760ba4..01a31d9cc 100644 --- a/TBF/BenchControl/GenericDevices/IRoi.cs +++ b/TBF/BenchControl/GenericDevices/IRegReaderLiveCamera.cs @@ -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 diff --git a/TBF/BenchControl/GenericDevices/IRegReaderPulses.cs b/TBF/BenchControl/GenericDevices/IRegReaderPulses.cs new file mode 100644 index 000000000..4f655e4b2 --- /dev/null +++ b/TBF/BenchControl/GenericDevices/IRegReaderPulses.cs @@ -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 + } +} diff --git a/TBF/BenchControl/GenericDevices/IRoiForFixedStart.cs b/TBF/BenchControl/GenericDevices/IRegReaderStillCamera.cs similarity index 84% rename from TBF/BenchControl/GenericDevices/IRoiForFixedStart.cs rename to TBF/BenchControl/GenericDevices/IRegReaderStillCamera.cs index 13f32e908..e99cfa3cb 100644 --- a/TBF/BenchControl/GenericDevices/IRoiForFixedStart.cs +++ b/TBF/BenchControl/GenericDevices/IRegReaderStillCamera.cs @@ -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; } diff --git a/TBF/BenchControl/MetersPath.cs b/TBF/BenchControl/MetersPath.cs index 3c4c1295c..b807918ff 100644 --- a/TBF/BenchControl/MetersPath.cs +++ b/TBF/BenchControl/MetersPath.cs @@ -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 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); } } } diff --git a/TBF/BenchControl/Network/Camera/Roi/Roi.cs b/TBF/BenchControl/Network/Camera/Roi/Roi.cs index a6bc46278..f741840fd 100644 --- a/TBF/BenchControl/Network/Camera/Roi/Roi.cs +++ b/TBF/BenchControl/Network/Camera/Roi/Roi.cs @@ -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 diff --git a/TBF/BenchControl/Network/Camera/RoiForFixedStart/Roi.cs b/TBF/BenchControl/Network/Camera/RoiForFixedStart/Roi.cs index ce7a49e1a..b6bba4c1b 100644 --- a/TBF/BenchControl/Network/Camera/RoiForFixedStart/Roi.cs +++ b/TBF/BenchControl/Network/Camera/RoiForFixedStart/Roi.cs @@ -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 diff --git a/TBF/BenchControl/Operations/ReadMoreRegistersOp.cs b/TBF/BenchControl/Operations/ReadMoreRegistersOp.cs index 81ea0ad04..923d8383f 100644 --- a/TBF/BenchControl/Operations/ReadMoreRegistersOp.cs +++ b/TBF/BenchControl/Operations/ReadMoreRegistersOp.cs @@ -22,7 +22,7 @@ namespace TBF.BenchControl.Operations /// /// Register reader reference /// Reference to the water meter register state in pulses - public ReadMoreRegistersOp(GenericDevices.IRegisterReader[] readers) + public ReadMoreRegistersOp(GenericDevices.IRegReader[] readers) { if (readers == null) throw new ArgumentNullException("readers"); diff --git a/TBF/BenchControl/Output/DB/SensusOracle/Database.cs b/TBF/BenchControl/Output/DB/SensusOracle/Database.cs index 1ad96397c..175ecbf22 100644 --- a/TBF/BenchControl/Output/DB/SensusOracle/Database.cs +++ b/TBF/BenchControl/Output/DB/SensusOracle/Database.cs @@ -47,7 +47,7 @@ namespace TBF.BenchControl.Output.DB.SensusOracle /// /// iPerls to verify /// - GenericDevices.IRegisterReader[] iperlHeads; + GenericDevices.IRegReader[] iperlHeads; /// /// Start info is read into WaterMeter objects referenced by this array diff --git a/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryForm.cs b/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryForm.cs index 604793398..c8ece430e 100644 --- a/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryForm.cs +++ b/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryForm.cs @@ -21,7 +21,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio KPackE.Radio.Radio radio; /// Reference to KPackE.Radio component - IRegisterReader[] regReaders; + IRegReader[] regReaders; /// /// Properties set by the Begin, End and WMStates form @@ -95,7 +95,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio } /// Reference to the operation - 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 } /// null (not implemented) - public IOperation ShowAdvancedTestStartFormOp(IRegisterReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } + public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } /// Reference to the operation - 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 wMeters, IRegisterReader[] rReaders, bool isEndOfTest) + void BindRegisterReadersToRadio(IList wMeters, IRegReader[] rReaders, bool isEndOfTest) { radio.RegReaders.Clear(); diff --git a/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/TestStartEndForm.cs b/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/TestStartEndForm.cs index a0735e456..42e0fc714 100644 --- a/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/TestStartEndForm.cs +++ b/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/TestStartEndForm.cs @@ -21,7 +21,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio /// Number of text boxes for serial numbers public readonly int WaterMetersCount; readonly IList 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 /// /// Number of water meters /// Information from CycleBeginningForm about availability of water meters - public TestStartEndForm(IList waterMeters, IRegisterReader[] regReaders, bool[] disabled) + public TestStartEndForm(IList waterMeters, IRegReader[] regReaders, bool[] disabled) : this() { endStates = false; @@ -132,7 +132,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio /// Reference volume, it is used to verify the end state, show/hide exclamation if necessary /// Error limit low, it is used to verify the end state, show/hide exclamation if necessary /// Error limit high, it is used to verify the end state, show/hide exclamation if necessary - public TestStartEndForm(IList waterMeters, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled, + public TestStartEndForm(IList waterMeters, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled, double refVolume, double errLimLo, double errLimHi) : this() { diff --git a/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReader.cs b/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReader.cs index 6033dd2c7..5a869510a 100644 --- a/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReader.cs +++ b/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReader.cs @@ -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)); } diff --git a/TBF/BenchControl/Elde/RegisterReader/Factory.cs b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/Factory.cs similarity index 88% rename from TBF/BenchControl/Elde/RegisterReader/Factory.cs rename to TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/Factory.cs index 38ed8bab2..611ded95e 100644 --- a/TBF/BenchControl/Elde/RegisterReader/Factory.cs +++ b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/Factory.cs @@ -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 { diff --git a/TBF/BenchControl/Elde/RegisterReader/RRProcedureParams.cs b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RRProcedureParams.cs similarity index 96% rename from TBF/BenchControl/Elde/RegisterReader/RRProcedureParams.cs rename to TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RRProcedureParams.cs index 22c5b61a1..b7fa6f4cf 100644 --- a/TBF/BenchControl/Elde/RegisterReader/RRProcedureParams.cs +++ b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RRProcedureParams.cs @@ -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 { diff --git a/TBF/BenchControl/Elde/RegisterReader/RegisterReader.cs b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReader.cs similarity index 97% rename from TBF/BenchControl/Elde/RegisterReader/RegisterReader.cs rename to TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReader.cs index afe480e7d..095ea39be 100644 --- a/TBF/BenchControl/Elde/RegisterReader/RegisterReader.cs +++ b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReader.cs @@ -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)); } diff --git a/TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfg.cs b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfg.cs similarity index 93% rename from TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfg.cs rename to TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfg.cs index a16fdfe4f..809b33331 100644 --- a/TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfg.cs +++ b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfg.cs @@ -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 { diff --git a/TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.Designer.cs b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.Designer.cs similarity index 97% rename from TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.Designer.cs rename to TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.Designer.cs index f094f992b..33494e6d4 100644 --- a/TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.Designer.cs +++ b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.Designer.cs @@ -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 { diff --git a/TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.cs b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.cs similarity index 95% rename from TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.cs rename to TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.cs index 1a0244f42..2844d959a 100644 --- a/TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.cs +++ b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.cs @@ -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 { diff --git a/TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.resx b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.resx similarity index 100% rename from TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.resx rename to TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.resx diff --git a/TBF/BenchControl/RegisterReaders/SerialStream/SerialStream.cs b/TBF/BenchControl/RegisterReaders/SerialStream/SerialStream.cs index 0f9c84dfd..990607080 100644 --- a/TBF/BenchControl/RegisterReaders/SerialStream/SerialStream.cs +++ b/TBF/BenchControl/RegisterReaders/SerialStream/SerialStream.cs @@ -13,7 +13,7 @@ namespace TBF.BenchControl.RegisterReaders.SerialStream /// /// This component = instance of this class is a placeholder for a combined main watermeter /// - 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)); } diff --git a/TBF/BenchControl/RegisterReaders/StandingStartStop/RegisterReader.cs b/TBF/BenchControl/RegisterReaders/StandingStartStop/RegisterReader.cs index a5d552449..0e0365729 100644 --- a/TBF/BenchControl/RegisterReaders/StandingStartStop/RegisterReader.cs +++ b/TBF/BenchControl/RegisterReaders/StandingStartStop/RegisterReader.cs @@ -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)); } diff --git a/TBF/BenchControl/Sequences/MainSeqUtils.cs b/TBF/BenchControl/Sequences/MainSeqUtils.cs index e1855d1f1..1893848ce 100644 --- a/TBF/BenchControl/Sequences/MainSeqUtils.cs +++ b/TBF/BenchControl/Sequences/MainSeqUtils.cs @@ -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); } diff --git a/TBF/BenchControl/Sequences/ProcessData.cs b/TBF/BenchControl/Sequences/ProcessData.cs index f1e74f1c0..6a0f9903d 100644 --- a/TBF/BenchControl/Sequences/ProcessData.cs +++ b/TBF/BenchControl/Sequences/ProcessData.cs @@ -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] diff --git a/TBF/BenchControl/Sequences/SequenceBase.cs b/TBF/BenchControl/Sequences/SequenceBase.cs index 5ff07755a..b81dd381d 100644 --- a/TBF/BenchControl/Sequences/SequenceBase.cs +++ b/TBF/BenchControl/Sequences/SequenceBase.cs @@ -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); diff --git a/TBF/BenchControl/TbfComponents.cs b/TBF/BenchControl/TbfComponents.cs index ba4cf8121..9f5a27c3b 100644 --- a/TBF/BenchControl/TbfComponents.cs +++ b/TBF/BenchControl/TbfComponents.cs @@ -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' diff --git a/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs index c20f5ef1b..93ac8b522 100644 --- a/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs @@ -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 rois = new List(); + IList rois = new List(); 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) { diff --git a/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index 064080bbb..a4ce173ec 100644 --- a/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -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 rois = new List(); + IList rois = new List(); 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) diff --git a/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs b/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs index 68e261869..d8539270c 100644 --- a/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs +++ b/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs @@ -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 rois = new List(); + IList rois = new List(); 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) { diff --git a/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs b/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs index 272319a77..898bc2b66 100644 --- a/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs +++ b/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs @@ -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 rois = new List(); + IList rois = new List(); 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) diff --git a/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs b/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs index 79b57b8c5..36321e3c3 100644 --- a/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs @@ -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) { diff --git a/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs index 6ef0254ed..310243556 100644 --- a/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs @@ -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 rois = new List(); + IList rois = new List(); 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) { diff --git a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs index 84fee0d06..ee6c94be4 100644 --- a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs @@ -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) { diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollAdvanced/FixedStartMassCollAdvancedSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollAdvanced/FixedStartMassCollAdvancedSeq.cs index dd05d4522..65282d6c0 100644 --- a/TBF/BenchControl/TestMethods/FixedStartMassCollAdvanced/FixedStartMassCollAdvancedSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartMassCollAdvanced/FixedStartMassCollAdvancedSeq.cs @@ -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) { diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs index 2b68d8113..b4cc9261b 100644 --- a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs @@ -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) { diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 6fce4b0a7..4ae3b2fd4 100644 --- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -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) { diff --git a/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs index d46e00436..d7cff93a7 100644 --- a/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs @@ -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) { diff --git a/TBF/BenchControl/TestMethods/FlowAdjustment/FlowAdjustmentSeq.cs b/TBF/BenchControl/TestMethods/FlowAdjustment/FlowAdjustmentSeq.cs index 90dafaa50..627ecf72b 100644 --- a/TBF/BenchControl/TestMethods/FlowAdjustment/FlowAdjustmentSeq.cs +++ b/TBF/BenchControl/TestMethods/FlowAdjustment/FlowAdjustmentSeq.cs @@ -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; diff --git a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 6a073ba4c..72f6a26a5 100644 --- a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -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 rois = new List(); + IList rois = new List(); 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) { diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs index 47339963a..5413811e1 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs @@ -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 rois = new List(); + IList rois = new List(); 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) { diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs index b17848447..0cb293533 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs @@ -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 rois = new List(); + IList rois = new List(); 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) { diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs index 93d230173..85e3dcf61 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs @@ -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 rois = new List(); + IList rois = new List(); 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) { diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 63e521977..984fa414f 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -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 rois = new List(); + IList rois = new List(); 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) { diff --git a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs index 575dd3543..aa74a944e 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs @@ -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 rois = new List(); + IList rois = new List(); 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) { diff --git a/TBF/BenchControl/TestMethods/GrabImage/GrabImageSeq.cs b/TBF/BenchControl/TestMethods/GrabImage/GrabImageSeq.cs index ee662ba34..e9c9d91ae 100644 --- a/TBF/BenchControl/TestMethods/GrabImage/GrabImageSeq.cs +++ b/TBF/BenchControl/TestMethods/GrabImage/GrabImageSeq.cs @@ -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()); diff --git a/TBF/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs b/TBF/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs index 59e341c5a..754be9d42 100644 --- a/TBF/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs +++ b/TBF/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs @@ -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); diff --git a/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs b/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs index 1ad1a4915..e672c80d3 100644 --- a/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs +++ b/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs @@ -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 rois = new List(); + IList rois = new List(); 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) { diff --git a/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs b/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs index 688d4f6e5..a3b053802 100644 --- a/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs +++ b/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs @@ -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 rois = new List(); + IList rois = new List(); 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) { diff --git a/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs index f90d8f46d..0649fe867 100644 --- a/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs +++ b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs @@ -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(); diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs b/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs index 2684731ec..7119915ed 100644 --- a/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs +++ b/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs @@ -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 rois = new List(); + IList rois = new List(); 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) { diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs index 10d23054c..809541b93 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs @@ -14,7 +14,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead /// /// This component = instance of this class is a placeholder for a combined main watermeter /// - 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)); } diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index d44c27e76..4ed3a91d3 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -663,6 +663,7 @@ + @@ -672,7 +673,7 @@ - + @@ -682,7 +683,7 @@ - + @@ -1180,6 +1181,16 @@ RegisterReaderCfgCtrl.cs + + + + + UserControl + + + RegisterReaderCfgCtrl.cs + + @@ -1843,7 +1854,6 @@ PumpCfgCtrl.cs - @@ -1878,15 +1888,6 @@ PressureMeterCfgCtrl.cs - - - - UserControl - - - RegisterReaderCfgCtrl.cs - - UserControl @@ -1901,7 +1902,7 @@ - + @@ -1910,7 +1911,7 @@ - + @@ -2897,9 +2898,6 @@ PumpCfgCtrl.cs - - RegisterReaderCfgCtrl.cs - RegulValveCfgCtrl.cs @@ -3059,6 +3057,9 @@ RegisterReaderCfgCtrl.cs + + RegisterReaderCfgCtrl.cs + SerialStreamCfgCtrl.cs diff --git a/TBF/UI/Bench/Components/ComponentsManagerDlg.cs b/TBF/UI/Bench/Components/ComponentsManagerDlg.cs index 23312beb1..68f27e0a6 100644 --- a/TBF/UI/Bench/Components/ComponentsManagerDlg.cs +++ b/TBF/UI/Bench/Components/ComponentsManagerDlg.cs @@ -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) diff --git a/TBF/UI/Bench/Paths/PathsMetersCtrl.cs b/TBF/UI/Bench/Paths/PathsMetersCtrl.cs index a86994bbf..b1cf2dc81 100644 --- a/TBF/UI/Bench/Paths/PathsMetersCtrl.cs +++ b/TBF/UI/Bench/Paths/PathsMetersCtrl.cs @@ -54,10 +54,10 @@ namespace TBF.UI.Bench.Paths SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); - IList readers = new List(); + IList readers = new List(); 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 diff --git a/TBF/UI/Process/ProcessTabPageCtrl24.cs b/TBF/UI/Process/ProcessTabPageCtrl24.cs index 465f5611a..6b5785d60 100644 --- a/TBF/UI/Process/ProcessTabPageCtrl24.cs +++ b/TBF/UI/Process/ProcessTabPageCtrl24.cs @@ -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(); diff --git a/TBF/UI/Process/ProcessTabPageCtrl48.cs b/TBF/UI/Process/ProcessTabPageCtrl48.cs index 7d55e800e..c03d0e8f8 100644 --- a/TBF/UI/Process/ProcessTabPageCtrl48.cs +++ b/TBF/UI/Process/ProcessTabPageCtrl48.cs @@ -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(); diff --git a/TBF/UI/Process/ProcessTabPageCtrl6.cs b/TBF/UI/Process/ProcessTabPageCtrl6.cs index bb669c8fb..28408b5ac 100644 --- a/TBF/UI/Process/ProcessTabPageCtrl6.cs +++ b/TBF/UI/Process/ProcessTabPageCtrl6.cs @@ -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(); diff --git a/TBF/UI/Process/ProcessTabPageExCtrl.cs b/TBF/UI/Process/ProcessTabPageExCtrl.cs index 61140e3ff..d3eace188 100644 --- a/TBF/UI/Process/ProcessTabPageExCtrl.cs +++ b/TBF/UI/Process/ProcessTabPageExCtrl.cs @@ -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;