DataEntry.StandardCamera.CycleEndFormMunich and added ProtocolTitle# parameters added.

This commit is contained in:
Milan Hanajik 2017-11-22 13:35:44 +01:00
parent 53bab003bf
commit 2322a145f6
10 changed files with 1052 additions and 44 deletions

View File

@ -70,7 +70,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
/// Constructor
/// </summary>
/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
public CycleBeginningForm(int waterMetersCount)
public CycleBeginningForm(int waterMetersCount, bool hideOrder)
: this()
{
this.WaterMetersCount = waterMetersCount;
@ -80,6 +80,8 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
int lineSize = (WaterMetersCount <= 6) ? WaterMetersCount : Config.Data.LineSize;
ShuffleTextBoxes(Config.Data.WMsCount, lineSize);
if (hideOrder) orderGroupBox.Visible = false;
Height = 155 + lineSize * 44;
}
@ -115,7 +117,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
{
Localize();
PrepareOrderCombo(orderComboBox);
if (orderGroupBox.Visible) PrepareOrderCombo(orderComboBox);
for (int i = 0; i < textBoxesCount; i++)
{
@ -159,13 +161,16 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
private void okButton_Click(object sender, EventArgs e)
{
PurchaseOrder = orderComboBox.Text;
Program.LocalSettings.UpdateHistory(orderComboBox.Text,
ref Program.LocalSettings.PurchaseOrderHistory
if (orderGroupBox.Visible)
{
PurchaseOrder = orderComboBox.Text;
Program.LocalSettings.UpdateHistory(orderComboBox.Text,
ref Program.LocalSettings.PurchaseOrderHistory
#if FUZHOU150 || FUZHOU300
, 20
, 20
#endif
);
);
}
Program.LocalSettings.LastSNTexts = SNText;

View File

@ -0,0 +1,194 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
///
using System;
using System.Windows.Forms;
using log4net;
using TBF.Resources;
namespace TBF.BenchControl.DataEntry.StandardCamera
{
public partial class CycleEndFormMunich : Form, GenericDevices.IHasCompleted
{
private static readonly ILog log = LogManager.GetLogger(typeof(CycleEndFormMunich));
/// <summary> Number of text boxes for serial numbers </summary>
public readonly int WaterMetersCount;
// To be set before the form opens
public string ProtocolName1;
public string ProtocolName2;
public string ProtocolName3;
public string ProtocolName4;
// To be retrieved after the form closes
public string ProtocolTitle;
public string[] EndStateText;
public int[] YearOfProduction;
// Set to 'true' when the form closes
public bool Completed { get { return completed; } }
bool completed;
/// <summary>
/// Constructor
/// </summary>
/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
public CycleEndFormMunich(int waterMetersCount)
{
InitializeComponent();
ControlBox = false;
this.WaterMetersCount = waterMetersCount;
EndStateText = new string[WaterMetersCount];
YearOfProduction = new int[WaterMetersCount];
completed = false;
StartForceCloseHandler();
}
/// <summary> Parameterless constructor for 3 watermeters </summary>
public CycleEndFormMunich()
: this(3)
{
}
private void CycleEndForm_Load(object sender, EventArgs e)
{
Localize();
radioButton1.Text = ProtocolName1;
radioButton2.Text = ProtocolName2;
radioButton3.Text = ProtocolName3;
radioButton4.Text = ProtocolName4;
if (WaterMetersCount < 1) groupBox1.Visible = false;
if (WaterMetersCount < 2) groupBox2.Visible = false;
if (WaterMetersCount < 3) groupBox3.Visible = false;
if (WaterMetersCount < 4) groupBox4.Visible = false;
if (WaterMetersCount < 5) groupBox5.Visible = false;
if (WaterMetersCount < 6) groupBox6.Visible = false;
if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 1)
{
YearOfProduction[0] = Sequences.ProcessData.BatchRslts.WaterMeters[0].YearOfProduction;
yearOfProduction1TextBox.Text = YearOfProduction[0].ToString();
}
if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 2)
{
YearOfProduction[1] = Sequences.ProcessData.BatchRslts.WaterMeters[1].YearOfProduction;
yearOfProduction2TextBox.Text = YearOfProduction[1].ToString();
}
if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 3)
{
YearOfProduction[2] = Sequences.ProcessData.BatchRslts.WaterMeters[2].YearOfProduction;
yearOfProduction3TextBox.Text = YearOfProduction[2].ToString();
}
if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 4)
{
YearOfProduction[3] = Sequences.ProcessData.BatchRslts.WaterMeters[3].YearOfProduction;
yearOfProduction4TextBox.Text = YearOfProduction[3].ToString();
}
if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 5)
{
YearOfProduction[4] = Sequences.ProcessData.BatchRslts.WaterMeters[4].YearOfProduction;
yearOfProduction5TextBox.Text = YearOfProduction[4].ToString();
}
if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 6)
{
YearOfProduction[5] = Sequences.ProcessData.BatchRslts.WaterMeters[5].YearOfProduction;
yearOfProduction6TextBox.Text = YearOfProduction[5].ToString();
}
Height = 228 + 90 * WaterMetersCount;
AnyRadioButtonChanged();
}
void Localize()
{
Text = Strings.Data;
protocolGroupBox.Text = Strings.Protocol;
okButton.Text = Strings.OkBtnText;
groupBox1.Text = Strings.Water_Meter + " 1";
groupBox2.Text = Strings.Water_Meter + " 2";
groupBox3.Text = Strings.Water_Meter + " 3";
groupBox4.Text = Strings.Water_Meter + " 4";
groupBox5.Text = Strings.Water_Meter + " 5";
groupBox6.Text = Strings.Water_Meter + " 6";
label1.Text = label2.Text = label3.Text = label4.Text
= label5.Text = label6.Text = Strings.State;
yearOfProduction1Label.Text = yearOfProduction2Label.Text
= yearOfProduction3Label.Text = yearOfProduction4Label.Text
= yearOfProduction5Label.Text = yearOfProduction6Label.Text = Strings.Year_of_production;
}
private void okButton_Click(object sender, EventArgs e)
{
if (radioButton1.Checked) ProtocolTitle = ProtocolName1;
else if (radioButton2.Checked) ProtocolTitle = ProtocolName2;
else if (radioButton3.Checked) ProtocolTitle = ProtocolName3;
else if (radioButton4.Checked) ProtocolTitle = ProtocolName4;
if (WaterMetersCount >= 1) EndStateText[0] = textBox1.Text;
if (WaterMetersCount >= 2) EndStateText[1] = textBox2.Text;
if (WaterMetersCount >= 3) EndStateText[2] = textBox3.Text;
if (WaterMetersCount >= 4) EndStateText[3] = textBox4.Text;
if (WaterMetersCount >= 5) EndStateText[4] = textBox5.Text;
if (WaterMetersCount >= 6) EndStateText[5] = textBox6.Text;
if (ShowYear())
{
int year;
if (WaterMetersCount >= 1 && int.TryParse(yearOfProduction1TextBox.Text, out year)) YearOfProduction[0] = year;
if (WaterMetersCount >= 2 && int.TryParse(yearOfProduction2TextBox.Text, out year)) YearOfProduction[1] = year;
if (WaterMetersCount >= 3 && int.TryParse(yearOfProduction3TextBox.Text, out year)) YearOfProduction[2] = year;
if (WaterMetersCount >= 4 && int.TryParse(yearOfProduction4TextBox.Text, out year)) YearOfProduction[3] = year;
if (WaterMetersCount >= 5 && int.TryParse(yearOfProduction5TextBox.Text, out year)) YearOfProduction[4] = year;
if (WaterMetersCount >= 6 && int.TryParse(yearOfProduction6TextBox.Text, out year)) YearOfProduction[5] = year;
}
completed = true;
Close();
}
#region Forced close handling
public void StartForceCloseHandler()
{
UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
{
if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnForceClose), sender, args); }
else OnForceClose(sender, args);
};
}
void OnForceClose(object sender, EventArgs args)
{
DialogResult = DialogResult.Cancel;
Close();
}
#endregion
private void radioButton1_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); }
private void radioButton2_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); }
private void radioButton3_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); }
private void radioButton4_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); }
bool ShowYear()
{
return radioButton2.Checked || radioButton3.Checked || radioButton4.Checked;
}
void AnyRadioButtonChanged()
{
yearOfProduction1TextBox.Visible = yearOfProduction2TextBox.Visible = yearOfProduction3TextBox.Visible =
yearOfProduction4TextBox.Visible = yearOfProduction5TextBox.Visible = yearOfProduction6TextBox.Visible =
yearOfProduction1Label.Visible = yearOfProduction2Label.Visible = yearOfProduction3Label.Visible =
yearOfProduction4Label.Visible = yearOfProduction5Label.Visible = yearOfProduction6Label.Visible = ShowYear();
}
}
}

