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

DataEntry.Standard#.TestStartEndForm disabled text boxes for meters where the related register reader == null, ver. 2.18.1110

Browse Source
This commit is contained in:
Milan Hanajik
2019-01-14 13:24:34 +02:00
parent d3ca871eb5
commit f180af692f
7 changed files with 58 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs
+11 -5
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2015-2017 Sensus Metering Systems
/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -136,7 +136,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
///
void OpenTestStartStatesDlg(EntryFormNoStartEnd myRef)
{
myRef.modelessDlg = new TestStartEndForm(myRef.waterMeters.Length, myRef.regReaders, disabled);
myRef.modelessDlg = new TestStartEndForm(Config.Data.WMsCount, myRef.regReaders, disabled);
modelessDlg.Show();
}
///
@@ -229,8 +229,11 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
for (int i = 0; i < dlg.WaterMetersCount; i++)
{
wmStartState[i] = dlg.WMStartState[i];
wmStartStateStr[i] = dlg.WMStartStateStr[i];
if (!(((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null))))
{
wmStartState[i] = dlg.WMStartState[i];
wmStartStateStr[i] = dlg.WMStartStateStr[i];
}
}
}
}
@@ -242,7 +245,10 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
for (int i = 0; i < dlg.WaterMetersCount; i++)
{
wmEndState[i] = dlg.WMEndState[i];
if (!(((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null))))
{
wmEndState[i] = dlg.WMEndState[i];
}
}
}
}
TBF/BenchControl/DataEntry/Standard12/TestStartEndForm.cs
+7 -7
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2015-2017 Sensus Metering Systems
/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -133,10 +133,10 @@ namespace TBF.BenchControl.DataEntry.Standard12
/// </summary>
void ShuffleTextBoxes()
{
if (Config.Data.WMsCount < TextBoxesCount)
if (TextBoxesCount > WaterMetersCount)
{
int nrLines = Config.Data.WMsCount / Config.Data.LineSize;
int gap = (TextBoxesCount - Config.Data.WMsCount) / nrLines;
int nrLines = WaterMetersCount / Config.Data.LineSize;
int gap = (TextBoxesCount - WaterMetersCount) / nrLines;
int dest = 0;
for (int l = 0; l < nrLines; l++)
@@ -149,7 +149,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
dest++;
}
}
TextBoxesCount = Config.Data.WMsCount;
TextBoxesCount = WaterMetersCount;
}
}
@@ -174,7 +174,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
startTextBoxes[i].Text = WMStartStateStr[i];
}
if (disabled != null && i < disabled.Length && disabled[i])
if (((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null)))
{
endTextBoxes[i].Enabled = false;
}
@@ -189,7 +189,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
for (int i = 0; i < TextBoxesCount; i++)
{
if (disabled != null && i < disabled.Length && disabled[i])
if (((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null)))
{
startTextBoxes[i].Enabled = false;
}
TBF/BenchControl/DataEntry/Standard24/EntryFormNoStartEnd.cs
+11 -5
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2015-2017 Sensus Metering Systems
/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -136,7 +136,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
///
void OpenTestStartStatesDlg(EntryFormNoStartEnd myRef)
{
myRef.modelessDlg = new TestStartEndForm(myRef.waterMeters.Length, myRef.regReaders, myRef.disabled);
myRef.modelessDlg = new TestStartEndForm(Config.Data.WMsCount, myRef.regReaders, myRef.disabled);
modelessDlg.Show();
}
///
@@ -229,8 +229,11 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
for (int i = 0; i < dlg.WaterMetersCount; i++)
{
wmStartState[i] = dlg.WMStartState[i];
wmStartStateStr[i] = dlg.WMStartStateStr[i];
if (!(((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null))))
{
wmStartState[i] = dlg.WMStartState[i];
wmStartStateStr[i] = dlg.WMStartStateStr[i];
}
}
}
}
@@ -242,7 +245,10 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
for (int i = 0; i < dlg.WaterMetersCount; i++)
{
wmEndState[i] = dlg.WMEndState[i];
if (!(((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null))))
{
wmEndState[i] = dlg.WMEndState[i];
}
}
}
}
TBF/BenchControl/DataEntry/Standard24/TestStartEndForm.cs
+7 -7
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2015-2017 Sensus Metering Systems
/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -138,10 +138,10 @@ namespace TBF.BenchControl.DataEntry.Standard24
/// </summary>
void ShuffleTextBoxes()
{
if (Config.Data.WMsCount < TextBoxesCount)
if (TextBoxesCount > WaterMetersCount)
{
int nrLines = Config.Data.WMsCount / Config.Data.LineSize;
int gap = (TextBoxesCount - Config.Data.WMsCount) / nrLines;
int nrLines = WaterMetersCount / Config.Data.LineSize;
int gap = (TextBoxesCount - WaterMetersCount) / nrLines;
int dest = 0;
for (int l = 0; l < nrLines; l++)
@@ -154,7 +154,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
dest++;
}
}
TextBoxesCount = Config.Data.WMsCount;
TextBoxesCount = WaterMetersCount;
}
}
@@ -181,7 +181,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
startTextBoxes[i].Text = WMStartStateStr[i];
}
if (disabled != null && i < disabled.Length && disabled[i])
if (((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null)))
{
endTextBoxes[i].Enabled = false;
}
@@ -196,7 +196,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
for (int i = 0; i < TextBoxesCount; i++)
{
if (disabled != null && i < disabled.Length && disabled[i])
if (((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null)))
{
startTextBoxes[i].Enabled = false;
}
TBF/BenchControl/DataEntry/Standard48/EntryFormNoStartEnd.cs
+13 -7
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2015-2017 Sensus Metering Systems
/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -136,7 +136,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
///
void OpenTestStartStatesDlg(EntryFormNoStartEnd myRef)
{
myRef.modelessDlg = new TestStartEndForm(myRef.waterMeters.Length, myRef.regReaders, disabled);
myRef.modelessDlg = new TestStartEndForm(Config.Data.WMsCount, myRef.regReaders, disabled);
modelessDlg.Show();
}
///
@@ -221,7 +221,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
}
}
}
else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestStartStates)
else if ((modelessDlg is TestStartEndForm) && (currentOp == CurrentOp.EnterTestStartStates))
{
/// Fixed start test - start
TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
@@ -229,12 +229,15 @@ namespace TBF.BenchControl.DataEntry.Standard48
{
for (int i = 0; i < dlg.WaterMetersCount; i++)
{
wmStartState[i] = dlg.WMStartState[i];
wmStartStateStr[i] = dlg.WMStartStateStr[i];
if (!(((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null))))
{
wmStartState[i] = dlg.WMStartState[i];
wmStartStateStr[i] = dlg.WMStartStateStr[i];
}
}
}
}
else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestEndStates)
else if ((modelessDlg is TestStartEndForm) && (currentOp == CurrentOp.EnterTestEndStates))
{
/// Fixed start test - end
TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
@@ -242,7 +245,10 @@ namespace TBF.BenchControl.DataEntry.Standard48
{
for (int i = 0; i < dlg.WaterMetersCount; i++)
{
wmEndState[i] = dlg.WMEndState[i];
if (!(((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null))))
{
wmEndState[i] = dlg.WMEndState[i];
}
}
}
}
TBF/BenchControl/DataEntry/Standard48/TestStartEndForm.cs
+7 -7
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2015-2017 Sensus Metering Systems
/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -142,10 +142,10 @@ namespace TBF.BenchControl.DataEntry.Standard48
/// </summary>
void ShuffleTextBoxes()
{
if (Config.Data.WMsCount < TextBoxesCount)
if (TextBoxesCount > WaterMetersCount)
{
int nrLines = Config.Data.WMsCount / Config.Data.LineSize;
int gap = (TextBoxesCount - Config.Data.WMsCount) / nrLines;
int nrLines = WaterMetersCount / Config.Data.LineSize;
int gap = (TextBoxesCount - WaterMetersCount) / nrLines;
int dest = 0;
for (int l = 0; l < nrLines; l++)
@@ -158,7 +158,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
dest++;
}
}
TextBoxesCount = Config.Data.WMsCount;
TextBoxesCount = WaterMetersCount;
}
}
@@ -185,7 +185,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
startTextBoxes[i].Text = WMStartStateStr[i];
}
if (disabled != null && i < disabled.Length && disabled[i])
if (((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null)))
{
endTextBoxes[i].Enabled = false;
}
@@ -200,7 +200,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
{
for (int i = 0; i < TextBoxesCount; i++)
{
if (disabled != null && i < disabled.Length && disabled[i])
if (((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null)))
{
startTextBoxes[i].Enabled = false;
}