diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs
index 4e416aad4..021d353a3 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs
@@ -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
///
/// Properties set by the Begin and the End form
///
- 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;
diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs
index 98efb3213..01e44b5d3 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs
@@ -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;
- ///
- /// Properties set by the Begin and the End form
- ///
- public string ProtocolTitle { get { return protocolTitle; } } /// Only supported in Munich
- string protocolTitle;
-
- public string PurchaseOrder { get { return string.Empty; } } /// Not supported in Munich
+ ///
+ /// Properties set by the Begin and the End form
+ ///
+ 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++)
{
diff --git a/TestBenchFramework/BenchControl/GenericDevices/IHasProtocolTitle.cs b/TestBenchFramework/BenchControl/GenericDevices/IHasProtocolTitle.cs
deleted file mode 100644
index e3a017198..000000000
--- a/TestBenchFramework/BenchControl/GenericDevices/IHasProtocolTitle.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-namespace TBF.BenchControl.GenericDevices
-{
- public interface IHasProtocolTitle
- {
- string ProtocolTitle { get; }
- }
-}
diff --git a/TestBenchFramework/BenchControl/GenericDevices/IResultsPrinter.cs b/TestBenchFramework/BenchControl/GenericDevices/IResultsPrinter.cs
index 5d3c97257..3de7a5560 100644
--- a/TestBenchFramework/BenchControl/GenericDevices/IResultsPrinter.cs
+++ b/TestBenchFramework/BenchControl/GenericDevices/IResultsPrinter.cs
@@ -13,9 +13,8 @@ namespace TBF.BenchControl.GenericDevices
/// Prints the test cycle results, Events: Event.ResultsPrinted
///
/// Results to print
- /// Title of the printed protocol
/// Reference to the operation
- IOperation PrintResultsOp(Results.Entities.Batch batch, string title);
+ IOperation PrintResultsOp(Results.Entities.Batch batch);
///
/// When true printing at the end of cycle is bypassed.
diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Basic/Printer.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Basic/Printer.cs
index a2584de2d..d9bbced71 100644
--- a/TestBenchFramework/BenchControl/ResultsPrinters/Basic/Printer.cs
+++ b/TestBenchFramework/BenchControl/ResultsPrinters/Basic/Printer.cs
@@ -33,9 +33,8 @@ namespace TBF.BenchControl.ResultsPrinters.Basic
/// Prints the test cycle results, Events: Event.ResultsPrinted
///
/// Batch results to print
- /// This parameter is unused
/// Reference to the operation
- public IOperation PrintResultsOp(Results.Entities.Batch batch, string title)
+ public IOperation PrintResultsOp(Results.Entities.Batch batch)
{
this.batch = batch;
return this;
diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/Printer.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/Printer.cs
index 5e0e50303..1fbc25718 100644
--- a/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/Printer.cs
+++ b/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/Printer.cs
@@ -33,9 +33,8 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak
/// Prints the test cycle results, Events: Event.ResultsPrinted
///
/// Batch results to print
- /// This parameter is unused
/// Reference to the operation
- public IOperation PrintResultsOp(Results.Entities.Batch batch, string title)
+ public IOperation PrintResultsOp(Results.Entities.Batch batch)
{
this.batch = batch;
return this;
diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/Printer.cs b/TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/Printer.cs
index b7b50d161..835dc87c2 100644
--- a/TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/Printer.cs
+++ b/TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/Printer.cs
@@ -32,9 +32,8 @@ namespace TBF.BenchControl.ResultsPrinters.LabelPrinter
/// Prints the test cycle results, Events: Event.ResultsPrinted
///
/// Batch results to print
- /// This parameter is unused
/// Reference to the operation
- public IOperation PrintResultsOp(Results.Entities.Batch batch, string title)
+ public IOperation PrintResultsOp(Results.Entities.Batch batch)
{
this.batch = batch;
return this;
diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/Printer.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/Printer.cs
index 36fe21ae4..4426c3ec0 100644
--- a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/Printer.cs
+++ b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/Printer.cs
@@ -46,10 +46,10 @@ namespace TBF.BenchControl.ResultsPrinters.Munich
/// Procedure to print the results of
/// Results to print
/// Reference to the operation
- public IOperation PrintResultsOp(Results.Entities.Batch batch, string title)
+ public IOperation PrintResultsOp(Results.Entities.Batch batch)
{
this.batch = batch;
- this.Title = title;
+ this.Title = batch.ProtocolTitle;
return this;
}
diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Zapiska/Printer.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Zapiska/Printer.cs
index eb012d5ac..82012893f 100644
--- a/TestBenchFramework/BenchControl/ResultsPrinters/Zapiska/Printer.cs
+++ b/TestBenchFramework/BenchControl/ResultsPrinters/Zapiska/Printer.cs
@@ -33,9 +33,8 @@ namespace TBF.BenchControl.ResultsPrinters.Zapiska
/// Prints the test cycle results, Events: Event.ResultsPrinted
///
/// Batch results to print
- /// This parameter is unused
/// Reference to the operation
- public IOperation PrintResultsOp(Results.Entities.Batch batch, string title)
+ public IOperation PrintResultsOp(Results.Entities.Batch batch)
{
this.batch = batch;
return this;
diff --git a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
index 5414c5dc1..88a4e30c0 100644
--- a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
+++ b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
@@ -733,7 +733,6 @@ namespace TBF.BenchControl.Sequences
Bridge.OnActivity(this, "Enter protocol data");
//--------------------------------
- string protocolTitle = string.Empty;
GenericDevices.IDataEntry dataEntryCmpnt = TbfComponents.FindComponent(StateMachine.Procedure.DataEntry) as GenericDevices.IDataEntry;
if (dataEntryCmpnt != null)
{
@@ -751,11 +750,6 @@ namespace TBF.BenchControl.Sequences
}
while (!e.Contains(Event.ModelessFormClosed));
}
-
- if (dataEntryCmpnt is IHasProtocolTitle)
- {
- protocolTitle = (dataEntryCmpnt as IHasProtocolTitle).ProtocolTitle;
- }
dataEntryCmpnt.UpdateTestResults(BatchRslts);
}
@@ -783,7 +777,7 @@ namespace TBF.BenchControl.Sequences
IResultsPrinter printer = TbfComponents.FindComponent(printerName) as IResultsPrinter;
if (printer != null && !printer.SupressPrinting)
{
- savingAndPrintingRslts.AddOperation(printer.PrintResultsOp(ProcessData.BatchRslts.Batch, protocolTitle));
+ savingAndPrintingRslts.AddOperation(printer.PrintResultsOp(ProcessData.BatchRslts.Batch));
}
}
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index e152da02b..ed1a6253b 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("2.7.287.1")]
-[assembly: AssemblyFileVersion("2.7.287.1")]
+[assembly: AssemblyVersion("2.7.288.1")]
+[assembly: AssemblyFileVersion("2.7.288.1")]
diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj
index 538c9f0b1..0c796c39c 100644
--- a/TestBenchFramework/TBF.csproj
+++ b/TestBenchFramework/TBF.csproj
@@ -835,7 +835,6 @@
-