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

(1) ResultsBrowser : Import of printer configuration, (2) DataEntry.Combined.CycleBeginningForm with Remark, ver. 2.18.1098

Browse Source
This commit is contained in:
Milan Hanajik
2018-12-14 16:47:32 +01:00
parent 55aff104ae
commit 20b2b9da97
14 changed files with 688 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/DataEntry/Combined/EntryForm.cs
+6 -3
View File
@@ -124,7 +124,7 @@ namespace TBF.BenchControl.DataEntry.Combined
///
void OpenBeginningDlg(EntryForm myRef)
{
myRef.modelessDlg = new CycleBeginningForm(Config.Data.CompoundWMsCount);
myRef.modelessDlg = new CycleBeginningForm(Config.Data.CompoundWMsCount, myRef.entryFormCfg.RemarkEnabled);
modelessDlg.Show();
}
///
@@ -203,9 +203,12 @@ namespace TBF.BenchControl.DataEntry.Combined
{
waterMeters[i].SerialNr = dlg.MainSNText[i];
waterMeters[i].SerialNrAux = dlg.AuxSNText[i];
disabled[i] = waterMeters[i].Disabled = dlg.Disabled[i];
}
if (dlg.RemarksEnabled)
{
waterMeters[i].Remark = dlg.Remark[i];
}
}
}
}
}