Separate string SerialNrAux and int SerialNrEx in Results. Other fixes. Version 2.1.180
This commit is contained in:
@@ -201,7 +201,7 @@ namespace TBF.BenchControl.DataEntry.Combined
|
||||
if (waterMeters[i] != null)
|
||||
{
|
||||
serialNr[2 * i] = waterMeters[i].SerialNr = dlg.MainSNText[i];
|
||||
serialNr[2 * i + 1] = waterMeters[i].SerialNrEx = dlg.AuxSNText[i];
|
||||
serialNr[2 * i + 1] = waterMeters[i].SerialNrAux = dlg.AuxSNText[i];
|
||||
disabled[i] = waterMeters[i].Disabled = dlg.Disabled[i];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -143,11 +143,11 @@ namespace TBF.BenchControl.DataEntry.Munich
|
||||
if (modelessDlg is CycleBeginningForm)
|
||||
{
|
||||
if (wMeters.Length >= 1 && wMeters[0] != null) wMeters[0].SerialNr = (modelessDlg as CycleBeginningForm).MainSNText[0];
|
||||
if (wMeters.Length >= 1 && wMeters[0] != null) wMeters[0].SerialNrEx = (modelessDlg as CycleBeginningForm).AuxSNText[0];
|
||||
if (wMeters.Length >= 1 && wMeters[0] != null) wMeters[0].SerialNrAux = (modelessDlg as CycleBeginningForm).AuxSNText[0];
|
||||
if (wMeters.Length >= 2 && wMeters[1] != null) wMeters[1].SerialNr = (modelessDlg as CycleBeginningForm).MainSNText[1];
|
||||
if (wMeters.Length >= 2 && wMeters[1] != null) wMeters[1].SerialNrEx = (modelessDlg as CycleBeginningForm).AuxSNText[1];
|
||||
if (wMeters.Length >= 2 && wMeters[1] != null) wMeters[1].SerialNrAux = (modelessDlg as CycleBeginningForm).AuxSNText[1];
|
||||
if (wMeters.Length >= 3 && wMeters[2] != null) wMeters[2].SerialNr = (modelessDlg as CycleBeginningForm).MainSNText[2];
|
||||
if (wMeters.Length >= 3 && wMeters[2] != null) wMeters[2].SerialNrEx = (modelessDlg as CycleBeginningForm).AuxSNText[2];
|
||||
if (wMeters.Length >= 3 && wMeters[2] != null) wMeters[2].SerialNrAux = (modelessDlg as CycleBeginningForm).AuxSNText[2];
|
||||
}
|
||||
else if (modelessDlg is CycleEndForm)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user