View File

@ -0,0 +1,514 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
///
namespace TBF.BenchControl.DataEntry.StandardCamera
{
partial class CycleEndFormMunich
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.yearOfProduction2TextBox = new System.Windows.Forms.TextBox();
this.yearOfProduction2Label = new System.Windows.Forms.Label();
this.textBox2 = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.yearOfProduction1TextBox = new System.Windows.Forms.TextBox();
this.yearOfProduction1Label = new System.Windows.Forms.Label();
this.textBox1 = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.okButton = new System.Windows.Forms.Button();
this.protocolGroupBox = new System.Windows.Forms.GroupBox();
this.radioButton4 = new System.Windows.Forms.RadioButton();
this.radioButton3 = new System.Windows.Forms.RadioButton();
this.radioButton2 = new System.Windows.Forms.RadioButton();
this.radioButton1 = new System.Windows.Forms.RadioButton();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.yearOfProduction3TextBox = new System.Windows.Forms.TextBox();
this.yearOfProduction3Label = new System.Windows.Forms.Label();
this.textBox3 = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.yearOfProduction4TextBox = new System.Windows.Forms.TextBox();
this.yearOfProduction4Label = new System.Windows.Forms.Label();
this.textBox4 = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.yearOfProduction5TextBox = new System.Windows.Forms.TextBox();
this.yearOfProduction5Label = new System.Windows.Forms.Label();
this.textBox5 = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.yearOfProduction6TextBox = new System.Windows.Forms.TextBox();
this.yearOfProduction6Label = new System.Windows.Forms.Label();
this.textBox6 = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout();
this.protocolGroupBox.SuspendLayout();
this.groupBox3.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox6.SuspendLayout();
this.SuspendLayout();
//
// groupBox2
//
this.groupBox2.Controls.Add(this.yearOfProduction2TextBox);
this.groupBox2.Controls.Add(this.yearOfProduction2Label);
this.groupBox2.Controls.Add(this.textBox2);
this.groupBox2.Controls.Add(this.label2);
this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.groupBox2.ForeColor = System.Drawing.Color.Black;
this.groupBox2.Location = new System.Drawing.Point(25, 284);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(682, 81);
this.groupBox2.TabIndex = 2;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Wasserzähler 2";
//
// yearOfProduction2TextBox
//
this.yearOfProduction2TextBox.Location = new System.Drawing.Point(559, 31);
this.yearOfProduction2TextBox.Name = "yearOfProduction2TextBox";
this.yearOfProduction2TextBox.Size = new System.Drawing.Size(98, 31);
this.yearOfProduction2TextBox.TabIndex = 11;
//
// yearOfProduction2Label
//
this.yearOfProduction2Label.AutoSize = true;
this.yearOfProduction2Label.Location = new System.Drawing.Point(351, 34);
this.yearOfProduction2Label.Name = "yearOfProduction2Label";
this.yearOfProduction2Label.Size = new System.Drawing.Size(188, 23);
this.yearOfProduction2Label.TabIndex = 10;
this.yearOfProduction2Label.Text = "Year of production";
//
// textBox2
//
this.textBox2.Location = new System.Drawing.Point(160, 31);
this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(163, 31);
this.textBox2.TabIndex = 1;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(18, 34);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(74, 23);
this.label2.TabIndex = 0;
this.label2.Text = "Stand:";
//
// groupBox1
//
this.groupBox1.Controls.Add(this.yearOfProduction1TextBox);
this.groupBox1.Controls.Add(this.yearOfProduction1Label);
this.groupBox1.Controls.Add(this.textBox1);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.groupBox1.ForeColor = System.Drawing.Color.Black;
this.groupBox1.Location = new System.Drawing.Point(25, 194);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(682, 81);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Wasserzähler 1";
//
// yearOfProduction1TextBox
//
this.yearOfProduction1TextBox.Location = new System.Drawing.Point(559, 31);
this.yearOfProduction1TextBox.Name = "yearOfProduction1TextBox";
this.yearOfProduction1TextBox.Size = new System.Drawing.Size(98, 31);
this.yearOfProduction1TextBox.TabIndex = 10;
//
// yearOfProduction1Label
//
this.yearOfProduction1Label.AutoSize = true;
this.yearOfProduction1Label.Location = new System.Drawing.Point(351, 34);
this.yearOfProduction1Label.Name = "yearOfProduction1Label";
this.yearOfProduction1Label.Size = new System.Drawing.Size(188, 23);
this.yearOfProduction1Label.TabIndex = 9;
this.yearOfProduction1Label.Text = "Year of production";
//
// textBox1
//
this.textBox1.Location = new System.Drawing.Point(160, 31);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(163, 31);
this.textBox1.TabIndex = 1;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(18, 34);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(74, 23);
this.label1.TabIndex = 0;
this.label1.Text = "Stand:";
//
// okButton
//
this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.okButton.ForeColor = System.Drawing.Color.Black;
this.okButton.Location = new System.Drawing.Point(584, 29);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(98, 63);
this.okButton.TabIndex = 7;
this.okButton.Text = "OK";
this.okButton.UseVisualStyleBackColor = true;
this.okButton.Click += new System.EventHandler(this.okButton_Click);
//
// protocolGroupBox
//
this.protocolGroupBox.Controls.Add(this.radioButton4);
this.protocolGroupBox.Controls.Add(this.radioButton3);
this.protocolGroupBox.Controls.Add(this.radioButton2);
this.protocolGroupBox.Controls.Add(this.radioButton1);
this.protocolGroupBox.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.protocolGroupBox.Location = new System.Drawing.Point(25, 13);
this.protocolGroupBox.Name = "protocolGroupBox";
this.protocolGroupBox.Size = new System.Drawing.Size(362, 175);
this.protocolGroupBox.TabIndex = 0;
this.protocolGroupBox.TabStop = false;
this.protocolGroupBox.Text = "Protokoll";
//
// radioButton4
//
this.radioButton4.AutoSize = true;
this.radioButton4.Location = new System.Drawing.Point(34, 133);
this.radioButton4.Name = "radioButton4";
this.radioButton4.Size = new System.Drawing.Size(152, 27);
this.radioButton4.TabIndex = 3;
this.radioButton4.TabStop = true;
this.radioButton4.Text = "radioButton4";
this.radioButton4.UseVisualStyleBackColor = true;
this.radioButton4.CheckedChanged += new System.EventHandler(this.radioButton4_CheckedChanged);
//
// radioButton3
//
this.radioButton3.AutoSize = true;
this.radioButton3.Location = new System.Drawing.Point(34, 100);
this.radioButton3.Name = "radioButton3";
this.radioButton3.Size = new System.Drawing.Size(152, 27);
this.radioButton3.TabIndex = 2;
this.radioButton3.TabStop = true;
this.radioButton3.Text = "radioButton3";
this.radioButton3.UseVisualStyleBackColor = true;
this.radioButton3.CheckedChanged += new System.EventHandler(this.radioButton3_CheckedChanged);
//
// radioButton2
//
this.radioButton2.AutoSize = true;
this.radioButton2.Location = new System.Drawing.Point(34, 67);
this.radioButton2.Name = "radioButton2";
this.radioButton2.Size = new System.Drawing.Size(152, 27);
this.radioButton2.TabIndex = 1;
this.radioButton2.TabStop = true;
this.radioButton2.Text = "radioButton2";
this.radioButton2.UseVisualStyleBackColor = true;
this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged);
//
// radioButton1
//
this.radioButton1.AutoSize = true;
this.radioButton1.Checked = true;
this.radioButton1.Location = new System.Drawing.Point(34, 34);
this.radioButton1.Name = "radioButton1";
this.radioButton1.Size = new System.Drawing.Size(152, 27);
this.radioButton1.TabIndex = 0;
this.radioButton1.TabStop = true;
this.radioButton1.Text = "radioButton1";
this.radioButton1.UseVisualStyleBackColor = true;
this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
//
// groupBox3
//
this.groupBox3.Controls.Add(this.yearOfProduction3TextBox);
this.groupBox3.Controls.Add(this.yearOfProduction3Label);
this.groupBox3.Controls.Add(this.textBox3);
this.groupBox3.Controls.Add(this.label3);
this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.groupBox3.ForeColor = System.Drawing.Color.Black;
this.groupBox3.Location = new System.Drawing.Point(25, 374);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(682, 81);
this.groupBox3.TabIndex = 3;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Wasserzähler 3";
//
// yearOfProduction3TextBox
//
this.yearOfProduction3TextBox.Location = new System.Drawing.Point(559, 31);
this.yearOfProduction3TextBox.Name = "yearOfProduction3TextBox";
this.yearOfProduction3TextBox.Size = new System.Drawing.Size(98, 31);
this.yearOfProduction3TextBox.TabIndex = 11;
//
// yearOfProduction3Label
//
this.yearOfProduction3Label.AutoSize = true;
this.yearOfProduction3Label.Location = new System.Drawing.Point(351, 34);
this.yearOfProduction3Label.Name = "yearOfProduction3Label";
this.yearOfProduction3Label.Size = new System.Drawing.Size(188, 23);
this.yearOfProduction3Label.TabIndex = 10;
this.yearOfProduction3Label.Text = "Year of production";
//
// textBox3
//
this.textBox3.Location = new System.Drawing.Point(160, 31);
this.textBox3.Name = "textBox3";
this.textBox3.Size = new System.Drawing.Size(163, 31);
this.textBox3.TabIndex = 1;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(18, 34);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(74, 23);
this.label3.TabIndex = 0;
this.label3.Text = "Stand:";
//
// groupBox4
//
this.groupBox4.Controls.Add(this.yearOfProduction4TextBox);
this.groupBox4.Controls.Add(this.yearOfProduction4Label);
this.groupBox4.Controls.Add(this.textBox4);
this.groupBox4.Controls.Add(this.label4);
this.groupBox4.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.groupBox4.ForeColor = System.Drawing.Color.Black;
this.groupBox4.Location = new System.Drawing.Point(25, 464);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(682, 81);
this.groupBox4.TabIndex = 4;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Wasserzähler 4";
//
// yearOfProduction4TextBox
//
this.yearOfProduction4TextBox.Location = new System.Drawing.Point(559, 31);
this.yearOfProduction4TextBox.Name = "yearOfProduction4TextBox";
this.yearOfProduction4TextBox.Size = new System.Drawing.Size(98, 31);
this.yearOfProduction4TextBox.TabIndex = 11;
//
// yearOfProduction4Label
//
this.yearOfProduction4Label.AutoSize = true;
this.yearOfProduction4Label.Location = new System.Drawing.Point(351, 34);
this.yearOfProduction4Label.Name = "yearOfProduction4Label";
this.yearOfProduction4Label.Size = new System.Drawing.Size(188, 23);
this.yearOfProduction4Label.TabIndex = 10;
this.yearOfProduction4Label.Text = "Year of production";
//
// textBox4
//
this.textBox4.Location = new System.Drawing.Point(160, 31);
this.textBox4.Name = "textBox4";
this.textBox4.Size = new System.Drawing.Size(163, 31);
this.textBox4.TabIndex = 1;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(18, 34);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(74, 23);
this.label4.TabIndex = 0;
this.label4.Text = "Stand:";
//
// groupBox5
//
this.groupBox5.Controls.Add(this.yearOfProduction5TextBox);
this.groupBox5.Controls.Add(this.yearOfProduction5Label);
this.groupBox5.Controls.Add(this.textBox5);
this.groupBox5.Controls.Add(this.label5);
this.groupBox5.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.groupBox5.ForeColor = System.Drawing.Color.Black;
this.groupBox5.Location = new System.Drawing.Point(25, 554);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(682, 81);
this.groupBox5.TabIndex = 5;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "Wasserzähler 5";
//
// yearOfProduction5TextBox
//
this.yearOfProduction5TextBox.Location = new System.Drawing.Point(559, 31);
this.yearOfProduction5TextBox.Name = "yearOfProduction5TextBox";
this.yearOfProduction5TextBox.Size = new System.Drawing.Size(98, 31);
this.yearOfProduction5TextBox.TabIndex = 11;
//
// yearOfProduction5Label
//
this.yearOfProduction5Label.AutoSize = true;
this.yearOfProduction5Label.Location = new System.Drawing.Point(351, 34);
this.yearOfProduction5Label.Name = "yearOfProduction5Label";
this.yearOfProduction5Label.Size = new System.Drawing.Size(188, 23);
this.yearOfProduction5Label.TabIndex = 10;
this.yearOfProduction5Label.Text = "Year of production";
//
// textBox5
//
this.textBox5.Location = new System.Drawing.Point(160, 31);
this.textBox5.Name = "textBox5";
this.textBox5.Size = new System.Drawing.Size(163, 31);
this.textBox5.TabIndex = 1;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(18, 34);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(74, 23);
this.label5.TabIndex = 0;
this.label5.Text = "Stand:";
//
// groupBox6
//
this.groupBox6.Controls.Add(this.yearOfProduction6TextBox);
this.groupBox6.Controls.Add(this.yearOfProduction6Label);
this.groupBox6.Controls.Add(this.textBox6);
this.groupBox6.Controls.Add(this.label6);
this.groupBox6.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.groupBox6.ForeColor = System.Drawing.Color.Black;
this.groupBox6.Location = new System.Drawing.Point(25, 644);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(682, 81);
this.groupBox6.TabIndex = 6;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "Wasserzähler 6";
//
// yearOfProduction6TextBox
//
this.yearOfProduction6TextBox.Location = new System.Drawing.Point(559, 31);
this.yearOfProduction6TextBox.Name = "yearOfProduction6TextBox";
this.yearOfProduction6TextBox.Size = new System.Drawing.Size(98, 31);
this.yearOfProduction6TextBox.TabIndex = 11;
//
// yearOfProduction6Label
//
this.yearOfProduction6Label.AutoSize = true;
this.yearOfProduction6Label.Location = new System.Drawing.Point(351, 34);
this.yearOfProduction6Label.Name = "yearOfProduction6Label";
this.yearOfProduction6Label.Size = new System.Drawing.Size(188, 23);
this.yearOfProduction6Label.TabIndex = 10;
this.yearOfProduction6Label.Text = "Year of production";
//
// textBox6
//
this.textBox6.Location = new System.Drawing.Point(160, 31);
this.textBox6.Name = "textBox6";
this.textBox6.Size = new System.Drawing.Size(163, 31);
this.textBox6.TabIndex = 1;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(18, 34);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(74, 23);
this.label6.TabIndex = 0;
this.label6.Text = "Stand:";
//
// CycleEndFormMunich
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ControlDark;
this.ClientSize = new System.Drawing.Size(719, 746);
this.Controls.Add(this.groupBox6);
this.Controls.Add(this.groupBox5);
this.Controls.Add(this.groupBox4);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.protocolGroupBox);
this.Controls.Add(this.okButton);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.Name = "CycleEndFormMunich";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
this.Text = "Daten";
this.TopMost = true;
this.Load += new System.EventHandler(this.CycleEndForm_Load);
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.protocolGroupBox.ResumeLayout(false);
this.protocolGroupBox.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.TextBox textBox2;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button okButton;
private System.Windows.Forms.GroupBox protocolGroupBox;
private System.Windows.Forms.RadioButton radioButton3;
private System.Windows.Forms.RadioButton radioButton2;
private System.Windows.Forms.RadioButton radioButton1;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.TextBox textBox3;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.TextBox textBox4;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.TextBox textBox5;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.GroupBox groupBox6;
private System.Windows.Forms.TextBox textBox6;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.RadioButton radioButton4;
private System.Windows.Forms.Label yearOfProduction1Label;
private System.Windows.Forms.TextBox yearOfProduction2TextBox;
private System.Windows.Forms.Label yearOfProduction2Label;
private System.Windows.Forms.TextBox yearOfProduction1TextBox;
private System.Windows.Forms.TextBox yearOfProduction3TextBox;
private System.Windows.Forms.Label yearOfProduction3Label;
private System.Windows.Forms.TextBox yearOfProduction4TextBox;
private System.Windows.Forms.Label yearOfProduction4Label;
private System.Windows.Forms.TextBox yearOfProduction5TextBox;
private System.Windows.Forms.Label yearOfProduction5Label;
private System.Windows.Forms.TextBox yearOfProduction6TextBox;
private System.Windows.Forms.Label yearOfProduction6Label;
}
}

