diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/EntryForm.cs
index f2a7ce0b0..e0bf3df82 100644
--- a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/EntryForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/EntryForm.cs
@@ -10,51 +10,51 @@ using TBF.BenchControl.GenericDevices;
namespace TBF.BenchControl.DataEntry.HeatMeters6
{
- public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm, IHasHeatMtrStatesForm
- {
+ public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm, IHasHeatMtrStatesForm
+ {
private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm));
- public override string ToString()
- {
- return string.Format("{0}({1})", this.GetType().Namespace.Substring(17), Cfg.ToString(1));
- }
+ public override string ToString()
+ {
+ return string.Format("{0}({1})", this.GetType().Namespace.Substring(17), Cfg.ToString(1));
+ }
readonly EntryFormCfg entryFormCfg;
- ///
- /// Properties set by the Begin, End and WMStates form
- ///
- string purchaseOrder;
- public string PurchaseOrder { get { return purchaseOrder; } }
+ ///
+ /// Properties set by the Begin, End and WMStates form
+ ///
+ string purchaseOrder;
+ public string PurchaseOrder { get { return purchaseOrder; } }
- string[] serialNr;
+ string[] serialNr;
public string SerialNr(int wmNr) { return (wmNr >= 0 && wmNr < serialNr.Length) ? serialNr[wmNr] : string.Empty; }
- bool[] disabled;
- public bool Disabled(int wmNr) { return (wmNr >= 0 && wmNr < disabled.Length) ? disabled[wmNr] : false; }
+ bool[] disabled;
+ public bool Disabled(int wmNr) { return (wmNr >= 0 && wmNr < disabled.Length) ? disabled[wmNr] : false; }
- string[] wmCycleEndState;
- public string WMCycleEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmCycleEndState.Length) ? wmCycleEndState[wmNr] : string.Empty; }
+ string[] wmCycleEndState;
+ public string WMCycleEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmCycleEndState.Length) ? wmCycleEndState[wmNr] : string.Empty; }
- float[] wmStartState;
- public float WMStartState(int wmNr) { return (wmNr >= 0 && wmNr < wmStartState.Length) ? wmStartState[wmNr] : 0; }
+ float[] wmStartState;
+ public float WMStartState(int wmNr) { return (wmNr >= 0 && wmNr < wmStartState.Length) ? wmStartState[wmNr] : 0; }
- float[] wmEndState;
- public float WMEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmEndState.Length) ? wmEndState[wmNr] : 0; }
+ float[] wmEndState;
+ public float WMEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmEndState.Length) ? wmEndState[wmNr] : 0; }
- string[] wmStartStateStr;
+ string[] wmStartStateStr;
- double[] energyStartState;
- public double EnergyStartState(int wmNr) { return (wmNr >= 0 && wmNr < energyStartState.Length) ? energyStartState[wmNr] : 0; }
+ double[] energyStartState;
+ public double EnergyStartState(int wmNr) { return (wmNr >= 0 && wmNr < energyStartState.Length) ? energyStartState[wmNr] : 0; }
- double[] energyEndState;
- public double EnergyEndState(int wmNr) { return (wmNr >= 0 && wmNr < energyEndState.Length) ? energyEndState[wmNr] : 0; }
+ double[] energyEndState;
+ public double EnergyEndState(int wmNr) { return (wmNr >= 0 && wmNr < energyEndState.Length) ? energyEndState[wmNr] : 0; }
- string[] energyStartStateStr;
+ string[] energyStartStateStr;
System.Windows.Forms.Form modelessDlg;
- double refVolume;
+ double refVolume;
double errLimLo;
double errLimHi;
@@ -62,84 +62,84 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
double energyErrLimLo;
double energyErrLimHi;
- bool resultSaved; /// Set in Run() when results are saved
+ bool resultSaved; /// Set in Run() when results are saved
- Results.Entities.WaterMeter[] waterMeters; /// Reference to ...ProcessData.BatchRslts.WaterMeters[]
+ Results.Entities.WaterMeter[] waterMeters; /// Reference to ...ProcessData.BatchRslts.WaterMeters[]
- public enum CurrentOp
- {
- None,
- ShowFormAtCycleBeginning,
- ShowFormAtCycleEnd,
- EnterTestStartStates,
- EnterTestEndStates,
- }
+ public enum CurrentOp
+ {
+ None,
+ ShowFormAtCycleBeginning,
+ ShowFormAtCycleEnd,
+ EnterTestStartStates,
+ EnterTestEndStates,
+ }
- CurrentOp currentOp;
+ CurrentOp currentOp;
- public EntryForm()
- {
- }
+ public EntryForm()
+ {
+ }
- public EntryForm(Generic.IComponentCfg cfg)
- : base(cfg)
- {
- entryFormCfg = cfg as EntryFormCfg;
+ public EntryForm(Generic.IComponentCfg cfg)
+ : base(cfg)
+ {
+ entryFormCfg = cfg as EntryFormCfg;
- serialNr = new string[Config.Data.WMsCount];
- disabled = new bool[Config.Data.WMsCount];
- wmStartState = new float[Config.Data.WMsCount];
- wmStartStateStr = new string[Config.Data.WMsCount];
- wmEndState = new float[Config.Data.WMsCount];
- energyStartState = new double[Config.Data.WMsCount];
- energyStartStateStr = new string[Config.Data.WMsCount];
- energyEndState = new double[Config.Data.WMsCount];
- wmCycleEndState = new string[Config.Data.WMsCount];
+ serialNr = new string[Config.Data.HeatMetersCount];
+ disabled = new bool[Config.Data.HeatMetersCount];
+ wmStartState = new float[Config.Data.HeatMetersCount];
+ wmStartStateStr = new string[Config.Data.HeatMetersCount];
+ wmEndState = new float[Config.Data.HeatMetersCount];
+ energyStartState = new double[Config.Data.HeatMetersCount];
+ energyStartStateStr = new string[Config.Data.HeatMetersCount];
+ energyEndState = new double[Config.Data.HeatMetersCount];
+ wmCycleEndState = new string[Config.Data.HeatMetersCount];
- currentOp = CurrentOp.None;
+ currentOp = CurrentOp.None;
log.Debug(this.ToString());
}
- /// Reference to the operation
- public IOperation ShowCycleBeginFormOp()
- {
- if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
- currentOp = CurrentOp.ShowFormAtCycleBeginning;
- this.waterMeters = TBF.BenchControl.Sequences.ProcessData.BatchRslts.WaterMeters;
- return this;
- }
+ /// Reference to the operation
+ public IOperation ShowCycleBeginFormOp()
+ {
+ if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
+ currentOp = CurrentOp.ShowFormAtCycleBeginning;
+ this.waterMeters = TBF.BenchControl.Sequences.ProcessData.BatchRslts.WaterMeters;
+ return this;
+ }
- /// Reference to the operation
- public IOperation ShowCycleEndFormOp()
- {
- if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
- currentOp = CurrentOp.ShowFormAtCycleEnd;
- this.waterMeters = TBF.BenchControl.Sequences.ProcessData.BatchRslts.WaterMeters;
- return this;
- }
+ /// Reference to the operation
+ public IOperation ShowCycleEndFormOp()
+ {
+ if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
+ currentOp = CurrentOp.ShowFormAtCycleEnd;
+ this.waterMeters = TBF.BenchControl.Sequences.ProcessData.BatchRslts.WaterMeters;
+ return this;
+ }
/// Reference to the operation
public IOperation ShowTestStartFormOp()
{
- if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
- currentOp = CurrentOp.EnterTestStartStates;
- return this;
- }
+ if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
+ currentOp = CurrentOp.EnterTestStartStates;
+ return this;
+ }
- /// Reference to the operation
- public IOperation ShowTestEndFormOp(double refVolume, double errLimLo, double errLimHi)
- {
- if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
- currentOp = CurrentOp.EnterTestEndStates;
- this.refVolume = refVolume;
- this.errLimLo = errLimLo;
- this.errLimHi = errLimHi;
+ /// Reference to the operation
+ public IOperation ShowTestEndFormOp(double refVolume, double errLimLo, double errLimHi)
+ {
+ if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
+ currentOp = CurrentOp.EnterTestEndStates;
+ this.refVolume = refVolume;
+ this.errLimLo = errLimLo;
+ this.errLimHi = errLimHi;
this.refEnergy = 0;
this.energyErrLimLo = 0;
this.energyErrLimHi = 0;
return this;
- }
+ }
/// Reference to the operation
public IOperation ShowTestEndFormOp(double refVolume, double errLimLo, double errLimHi,
@@ -166,90 +166,90 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
///
void OpenEndDlg(EntryForm myRef)
{
- myRef.modelessDlg = new CycleEndForm(Config.Data.WMsCount);
+ myRef.modelessDlg = new CycleEndForm(myRef.waterMeters.Length);
modelessDlg.Show();
}
- ///
- void OpenTestStartStatesDlg(EntryForm myRef)
- {
- myRef.modelessDlg = new TestStartEndForm(entryFormCfg, Config.Data.WMsCount, disabled);
- modelessDlg.Show();
- }
- ///
- void OpenTestEndStatesDlg(EntryForm myRef)
- {
- myRef.modelessDlg = new TestStartEndForm(entryFormCfg, Config.Data.WMsCount, wmStartStateStr, energyStartStateStr,
+ ///
+ void OpenTestStartStatesDlg(EntryForm myRef)
+ {
+ myRef.modelessDlg = new TestStartEndForm(entryFormCfg, myRef.waterMeters.Length, disabled);
+ modelessDlg.Show();
+ }
+ ///
+ void OpenTestEndStatesDlg(EntryForm myRef)
+ {
+ myRef.modelessDlg = new TestStartEndForm(entryFormCfg, myRef.waterMeters.Length, wmStartStateStr, energyStartStateStr,
disabled, refVolume, errLimLo, errLimHi, refEnergy, energyErrLimLo, energyErrLimHi);
- modelessDlg.Show();
- }
+ modelessDlg.Show();
+ }
- /// Start this operation
- public void Start()
- {
- resultSaved = false;
- switch (currentOp)
+ /// Start this operation
+ public void Start()
+ {
+ resultSaved = false;
+ switch (currentOp)
{
case CurrentOp.ShowFormAtCycleBeginning:
- if (!entryFormCfg.EnterSerialNrsAtTheEnd)
- {
- Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this);
- }
+ if (!entryFormCfg.EnterSerialNrsAtTheEnd)
+ {
+ Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this);
+ }
break;
case CurrentOp.ShowFormAtCycleEnd:
- if (entryFormCfg.EnterSerialNrsAtTheEnd)
- {
- Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this);
- }
- else if (entryFormCfg.ShowCycleEndForm)
- {
- Program.MainWnd.Invoke(new EntryFormDlgt(OpenEndDlg), this);
- }
+ if (entryFormCfg.EnterSerialNrsAtTheEnd)
+ {
+ Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this);
+ }
+ else if (entryFormCfg.ShowCycleEndForm)
+ {
+ Program.MainWnd.Invoke(new EntryFormDlgt(OpenEndDlg), this);
+ }
break;
- case CurrentOp.EnterTestStartStates:
- Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestStartStatesDlg), this);
- break;
- case CurrentOp.EnterTestEndStates:
- Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestEndStatesDlg), this);
- break;
- }
- }
+ case CurrentOp.EnterTestStartStates:
+ Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestStartStatesDlg), this);
+ break;
+ case CurrentOp.EnterTestEndStates:
+ Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestEndStatesDlg), this);
+ break;
+ }
+ }
- /// Run this operation
- /// Event.ResultsPrinted
- public Event Run()
- {
- if ((modelessDlg is IHasCompleted) && !(modelessDlg as IHasCompleted).Completed)
- {
- return Event.ModelessFormIsOpen;
- }
+ /// Run this operation
+ /// Event.ResultsPrinted
+ public Event Run()
+ {
+ if ((modelessDlg is IHasCompleted) && !(modelessDlg as IHasCompleted).Completed)
+ {
+ return Event.ModelessFormIsOpen;
+ }
- if (!resultSaved) /// This is to save the result only once
- {
- if ((!entryFormCfg.EnterSerialNrsAtTheEnd && currentOp == CurrentOp.ShowFormAtCycleBeginning) ||
- (entryFormCfg.EnterSerialNrsAtTheEnd && currentOp == CurrentOp.ShowFormAtCycleEnd))
- {
- CycleBeginningForm dlg = (modelessDlg as CycleBeginningForm);
- if (dlg != null)
- {
- purchaseOrder = dlg.PurchaseOrder;
+ if (!resultSaved) /// This is to save the result only once
+ {
+ if ((!entryFormCfg.EnterSerialNrsAtTheEnd && currentOp == CurrentOp.ShowFormAtCycleBeginning) ||
+ (entryFormCfg.EnterSerialNrsAtTheEnd && currentOp == CurrentOp.ShowFormAtCycleEnd))
+ {
+ CycleBeginningForm dlg = (modelessDlg as CycleBeginningForm);
+ if (dlg != null)
+ {
+ purchaseOrder = dlg.PurchaseOrder;
- for (int i = 0; i < Math.Min(dlg.WaterMetersCount, waterMeters.Length); i++)
- {
- if (waterMeters[i] != null)
- {
- serialNr[i] = waterMeters[i].SerialNr = dlg.SNText[i];
- disabled[i] = waterMeters[i].Disabled = dlg.Disabled[i];
- }
+ for (int i = 0; i < Math.Min(dlg.WaterMetersCount, waterMeters.Length); i++)
+ {
+ if (waterMeters[i] != null)
+ {
+ serialNr[i] = waterMeters[i].SerialNr = dlg.SNText[i];
+ disabled[i] = waterMeters[i].Disabled = dlg.Disabled[i];
+ }
}
- }
- }
- else if (entryFormCfg.ShowCycleEndForm && currentOp == CurrentOp.ShowFormAtCycleEnd)
- {
- CycleEndForm dlg = (modelessDlg as CycleEndForm);
- int count = waterMeters.Length;
- if ((dlg != null) && (count > dlg.WaterMetersCount)) count = dlg.WaterMetersCount;
+ }
+ }
+ else if (entryFormCfg.ShowCycleEndForm && currentOp == CurrentOp.ShowFormAtCycleEnd)
+ {
+ CycleEndForm dlg = (modelessDlg as CycleEndForm);
+ int count = Math.Min(waterMeters.Length, Config.Data.HeatMetersCount);
+ if ((dlg != null) && (count > dlg.WaterMetersCount)) count = dlg.WaterMetersCount;
- for (int i = 0; i < count; i++)
+ for (int i = 0; i < count; i++)
{
if (waterMeters[i] != null)
{
@@ -257,20 +257,20 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
wmCycleEndState[i] = waterMeters[i].EndState = (dlg != null) ? dlg.EndStateText[i] : string.Empty;
}
}
- }
+ }
else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestStartStates)
- {
+ {
/// Fixed start test - start
- TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
+ TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
if (dlg != null)
{
- for (int i = 0; i < dlg.WaterMetersCount; i++)
+ for (int i = 0; i < Math.Min(waterMeters.Length, Config.Data.HeatMetersCount); i++)
{
wmStartState[i] = dlg.WMStartState[i];
wmStartStateStr[i] = dlg.WMStartStateStr[i];
- energyStartState[i] = dlg.EnergyStartState[i];
- energyStartStateStr[i] = dlg.EnergyStartStateStr[i];
- }
+ energyStartState[i] = dlg.EnergyStartState[i];
+ energyStartStateStr[i] = dlg.EnergyStartStateStr[i];
+ }
}
}
else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestEndStates)
@@ -279,41 +279,41 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
if (dlg != null)
{
- for (int i = 0; i < dlg.WaterMetersCount; i++)
+ for (int i = 0; i < Math.Min(waterMeters.Length, Config.Data.HeatMetersCount); i++)
{
wmEndState[i] = dlg.WMEndState[i];
- energyEndState[i] = dlg.EnergyEndState[i];
- }
+ energyEndState[i] = dlg.EnergyEndState[i];
+ }
}
}
resultSaved = true;
- modelessDlg = null;
- }
+ modelessDlg = null;
+ }
- return Event.ModelessFormClosed; /// Form closed
- }
+ return Event.ModelessFormClosed; /// Form closed
+ }
- /// Stop this operation
- public void Stop()
- {
- if (modelessDlg is IHasCompleted)
- {
- UiBridge.Bridge.OnCloseModelessForm(this, null);
- modelessDlg = null;
- }
- currentOp = CurrentOp.None;
- }
+ /// Stop this operation
+ public void Stop()
+ {
+ if (modelessDlg is IHasCompleted)
+ {
+ UiBridge.Bridge.OnCloseModelessForm(this, null);
+ modelessDlg = null;
+ }
+ currentOp = CurrentOp.None;
+ }
- ///
- /// Updates test results with the information collected in watermeters.
- ///
- /// Test results to be updated with the information
- public void UpdateTestResults(Results.BatchResults batchResults)
- {
+ ///
+ /// Updates test results with the information collected in watermeters.
+ ///
+ /// Test results to be updated with the information
+ public void UpdateTestResults(Results.BatchResults batchResults)
+ {
foreach (var wm in batchResults.WaterMeters)
- {
+ {
if (wm != null && !wm.Disabled) wm.PurchaseOrder = PurchaseOrder;
- }
- }
- }
+ }
+ }
+ }
}
diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.cs
index 9853326a2..0caa62b2e 100644
--- a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.cs
@@ -61,7 +61,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
{
InitializeComponent();
- TextBoxesCount = 12;
+ TextBoxesCount = 6;
labels = new Label[]
{
@@ -169,10 +169,10 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
///
void ShuffleTextBoxes()
{
- if (Config.Data.WMsCount < TextBoxesCount)
+ if (Config.Data.HeatMetersCount < TextBoxesCount)
{
- int nrLines = Config.Data.WMsCount / Config.Data.LineSize;
- int gap = (TextBoxesCount - Config.Data.WMsCount) / nrLines;
+ int nrLines = Math.Min(1, Config.Data.HeatMetersCount / Config.Data.LineSize);
+ int gap = (TextBoxesCount - Config.Data.HeatMetersCount) / nrLines;
int dest = 0;
for (int l = 0; l < nrLines; l++)
@@ -188,7 +188,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
dest++;
}
}
- TextBoxesCount = Config.Data.WMsCount;
+ TextBoxesCount = Config.Data.HeatMetersCount;
}
}
diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
index bb7cc1a72..e05f93661 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
@@ -315,12 +315,32 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
}
while (!e.Contains(Event.ModelessFormClosed));
- for (int i = 0; i < Config.Data.WMsCount; i++)
+ if (heatMetersTestParams != null)
{
- BenchControl.Elde.FixedStartRegisterReader.RegisterReader registerReader =
- sensPath.RegisterReaders[i] as BenchControl.Elde.FixedStartRegisterReader.RegisterReader;
+ for (int i = 0; i < Config.Data.HeatMetersCount; i++)
+ {
+ BenchControl.Elde.FixedStartRegisterReader.RegisterReader volumeRegisterReader =
+ sensPath.RegisterReaders[2 * i] as BenchControl.Elde.FixedStartRegisterReader.RegisterReader;
- if (registerReader != null) registerReader.BeginWMState = dataEntryCmpnt.WMStartState(i);
+ BenchControl.Elde.FixedStartRegisterReader.RegisterReader energyRegisterReader =
+ sensPath.RegisterReaders[2 * i + 1] as BenchControl.Elde.FixedStartRegisterReader.RegisterReader;
+
+ if (volumeRegisterReader != null) volumeRegisterReader.BeginWMState = dataEntryCmpnt.WMStartState(i);
+ if (energyRegisterReader != null && dataEntryCmpnt is GenericDevices.IHasHeatMtrStatesForm)
+ {
+ energyRegisterReader.BeginWMState = (float)(dataEntryCmpnt as GenericDevices.IHasHeatMtrStatesForm).EnergyStartState(i);
+ }
+ }
+ }
+ else
+ {
+ for (int i = 0; i < Config.Data.WMsCount; i++)
+ {
+ BenchControl.Elde.FixedStartRegisterReader.RegisterReader registerReader =
+ sensPath.RegisterReaders[i] as BenchControl.Elde.FixedStartRegisterReader.RegisterReader;
+
+ if (registerReader != null) registerReader.BeginWMState = dataEntryCmpnt.WMStartState(i);
+ }
}
}
@@ -602,12 +622,32 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
while (!e.Contains(Event.ModelessFormClosed));
- for (int i = 0; i < Config.Data.WMsCount; i++)
+ if (heatMetersTestParams != null)
{
- BenchControl.Elde.FixedStartRegisterReader.RegisterReader registerReader =
- sensPath.RegisterReaders[i] as BenchControl.Elde.FixedStartRegisterReader.RegisterReader;
+ for (int i = 0; i < Config.Data.HeatMetersCount; i++)
+ {
+ BenchControl.Elde.FixedStartRegisterReader.RegisterReader volumeRegisterReader =
+ sensPath.RegisterReaders[2 * i] as BenchControl.Elde.FixedStartRegisterReader.RegisterReader;
- if (registerReader != null) registerReader.EndWMState = dataEntryCmpnt.WMEndState(i);
+ BenchControl.Elde.FixedStartRegisterReader.RegisterReader energyRegisterReader =
+ sensPath.RegisterReaders[2 * i + 1] as BenchControl.Elde.FixedStartRegisterReader.RegisterReader;
+
+ if (volumeRegisterReader != null) volumeRegisterReader.EndWMState = dataEntryCmpnt.WMEndState(i);
+ if (energyRegisterReader != null && dataEntryCmpnt is GenericDevices.IHasHeatMtrStatesForm)
+ {
+ energyRegisterReader.EndWMState = (float)(dataEntryCmpnt as GenericDevices.IHasHeatMtrStatesForm).EnergyEndState(i);
+ }
+ }
+ }
+ else
+ {
+ for (int i = 0; i < Config.Data.WMsCount; i++)
+ {
+ BenchControl.Elde.FixedStartRegisterReader.RegisterReader registerReader =
+ sensPath.RegisterReaders[i] as BenchControl.Elde.FixedStartRegisterReader.RegisterReader;
+
+ if (registerReader != null) registerReader.EndWMState = dataEntryCmpnt.WMEndState(i);
+ }
}
}
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index 84957335a..78c2b41e2 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("2.12.378.1")]
-[assembly: AssemblyFileVersion("2.12.378.1")]
+[assembly: AssemblyVersion("2.12.380.1")]
+[assembly: AssemblyFileVersion("2.12.380.1")]