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

ProtocolTitle form Munich entry forms is saved in Batch data and used by Munich.Printer, ver.2.7.288

Browse Source
This commit is contained in:
Milan Hanajik
2016-05-19 21:22:17 +02:00
parent 4c2ef35ac1
commit baf87f63cc
12 changed files with 20 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs
+3 -5
View File
@@ -10,7 +10,7 @@ using TBF.BenchControl.GenericDevices;
namespace TBF.BenchControl.DataEntry.Munich
{
public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm, IHasProtocolTitle
public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm
{
private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm));
public override string ToString() { return string.Format("DataEntry.Munich({0})", Cfg.ToString(1)); }
@@ -20,9 +20,6 @@ namespace TBF.BenchControl.DataEntry.Munich
/// <summary>
/// Properties set by the Begin and the End form
/// </summary>
public string ProtocolTitle { get { return protocolTitle; } } /// Only supported in Munich
string protocolTitle;
public string PurchaseOrder { get { return string.Empty; } } /// Not supported in Munich
string[] serialNr;
@@ -153,6 +150,8 @@ namespace TBF.BenchControl.DataEntry.Munich
}
else if (modelessDlg is CycleEndForm)
{
Sequences.ProcessData.BatchRslts.Batch.ProtocolTitle = (modelessDlg as CycleEndForm).ProtocolTitle;
if (count >= 1 && wMeters[0] != null)
{
wMeters[0].EndState = (modelessDlg as CycleEndForm).MainStateText[0];
@@ -177,7 +176,6 @@ namespace TBF.BenchControl.DataEntry.Munich
wMeters[2].QFall = (modelessDlg as CycleEndForm).QFall[2];
wMeters[2].YearOfProduction = (modelessDlg as CycleEndForm).YearOfProduction[2];
}
protocolTitle = (modelessDlg as CycleEndForm).ProtocolTitle;
}
resultSaved = true;
modelessDlg = null;
TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs
+7 -10
View File
@@ -10,20 +10,17 @@ using TBF.BenchControl.GenericDevices;
namespace TBF.BenchControl.DataEntry.Munich3
{
public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm, IHasProtocolTitle
public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm
{
private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm));
public override string ToString() { return string.Format("DataEntry.Munich3({0})", Cfg.ToString(1)); }
readonly EntryFormCfg entryFormCfg;
/// <summary>
/// Properties set by the Begin and the End form
/// </summary>
public string ProtocolTitle { get { return protocolTitle; } } /// Only supported in Munich
string protocolTitle;
public string PurchaseOrder { get { return string.Empty; } } /// Not supported in Munich
/// <summary>
/// Properties set by the Begin and the End form
/// </summary>
public string PurchaseOrder { get { return string.Empty; } } /// Not supported in Munich
string[] serialNr;
public string SerialNr(int wmNr) { return (wmNr >= 0 && wmNr < serialNr.Length) ? serialNr[wmNr] : string.Empty; }
@@ -155,8 +152,8 @@ namespace TBF.BenchControl.DataEntry.Munich3
else if (modelessDlg is CycleEndForm)
{
CycleEndForm dlg = (modelessDlg as CycleEndForm);
protocolTitle = dlg.ProtocolTitle;
Sequences.ProcessData.BatchRslts.Batch.ProtocolTitle = dlg.ProtocolTitle;
for (int i = 0; i < Math.Min(dlg.WaterMetersCount, waterMeters.Length); i++)
{