View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@ -172,14 +172,29 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
///
void OpenBeginningDlg(EntryForm myRef)
{
myRef.modelessDlg = new CycleBeginningForm(Config.Data.WMsCount);
myRef.modelessDlg = new CycleBeginningForm(Config.Data.WMsCount, entryFormCfg.HideOrder);
modelessDlg.Show();
}
///
void OpenEndDlg(EntryForm myRef)
{
myRef.modelessDlg = new CycleEndForm(Config.Data.WMsCount);
modelessDlg.Show();
if (!string.IsNullOrEmpty(entryFormCfg.ProtocolTitle1) ||
!string.IsNullOrEmpty(entryFormCfg.ProtocolTitle2) ||
!string.IsNullOrEmpty(entryFormCfg.ProtocolTitle3) ||
!string.IsNullOrEmpty(entryFormCfg.ProtocolTitle4))
{
myRef.modelessDlg = new CycleEndFormMunich(Config.Data.WMsCount);
(myRef.modelessDlg as CycleEndFormMunich).ProtocolName1 = entryFormCfg.ProtocolTitle1;
(myRef.modelessDlg as CycleEndFormMunich).ProtocolName2 = entryFormCfg.ProtocolTitle2;
(myRef.modelessDlg as CycleEndFormMunich).ProtocolName3 = entryFormCfg.ProtocolTitle3;
(myRef.modelessDlg as CycleEndFormMunich).ProtocolName4 = entryFormCfg.ProtocolTitle4;
}
else
{
myRef.modelessDlg = new CycleEndForm(Config.Data.WMsCount);
}
myRef.modelessDlg.Show();
}
///
void OpenTestStartStatesDlg(EntryForm myRef)
@ -242,7 +257,10 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
CycleBeginningForm dlg = (modelessDlg as CycleBeginningForm);
if (dlg != null)
{
purchaseOrder = dlg.PurchaseOrder;
if (!entryFormCfg.HideOrder)
{
purchaseOrder = dlg.PurchaseOrder;
}
for (int i = 0; i < Math.Min(dlg.WaterMetersCount, waterMeters.Length); i++)
{
@ -254,20 +272,38 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
}
}
}
else if (entryFormCfg.ShowCycleEndForm && currentOp == CurrentOp.ShowFormAtCycleEnd)
else if (currentOp == CurrentOp.ShowFormAtCycleEnd)
{
CycleEndForm dlg = (modelessDlg as CycleEndForm);
int count = waterMeters.Length;
if ((dlg != null) && (count > dlg.WaterMetersCount)) count = dlg.WaterMetersCount;
if (modelessDlg is CycleEndForm)
{
CycleEndForm dlg = (modelessDlg as CycleEndForm);
int count = waterMeters.Length;
if ((dlg != null) && (count > dlg.WaterMetersCount)) count = dlg.WaterMetersCount;
for (int i = 0; i < count; i++)
{
if (waterMeters[i] != null)
{
/// In case entryFormCfg.ShowCycleEndForm == false dlg would be null, values would be string.Empty
wmCycleEndState[i] = waterMeters[i].EndState = (dlg != null) ? dlg.EndStateText[i] : string.Empty;
}
}
for (int i = 0; i < count; i++)
{
if (waterMeters[i] != null)
{
/// In case entryFormCfg.ShowCycleEndForm == false dlg would be null, values would be string.Empty
wmCycleEndState[i] = waterMeters[i].EndState = (dlg != null) ? dlg.EndStateText[i] : string.Empty;
}
}
}
else if (modelessDlg is CycleEndFormMunich)
{
CycleEndFormMunich dlg = (modelessDlg as CycleEndFormMunich);
Sequences.ProcessData.BatchRslts.Batch.ProtocolTitle = dlg.ProtocolTitle;
for (int i = 0; i < Math.Min(waterMeters.Length, dlg.WaterMetersCount); i++)
{
if (waterMeters[i] != null)
{
wmCycleEndState[i] = waterMeters[i].EndState = dlg.EndStateText[i];
waterMeters[i].YearOfProduction = dlg.YearOfProduction[i];
}
}
}
}
else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestStartStates)
{

View File

@ -2,8 +2,6 @@
/// Copyright (c) 2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -19,19 +17,29 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
///
/// Serialized parameters
///
public bool EnterSerialNrsAtTheEnd;
public bool ShowCycleEndForm;
public bool SaveImages;
public bool HideOrder;
public bool EnterSerialNrsAtTheEnd;
public bool ShowCycleEndForm;
public bool SaveImages;
public string ProtocolTitle1;
public string ProtocolTitle2;
public string ProtocolTitle3;
public string ProtocolTitle4;
/// Private parameterless constructor invoked by all other (public) constructors
EntryFormCfg()
{
Name = "DataEntry-for-Camera";
ParentName = string.Empty;
HideOrder = false;
EnterSerialNrsAtTheEnd = false;
ShowCycleEndForm = false;
SaveImages = false;
}
ProtocolTitle1 = string.Empty;
ProtocolTitle2 = string.Empty;
ProtocolTitle3 = string.Empty;
ProtocolTitle4 = string.Empty;
}
public EntryFormCfg(IComponentFactory factory)
: this()
@ -41,7 +49,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
public string ToString(int i)
{
return string.Format("Name={0}, EnterSNsAtTheEnd={1}, ShowEndForm={2}, SensusExt={3}", Name, EnterSerialNrsAtTheEnd, ShowCycleEndForm, SaveImages);
return string.Format("Name={0}, HideOrder={1} SNsAtTheEnd={2}, EndForm={3}, SaveImages={4}", Name, HideOrder, EnterSerialNrsAtTheEnd, ShowCycleEndForm, SaveImages);
}
}
}

