From eee5e5dc8cfceecbf3c954c2f8377d2e2d6e376e Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sat, 29 Oct 2016 20:31:42 +0200 Subject: [PATCH] Bug fixes in DataEntry.HeatMeters12 --- .../DataEntry/HeatMeters12/EntryForm.cs | 30 +++++++++---------- .../HeatMeters12/TestStartEndForm.cs | 8 ++--- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryForm.cs index dd9523207..96a25979d 100644 --- a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryForm.cs @@ -87,15 +87,15 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12 { 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; log.Debug(this.ToString()); @@ -166,19 +166,19 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12 /// 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); + myRef.modelessDlg = new TestStartEndForm(entryFormCfg, myRef.waterMeters.Length, disabled); modelessDlg.Show(); } /// void OpenTestEndStatesDlg(EntryForm myRef) { - myRef.modelessDlg = new TestStartEndForm(entryFormCfg, Config.Data.WMsCount, wmStartStateStr, energyStartStateStr, + myRef.modelessDlg = new TestStartEndForm(entryFormCfg, myRef.waterMeters.Length, wmStartStateStr, energyStartStateStr, disabled, refVolume, errLimLo, errLimHi, refEnergy, energyErrLimLo, energyErrLimHi); modelessDlg.Show(); } @@ -246,7 +246,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12 else if (entryFormCfg.ShowCycleEndForm && currentOp == CurrentOp.ShowFormAtCycleEnd) { CycleEndForm dlg = (modelessDlg as CycleEndForm); - int count = waterMeters.Length; + 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++) @@ -264,7 +264,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12 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]; @@ -279,7 +279,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12 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]; diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs index 030b59d43..61a83110b 100644 --- a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs @@ -173,10 +173,10 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12 /// 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.Max(1, Config.Data.HeatMetersCount / Config.Data.LineSize); + int gap = (TextBoxesCount - Config.Data.HeatMetersCount) / nrLines; int dest = 0; for (int l = 0; l < nrLines; l++) @@ -192,7 +192,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12 dest++; } } - TextBoxesCount = Config.Data.WMsCount; + TextBoxesCount = Config.Data.HeatMetersCount; } }