View File

@ -53,18 +53,28 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
if (config == null) return; /// Control was not loaded, settings were not changed
classNameLabel.Text = config.Factory.ClassName;
nameTextBox.Text = config.Name;
hideOrderCheckBox.Checked = config.HideOrder;
enterSNsAtTheEndCheckBox.Checked = config.EnterSerialNrsAtTheEnd;
showEndStateFormCheckBox.Checked = config.ShowCycleEndForm;
saveImagesCheckBox.Checked = config.SaveImages;
protocolTitle1TextBox.Text = config.ProtocolTitle1;
protocolTitle2TextBox.Text = config.ProtocolTitle2;
protocolTitle3TextBox.Text = config.ProtocolTitle3;
protocolTitle4TextBox.Text = config.ProtocolTitle4;
}
public void Unlock()
{
nameTextBox.Enabled = true;
hideOrderCheckBox.Enabled = true;
enterSNsAtTheEndCheckBox.Enabled = true;
showEndStateFormCheckBox.Enabled = true;
saveImagesCheckBox.Enabled = true;
}
protocolTitle1TextBox.Enabled = true;
protocolTitle2TextBox.Enabled = true;
protocolTitle3TextBox.Enabled = true;
protocolTitle4TextBox.Enabled = true;
}
public CfgUpdateFlags VerifyCfg(ref string message)
{
@ -79,9 +89,14 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
if (config == null) return CfgUpdateFlags.Error; /// Control was not loaded, settings were not changed
config.Name = nameTextBox.Text;
config.HideOrder = hideOrderCheckBox.Checked;
config.EnterSerialNrsAtTheEnd = enterSNsAtTheEndCheckBox.Checked;
config.ShowCycleEndForm = showEndStateFormCheckBox.Checked;
config.SaveImages = saveImagesCheckBox.Checked;
config.ProtocolTitle1 = protocolTitle1TextBox.Text;
config.ProtocolTitle2 = protocolTitle2TextBox.Text;
config.ProtocolTitle3 = protocolTitle3TextBox.Text;
config.ProtocolTitle4 = protocolTitle4TextBox.Text;
return flags;
}

View File

@ -37,12 +37,21 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
this.showEndStateFormCheckBox = new System.Windows.Forms.CheckBox();
this.enterSNsAtTheEndCheckBox = new System.Windows.Forms.CheckBox();
this.saveImagesCheckBox = new System.Windows.Forms.CheckBox();
this.protocolTitle4TextBox = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.protocolTitle3TextBox = new System.Windows.Forms.TextBox();
this.protocolTitle2TextBox = new System.Windows.Forms.TextBox();
this.protocolTitle1TextBox = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.hideOrderCheckBox = new System.Windows.Forms.CheckBox();
this.SuspendLayout();
//
// nameTextBox
//
this.nameTextBox.Enabled = false;
this.nameTextBox.Location = new System.Drawing.Point(99, 57);
this.nameTextBox.Location = new System.Drawing.Point(136, 31);
this.nameTextBox.Name = "nameTextBox";
this.nameTextBox.Size = new System.Drawing.Size(130, 20);
this.nameTextBox.TabIndex = 2;
@ -50,7 +59,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
// nameLabel
//
this.nameLabel.AutoSize = true;
this.nameLabel.Location = new System.Drawing.Point(35, 60);
this.nameLabel.Location = new System.Drawing.Point(26, 34);
this.nameLabel.Name = "nameLabel";
this.nameLabel.Size = new System.Drawing.Size(35, 13);
this.nameLabel.TabIndex = 1;
@ -59,20 +68,20 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
// classNameLabel
//
this.classNameLabel.AutoSize = true;
this.classNameLabel.Location = new System.Drawing.Point(96, 33);
this.classNameLabel.Location = new System.Drawing.Point(133, 10);
this.classNameLabel.Name = "classNameLabel";
this.classNameLabel.Size = new System.Drawing.Size(83, 13);
this.classNameLabel.Size = new System.Drawing.Size(61, 13);
this.classNameLabel.TabIndex = 0;
this.classNameLabel.Text = "ComonentName";
this.classNameLabel.Text = "Class name";
//
// showEndStateFormCheckBox
//
this.showEndStateFormCheckBox.AutoSize = true;
this.showEndStateFormCheckBox.Enabled = false;
this.showEndStateFormCheckBox.Location = new System.Drawing.Point(99, 112);
this.showEndStateFormCheckBox.Location = new System.Drawing.Point(136, 103);
this.showEndStateFormCheckBox.Name = "showEndStateFormCheckBox";
this.showEndStateFormCheckBox.Size = new System.Drawing.Size(151, 17);
this.showEndStateFormCheckBox.TabIndex = 4;
this.showEndStateFormCheckBox.TabIndex = 5;
this.showEndStateFormCheckBox.Text = "Watermeter end state form";
this.showEndStateFormCheckBox.UseVisualStyleBackColor = true;
//
@ -80,10 +89,10 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
//
this.enterSNsAtTheEndCheckBox.AutoSize = true;
this.enterSNsAtTheEndCheckBox.Enabled = false;
this.enterSNsAtTheEndCheckBox.Location = new System.Drawing.Point(99, 89);
this.enterSNsAtTheEndCheckBox.Location = new System.Drawing.Point(136, 82);
this.enterSNsAtTheEndCheckBox.Name = "enterSNsAtTheEndCheckBox";
this.enterSNsAtTheEndCheckBox.Size = new System.Drawing.Size(167, 17);
this.enterSNsAtTheEndCheckBox.TabIndex = 3;
this.enterSNsAtTheEndCheckBox.TabIndex = 4;
this.enterSNsAtTheEndCheckBox.Text = "Enter serial number at the end";
this.enterSNsAtTheEndCheckBox.UseVisualStyleBackColor = true;
//
@ -91,17 +100,105 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
//
this.saveImagesCheckBox.AutoSize = true;
this.saveImagesCheckBox.Enabled = false;
this.saveImagesCheckBox.Location = new System.Drawing.Point(99, 135);
this.saveImagesCheckBox.Location = new System.Drawing.Point(136, 124);
this.saveImagesCheckBox.Name = "saveImagesCheckBox";
this.saveImagesCheckBox.Size = new System.Drawing.Size(87, 17);
this.saveImagesCheckBox.TabIndex = 5;
this.saveImagesCheckBox.TabIndex = 6;
this.saveImagesCheckBox.Text = "Save images";
this.saveImagesCheckBox.UseVisualStyleBackColor = true;
//
// protocolTitle4TextBox
//
this.protocolTitle4TextBox.Enabled = false;
this.protocolTitle4TextBox.Location = new System.Drawing.Point(136, 228);
this.protocolTitle4TextBox.Name = "protocolTitle4TextBox";
this.protocolTitle4TextBox.Size = new System.Drawing.Size(130, 20);
this.protocolTitle4TextBox.TabIndex = 14;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(26, 231);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(74, 13);
this.label4.TabIndex = 13;
this.label4.Text = "Protocol title 4";
//
// protocolTitle3TextBox
//
this.protocolTitle3TextBox.Enabled = false;
this.protocolTitle3TextBox.Location = new System.Drawing.Point(136, 202);
this.protocolTitle3TextBox.Name = "protocolTitle3TextBox";
this.protocolTitle3TextBox.Size = new System.Drawing.Size(130, 20);
this.protocolTitle3TextBox.TabIndex = 12;
//
// protocolTitle2TextBox
//
this.protocolTitle2TextBox.Enabled = false;
this.protocolTitle2TextBox.Location = new System.Drawing.Point(136, 176);
this.protocolTitle2TextBox.Name = "protocolTitle2TextBox";
this.protocolTitle2TextBox.Size = new System.Drawing.Size(130, 20);
this.protocolTitle2TextBox.TabIndex = 10;
//
// protocolTitle1TextBox
//
this.protocolTitle1TextBox.Enabled = false;
this.protocolTitle1TextBox.Location = new System.Drawing.Point(136, 150);
this.protocolTitle1TextBox.Name = "protocolTitle1TextBox";
this.protocolTitle1TextBox.Size = new System.Drawing.Size(130, 20);
this.protocolTitle1TextBox.TabIndex = 8;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(26, 205);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(74, 13);
this.label3.TabIndex = 11;
this.label3.Text = "Protocol title 3";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(26, 179);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(74, 13);
this.label2.TabIndex = 9;
this.label2.Text = "Protocol title 2";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(26, 153);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(74, 13);
this.label1.TabIndex = 7;
this.label1.Text = "Protocol title 1";
//
// hideOrderCheckBox
//
this.hideOrderCheckBox.AutoSize = true;
this.hideOrderCheckBox.Enabled = false;
this.hideOrderCheckBox.Location = new System.Drawing.Point(136, 61);
this.hideOrderCheckBox.Name = "hideOrderCheckBox";
this.hideOrderCheckBox.Size = new System.Drawing.Size(103, 17);
this.hideOrderCheckBox.TabIndex = 3;
this.hideOrderCheckBox.Text = "Hide \'Order\' field";
this.hideOrderCheckBox.UseVisualStyleBackColor = true;
//
// EntryFormCfgCtrl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.hideOrderCheckBox);
this.Controls.Add(this.protocolTitle4TextBox);
this.Controls.Add(this.label4);
this.Controls.Add(this.protocolTitle3TextBox);
this.Controls.Add(this.protocolTitle2TextBox);
this.Controls.Add(this.protocolTitle1TextBox);
this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.saveImagesCheckBox);
this.Controls.Add(this.enterSNsAtTheEndCheckBox);
this.Controls.Add(this.showEndStateFormCheckBox);
@ -109,7 +206,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
this.Controls.Add(this.nameLabel);
this.Controls.Add(this.classNameLabel);
this.Name = "EntryFormCfgCtrl";
this.Size = new System.Drawing.Size(300, 200);
this.Size = new System.Drawing.Size(359, 275);
this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load);
this.ResumeLayout(false);
this.PerformLayout();
@ -124,5 +221,14 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
private System.Windows.Forms.CheckBox showEndStateFormCheckBox;
private System.Windows.Forms.CheckBox enterSNsAtTheEndCheckBox;
private System.Windows.Forms.CheckBox saveImagesCheckBox;
private System.Windows.Forms.TextBox protocolTitle4TextBox;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.TextBox protocolTitle3TextBox;
private System.Windows.Forms.TextBox protocolTitle2TextBox;
private System.Windows.Forms.TextBox protocolTitle1TextBox;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.CheckBox hideOrderCheckBox;
}
}

View File

@ -8,7 +8,8 @@ namespace TBF.BenchControl.GenericDevices
public interface IHasCycleBeginForm
{
/// <summary>
/// Purchase order selected/typed in the cycle beginning form
/// Purchase order selected/typed in the cycle beginning form.
/// When PurchaseOrder==null the purchase order entry was disabled.
/// </summary>
string PurchaseOrder { get; }

View File

@ -388,6 +388,12 @@
<Compile Include="BenchControl\DataEntry\StandardCamera\CycleEndForm.designer.cs">
<DependentUpon>CycleEndForm.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\DataEntry\StandardCamera\CycleEndFormMunich.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="BenchControl\DataEntry\StandardCamera\CycleEndFormMunich.designer.cs">
<DependentUpon>CycleEndFormMunich.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\DataEntry\StandardCamera\EntryFormCfg.cs" />
<Compile Include="BenchControl\DataEntry\StandardCamera\EntryFormCfgCtrl.cs">
<SubType>UserControl</SubType>
@ -2052,6 +2058,9 @@
<EmbeddedResource Include="BenchControl\DataEntry\StandardCamera\CycleEndForm.resx">
<DependentUpon>CycleEndForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\DataEntry\StandardCamera\CycleEndFormMunich.resx">
<DependentUpon>CycleEndFormMunich.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\DataEntry\StandardCamera\EntryFormCfgCtrl.resx">
<DependentUpon>EntryFormCfgCtrl.cs</DependentUpon>
</EmbeddedResource>