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

(1) formated date/time information in output items, (2) support for two printers and four file writers in procedure spec.

Browse Source
This commit is contained in:
Milan Hanajik 2016-05-02 10:19:26 +02:00
parent 7b878be87d
commit 5239ed6d15
4 changed files with 709 additions and 572 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Results/WMeterRsltItemSpec.cs
View File

@ -110,9 +110,11 @@ namespace Results
AllItems.Add(new WMeterRsltItemSpec(11, "Uncertainty", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Uncertainty().ToString(string.IsNullOrEmpty(p) ? "F2" : p)));
/// Test results
AllItems.Add(new WMeterRsltItemSpec(12, "Test start time", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).StartTime.ToShortTimeString()));
AllItems.Add(new WMeterRsltItemSpec(13, "Test end time", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).EndTime.ToShortTimeString()));
AllItems.Add(new WMeterRsltItemSpec(14, "Test time", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).TestTime.ToString(string.IsNullOrEmpty(p) ? "F2" : p)));
AllItems.Add(new WMeterRsltItemSpec(12, "Test start date/time", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : (string.IsNullOrEmpty(p) ? w.GetTestRslt(t).StartTime.ToShortTimeString()
: w.GetTestRslt(t).StartTime.ToString(p))));
AllItems.Add(new WMeterRsltItemSpec(13, "Test end date/time", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : (string.IsNullOrEmpty(p) ? w.GetTestRslt(t).EndTime.ToShortTimeString()
: w.GetTestRslt(t).EndTime.ToString(p))));
AllItems.Add(new WMeterRsltItemSpec(14, "Test time", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).TestTime.ToString(string.IsNullOrEmpty(p) ? "F2" : p)));
AllItems.Add(new WMeterRsltItemSpec(15, "Flow", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Utils.DoubleToStr(Config.Units.ConvertTo(u, w.GetTestRslt(t).FlowVolume), 4)));
AllItems.Add(new WMeterRsltItemSpec(16, "T in", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempInAvrg).ToString(string.IsNullOrEmpty(p) ? "F2" : p)));
AllItems.Add(new WMeterRsltItemSpec(17, "T out", (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempOutAvrg).ToString(string.IsNullOrEmpty(p) ? "F2" : p)));
@ -170,10 +172,10 @@ namespace Results
AllItems.Add(new WMeterRsltItemSpec(54, "Procedure name", (w, t, u, f, p) => w.Batch.ProcedureName));
AllItems.Add(new WMeterRsltItemSpec(55, "Watermeters", (w, t, u, f, p) => w.Batch.WatermetersStr));
AllItems.Add(new WMeterRsltItemSpec(56, "Protocol title", (w, t, u, f, p) => w.Batch.ProtocolTitle));
AllItems.Add(new WMeterRsltItemSpec(57, "Batch start time", (w, t, u, f, p) => w.Batch.StartTime.ToShortTimeString()));
AllItems.Add(new WMeterRsltItemSpec(58, "Batch end time", (w, t, u, f, p) => w.Batch.EndTime.ToShortTimeString()));
AllItems.Add(new WMeterRsltItemSpec(59, "Batch start date", (w, t, u, f, p) => w.Batch.StartTime.ToShortDateString()));
AllItems.Add(new WMeterRsltItemSpec(60, "Batch end date", (w, t, u, f, p) => w.Batch.EndTime.ToShortDateString()));
AllItems.Add(new WMeterRsltItemSpec(57, "Batch start date/time",(w, t, u, f, p) => (string.IsNullOrEmpty(p) ? w.Batch.StartTime.ToShortDateString()
: w.Batch.StartTime.ToString(p))));
AllItems.Add(new WMeterRsltItemSpec(58, "Batch end date/time", (w, t, u, f, p) => (string.IsNullOrEmpty(p) ? w.Batch.EndTime.ToShortDateString()
: w.Batch.EndTime.ToString(p))));
}
/// <summary>

845
TestBenchFramework/ProcedureDlg.Designer.cs generated
View File

@ -31,412 +31,436 @@ namespace TBF
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProcedureDlg));
this.mainSplitContainer = new System.Windows.Forms.SplitContainer();
this.tabControl = new System.Windows.Forms.TabControl();
this.generalTabPage = new System.Windows.Forms.TabPage();
this.protocolTitleTextBox = new System.Windows.Forms.TextBox();
this.protocolTitleLabel = new System.Windows.Forms.Label();
this.metersKindRadioButton2 = new System.Windows.Forms.RadioButton();
this.metersKindRadioButton1 = new System.Windows.Forms.RadioButton();
this.transitionEndComboBox = new System.Windows.Forms.ComboBox();
this.transitionEndLabel = new System.Windows.Forms.Label();
this.transitionStartComboBox = new System.Windows.Forms.ComboBox();
this.transitionStartLabel = new System.Windows.Forms.Label();
this.resultsWriterComboBox = new System.Windows.Forms.ComboBox();
this.resultsPrinterComboBox = new System.Windows.Forms.ComboBox();
this.dataEntryComboBox = new System.Windows.Forms.ComboBox();
this.resultsWriterLabel = new System.Windows.Forms.Label();
this.resultsPrinterLabel = new System.Windows.Forms.Label();
this.dataEntryLabel = new System.Windows.Forms.Label();
this.notesTextBox = new System.Windows.Forms.TextBox();
this.label18 = new System.Windows.Forms.Label();
this.watermetersTextBox = new System.Windows.Forms.TextBox();
this.watermetersLabel = new System.Windows.Forms.Label();
this.lastChangedOnTextBox = new System.Windows.Forms.TextBox();
this.label15 = new System.Windows.Forms.Label();
this.lastChangedByTextBox = new System.Windows.Forms.TextBox();
this.label16 = new System.Windows.Forms.Label();
this.createdOnTextBox = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label();
this.createdByTextBox = new System.Windows.Forms.TextBox();
this.label13 = new System.Windows.Forms.Label();
this.descriptionTextBox = new System.Windows.Forms.TextBox();
this.label12 = new System.Windows.Forms.Label();
this.procNameTextBox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.historyTabPage = new System.Windows.Forms.TabPage();
this.historyListViewEx = new TBF.UiControls.ListViewEx();
this.metrology1TabPage = new System.Windows.Forms.TabPage();
this.metrology1ListViewEx = new TBF.UiControls.ListViewEx();
this.metrology2TabPage = new System.Windows.Forms.TabPage();
this.metrology2ListViewEx = new TBF.UiControls.ListViewEx();
this.processTabPage = new System.Windows.Forms.TabPage();
this.processListViewEx = new TBF.UiControls.ListViewEx();
this.parametersTabPage = new System.Windows.Forms.TabPage();
this.parametersListViewEx = new TBF.UiControls.ListViewEx();
this.sharedButtons = new TBF.UiControls.SharedButtons();
this.resultsWriter2ComboBox = new System.Windows.Forms.ComboBox();
((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit();
this.mainSplitContainer.Panel1.SuspendLayout();
this.mainSplitContainer.Panel2.SuspendLayout();
this.mainSplitContainer.SuspendLayout();
this.tabControl.SuspendLayout();
this.generalTabPage.SuspendLayout();
this.historyTabPage.SuspendLayout();
this.metrology1TabPage.SuspendLayout();
this.metrology2TabPage.SuspendLayout();
this.processTabPage.SuspendLayout();
this.parametersTabPage.SuspendLayout();
this.SuspendLayout();
//
// mainSplitContainer
//
resources.ApplyResources(this.mainSplitContainer, "mainSplitContainer");
this.mainSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
this.mainSplitContainer.Name = "mainSplitContainer";
//
// mainSplitContainer.Panel1
//
this.mainSplitContainer.Panel1.Controls.Add(this.tabControl);
//
// mainSplitContainer.Panel2
//
this.mainSplitContainer.Panel2.Controls.Add(this.sharedButtons);
//
// tabControl
//
this.tabControl.Controls.Add(this.generalTabPage);
this.tabControl.Controls.Add(this.historyTabPage);
this.tabControl.Controls.Add(this.metrology1TabPage);
this.tabControl.Controls.Add(this.metrology2TabPage);
this.tabControl.Controls.Add(this.processTabPage);
this.tabControl.Controls.Add(this.parametersTabPage);
resources.ApplyResources(this.tabControl, "tabControl");
this.tabControl.Name = "tabControl";
this.tabControl.SelectedIndex = 0;
this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
//
// generalTabPage
//
this.generalTabPage.Controls.Add(this.resultsWriter2ComboBox);
this.generalTabPage.Controls.Add(this.protocolTitleTextBox);
this.generalTabPage.Controls.Add(this.protocolTitleLabel);
this.generalTabPage.Controls.Add(this.metersKindRadioButton2);
this.generalTabPage.Controls.Add(this.metersKindRadioButton1);
this.generalTabPage.Controls.Add(this.transitionEndComboBox);
this.generalTabPage.Controls.Add(this.transitionEndLabel);
this.generalTabPage.Controls.Add(this.transitionStartComboBox);
this.generalTabPage.Controls.Add(this.transitionStartLabel);
this.generalTabPage.Controls.Add(this.resultsWriterComboBox);
this.generalTabPage.Controls.Add(this.resultsPrinterComboBox);
this.generalTabPage.Controls.Add(this.dataEntryComboBox);
this.generalTabPage.Controls.Add(this.resultsWriterLabel);
this.generalTabPage.Controls.Add(this.resultsPrinterLabel);
this.generalTabPage.Controls.Add(this.dataEntryLabel);
this.generalTabPage.Controls.Add(this.notesTextBox);
this.generalTabPage.Controls.Add(this.label18);
this.generalTabPage.Controls.Add(this.watermetersTextBox);
this.generalTabPage.Controls.Add(this.watermetersLabel);
this.generalTabPage.Controls.Add(this.lastChangedOnTextBox);
this.generalTabPage.Controls.Add(this.label15);
this.generalTabPage.Controls.Add(this.lastChangedByTextBox);
this.generalTabPage.Controls.Add(this.label16);
this.generalTabPage.Controls.Add(this.createdOnTextBox);
this.generalTabPage.Controls.Add(this.label14);
this.generalTabPage.Controls.Add(this.createdByTextBox);
this.generalTabPage.Controls.Add(this.label13);
this.generalTabPage.Controls.Add(this.descriptionTextBox);
this.generalTabPage.Controls.Add(this.label12);
this.generalTabPage.Controls.Add(this.procNameTextBox);
this.generalTabPage.Controls.Add(this.label1);
resources.ApplyResources(this.generalTabPage, "generalTabPage");
this.generalTabPage.Name = "generalTabPage";
this.generalTabPage.UseVisualStyleBackColor = true;
//
// protocolTitleTextBox
//
resources.ApplyResources(this.protocolTitleTextBox, "protocolTitleTextBox");
this.protocolTitleTextBox.Name = "protocolTitleTextBox";
//
// protocolTitleLabel
//
resources.ApplyResources(this.protocolTitleLabel, "protocolTitleLabel");
this.protocolTitleLabel.ImageKey = global::TBF.Resources.Strings.Closing_the_tank;
this.protocolTitleLabel.Name = "protocolTitleLabel";
//
// metersKindRadioButton2
//
resources.ApplyResources(this.metersKindRadioButton2, "metersKindRadioButton2");
this.metersKindRadioButton2.Name = "metersKindRadioButton2";
this.metersKindRadioButton2.TabStop = true;
this.metersKindRadioButton2.UseVisualStyleBackColor = true;
//
// metersKindRadioButton1
//
resources.ApplyResources(this.metersKindRadioButton1, "metersKindRadioButton1");
this.metersKindRadioButton1.Name = "metersKindRadioButton1";
this.metersKindRadioButton1.TabStop = true;
this.metersKindRadioButton1.UseVisualStyleBackColor = true;
//
// transitionEndComboBox
//
this.transitionEndComboBox.FormattingEnabled = true;
resources.ApplyResources(this.transitionEndComboBox, "transitionEndComboBox");
this.transitionEndComboBox.Name = "transitionEndComboBox";
//
// transitionEndLabel
//
resources.ApplyResources(this.transitionEndLabel, "transitionEndLabel");
this.transitionEndLabel.Name = "transitionEndLabel";
//
// transitionStartComboBox
//
this.transitionStartComboBox.FormattingEnabled = true;
resources.ApplyResources(this.transitionStartComboBox, "transitionStartComboBox");
this.transitionStartComboBox.Name = "transitionStartComboBox";
//
// transitionStartLabel
//
resources.ApplyResources(this.transitionStartLabel, "transitionStartLabel");
this.transitionStartLabel.Name = "transitionStartLabel";
//
// resultsWriterComboBox
//
this.resultsWriterComboBox.FormattingEnabled = true;
resources.ApplyResources(this.resultsWriterComboBox, "resultsWriterComboBox");
this.resultsWriterComboBox.Name = "resultsWriterComboBox";
//
// resultsPrinterComboBox
//
this.resultsPrinterComboBox.FormattingEnabled = true;
resources.ApplyResources(this.resultsPrinterComboBox, "resultsPrinterComboBox");
this.resultsPrinterComboBox.Name = "resultsPrinterComboBox";
//
// dataEntryComboBox
//
this.dataEntryComboBox.FormattingEnabled = true;
resources.ApplyResources(this.dataEntryComboBox, "dataEntryComboBox");
this.dataEntryComboBox.Name = "dataEntryComboBox";
//
// resultsWriterLabel
//
resources.ApplyResources(this.resultsWriterLabel, "resultsWriterLabel");
this.resultsWriterLabel.Name = "resultsWriterLabel";
//
// resultsPrinterLabel
//
resources.ApplyResources(this.resultsPrinterLabel, "resultsPrinterLabel");
this.resultsPrinterLabel.Name = "resultsPrinterLabel";
//
// dataEntryLabel
//
resources.ApplyResources(this.dataEntryLabel, "dataEntryLabel");
this.dataEntryLabel.Name = "dataEntryLabel";
//
// notesTextBox
//
resources.ApplyResources(this.notesTextBox, "notesTextBox");
this.notesTextBox.Name = "notesTextBox";
//
// label18
//
resources.ApplyResources(this.label18, "label18");
this.label18.Name = "label18";
//
// watermetersTextBox
//
resources.ApplyResources(this.watermetersTextBox, "watermetersTextBox");
this.watermetersTextBox.Name = "watermetersTextBox";
//
// watermetersLabel
//
resources.ApplyResources(this.watermetersLabel, "watermetersLabel");
this.watermetersLabel.Name = "watermetersLabel";
//
// lastChangedOnTextBox
//
resources.ApplyResources(this.lastChangedOnTextBox, "lastChangedOnTextBox");
this.lastChangedOnTextBox.Name = "lastChangedOnTextBox";
//
// label15
//
resources.ApplyResources(this.label15, "label15");
this.label15.Name = "label15";
//
// lastChangedByTextBox
//
resources.ApplyResources(this.lastChangedByTextBox, "lastChangedByTextBox");
this.lastChangedByTextBox.Name = "lastChangedByTextBox";
//
// label16
//
resources.ApplyResources(this.label16, "label16");
this.label16.Name = "label16";
//
// createdOnTextBox
//
resources.ApplyResources(this.createdOnTextBox, "createdOnTextBox");
this.createdOnTextBox.Name = "createdOnTextBox";
//
// label14
//
resources.ApplyResources(this.label14, "label14");
this.label14.Name = "label14";
//
// createdByTextBox
//
resources.ApplyResources(this.createdByTextBox, "createdByTextBox");
this.createdByTextBox.Name = "createdByTextBox";
//
// label13
//
resources.ApplyResources(this.label13, "label13");
this.label13.Name = "label13";
//
// descriptionTextBox
//
resources.ApplyResources(this.descriptionTextBox, "descriptionTextBox");
this.descriptionTextBox.Name = "descriptionTextBox";
//
// label12
//
resources.ApplyResources(this.label12, "label12");
this.label12.Name = "label12";
//
// procNameTextBox
//
resources.ApplyResources(this.procNameTextBox, "procNameTextBox");
this.procNameTextBox.Name = "procNameTextBox";
//
// label1
//
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
//
// historyTabPage
//
this.historyTabPage.Controls.Add(this.historyListViewEx);
resources.ApplyResources(this.historyTabPage, "historyTabPage");
this.historyTabPage.Name = "historyTabPage";
this.historyTabPage.UseVisualStyleBackColor = true;
//
// historyListViewEx
//
this.historyListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.historyListViewEx, "historyListViewEx");
this.historyListViewEx.DoubleClickActivation = false;
this.historyListViewEx.FullRowSelect = true;
this.historyListViewEx.GridLines = true;
this.historyListViewEx.Name = "historyListViewEx";
this.historyListViewEx.UseCompatibleStateImageBehavior = false;
this.historyListViewEx.View = System.Windows.Forms.View.Details;
//
// metrology1TabPage
//
this.metrology1TabPage.Controls.Add(this.metrology1ListViewEx);
resources.ApplyResources(this.metrology1TabPage, "metrology1TabPage");
this.metrology1TabPage.Name = "metrology1TabPage";
this.metrology1TabPage.UseVisualStyleBackColor = true;
//
// metrology1ListViewEx
//
this.metrology1ListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.metrology1ListViewEx, "metrology1ListViewEx");
this.metrology1ListViewEx.DoubleClickActivation = false;
this.metrology1ListViewEx.FullRowSelect = true;
this.metrology1ListViewEx.GridLines = true;
this.metrology1ListViewEx.Name = "metrology1ListViewEx";
this.metrology1ListViewEx.UseCompatibleStateImageBehavior = false;
this.metrology1ListViewEx.View = System.Windows.Forms.View.Details;
this.metrology1ListViewEx.SelectedIndexChanged += new System.EventHandler(this.metrology1ListViewEx_SelectedIndexChanged);
//
// metrology2TabPage
//
this.metrology2TabPage.Controls.Add(this.metrology2ListViewEx);
resources.ApplyResources(this.metrology2TabPage, "metrology2TabPage");
this.metrology2TabPage.Name = "metrology2TabPage";
this.metrology2TabPage.UseVisualStyleBackColor = true;
//
// metrology2ListViewEx
//
this.metrology2ListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.metrology2ListViewEx, "metrology2ListViewEx");
this.metrology2ListViewEx.DoubleClickActivation = false;
this.metrology2ListViewEx.FullRowSelect = true;
this.metrology2ListViewEx.GridLines = true;
this.metrology2ListViewEx.Name = "metrology2ListViewEx";
this.metrology2ListViewEx.UseCompatibleStateImageBehavior = false;
this.metrology2ListViewEx.View = System.Windows.Forms.View.Details;
this.metrology2ListViewEx.SelectedIndexChanged += new System.EventHandler(this.metrology2ListViewEx_SelectedIndexChanged);
//
// processTabPage
//
this.processTabPage.Controls.Add(this.processListViewEx);
resources.ApplyResources(this.processTabPage, "processTabPage");
this.processTabPage.Name = "processTabPage";
this.processTabPage.UseVisualStyleBackColor = true;
//
// processListViewEx
//
this.processListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.processListViewEx, "processListViewEx");
this.processListViewEx.DoubleClickActivation = false;
this.processListViewEx.FullRowSelect = true;
this.processListViewEx.GridLines = true;
this.processListViewEx.Name = "processListViewEx";
this.processListViewEx.UseCompatibleStateImageBehavior = false;
this.processListViewEx.View = System.Windows.Forms.View.Details;
this.processListViewEx.SelectedIndexChanged += new System.EventHandler(this.processListViewEx_SelectedIndexChanged);
//
// parametersTabPage
//
this.parametersTabPage.Controls.Add(this.parametersListViewEx);
resources.ApplyResources(this.parametersTabPage, "parametersTabPage");
this.parametersTabPage.Name = "parametersTabPage";
this.parametersTabPage.UseVisualStyleBackColor = true;
//
// parametersListViewEx
//
this.parametersListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.parametersListViewEx, "parametersListViewEx");
this.parametersListViewEx.DoubleClickActivation = false;
this.parametersListViewEx.FullRowSelect = true;
this.parametersListViewEx.Name = "parametersListViewEx";
this.parametersListViewEx.UseCompatibleStateImageBehavior = false;
this.parametersListViewEx.View = System.Windows.Forms.View.Details;
//
// sharedButtons
//
resources.ApplyResources(this.sharedButtons, "sharedButtons");
this.sharedButtons.Name = "sharedButtons";
//
// resultsWriter2ComboBox
//
this.resultsWriter2ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.resultsWriter2ComboBox, "resultsWriter2ComboBox");
this.resultsWriter2ComboBox.Name = "resultsWriter2ComboBox";
//
// ProcedureDlg
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.mainSplitContainer);
this.Name = "ProcedureDlg";
this.Load += new System.EventHandler(this.ProcedureDlg_Load);
this.mainSplitContainer.Panel1.ResumeLayout(false);
this.mainSplitContainer.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).EndInit();
this.mainSplitContainer.ResumeLayout(false);
this.tabControl.ResumeLayout(false);
this.generalTabPage.ResumeLayout(false);
this.generalTabPage.PerformLayout();
this.historyTabPage.ResumeLayout(false);
this.metrology1TabPage.ResumeLayout(false);
this.metrology2TabPage.ResumeLayout(false);
this.processTabPage.ResumeLayout(false);
this.parametersTabPage.ResumeLayout(false);
this.ResumeLayout(false);
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProcedureDlg));
this.mainSplitContainer = new System.Windows.Forms.SplitContainer();
this.tabControl = new System.Windows.Forms.TabControl();
this.generalTabPage = new System.Windows.Forms.TabPage();
this.fileWriter2ComboBox = new System.Windows.Forms.ComboBox();
this.protocolTitleTextBox = new System.Windows.Forms.TextBox();
this.protocolTitleLabel = new System.Windows.Forms.Label();
this.metersKindRadioButton2 = new System.Windows.Forms.RadioButton();
this.metersKindRadioButton1 = new System.Windows.Forms.RadioButton();
this.transitionEndComboBox = new System.Windows.Forms.ComboBox();
this.transitionEndLabel = new System.Windows.Forms.Label();
this.transitionStartComboBox = new System.Windows.Forms.ComboBox();
this.transitionStartLabel = new System.Windows.Forms.Label();
this.fileWriter1ComboBox = new System.Windows.Forms.ComboBox();
this.printer1ComboBox = new System.Windows.Forms.ComboBox();
this.dataEntryComboBox = new System.Windows.Forms.ComboBox();
this.resultsWriterLabel = new System.Windows.Forms.Label();
this.resultsPrinterLabel = new System.Windows.Forms.Label();
this.dataEntryLabel = new System.Windows.Forms.Label();
this.notesTextBox = new System.Windows.Forms.TextBox();
this.label18 = new System.Windows.Forms.Label();
this.watermetersTextBox = new System.Windows.Forms.TextBox();
this.watermetersLabel = new System.Windows.Forms.Label();
this.lastChangedOnTextBox = new System.Windows.Forms.TextBox();
this.label15 = new System.Windows.Forms.Label();
this.lastChangedByTextBox = new System.Windows.Forms.TextBox();
this.label16 = new System.Windows.Forms.Label();
this.createdOnTextBox = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label();
this.createdByTextBox = new System.Windows.Forms.TextBox();
this.label13 = new System.Windows.Forms.Label();
this.descriptionTextBox = new System.Windows.Forms.TextBox();
this.label12 = new System.Windows.Forms.Label();
this.procNameTextBox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.historyTabPage = new System.Windows.Forms.TabPage();
this.historyListViewEx = new TBF.UiControls.ListViewEx();
this.metrology1TabPage = new System.Windows.Forms.TabPage();
this.metrology1ListViewEx = new TBF.UiControls.ListViewEx();
this.metrology2TabPage = new System.Windows.Forms.TabPage();
this.metrology2ListViewEx = new TBF.UiControls.ListViewEx();
this.processTabPage = new System.Windows.Forms.TabPage();
this.processListViewEx = new TBF.UiControls.ListViewEx();
this.parametersTabPage = new System.Windows.Forms.TabPage();
this.parametersListViewEx = new TBF.UiControls.ListViewEx();
this.sharedButtons = new TBF.UiControls.SharedButtons();
this.printer2ComboBox = new System.Windows.Forms.ComboBox();
this.fileWriter3ComboBox = new System.Windows.Forms.ComboBox();
this.fileWriter4ComboBox = new System.Windows.Forms.ComboBox();
((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit();
this.mainSplitContainer.Panel1.SuspendLayout();
this.mainSplitContainer.Panel2.SuspendLayout();
this.mainSplitContainer.SuspendLayout();
this.tabControl.SuspendLayout();
this.generalTabPage.SuspendLayout();
this.historyTabPage.SuspendLayout();
this.metrology1TabPage.SuspendLayout();
this.metrology2TabPage.SuspendLayout();
this.processTabPage.SuspendLayout();
this.parametersTabPage.SuspendLayout();
this.SuspendLayout();
//
// mainSplitContainer
//
resources.ApplyResources(this.mainSplitContainer, "mainSplitContainer");
this.mainSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
this.mainSplitContainer.Name = "mainSplitContainer";
//
// mainSplitContainer.Panel1
//
this.mainSplitContainer.Panel1.Controls.Add(this.tabControl);
//
// mainSplitContainer.Panel2
//
this.mainSplitContainer.Panel2.Controls.Add(this.sharedButtons);
//
// tabControl
//
this.tabControl.Controls.Add(this.generalTabPage);
this.tabControl.Controls.Add(this.historyTabPage);
this.tabControl.Controls.Add(this.metrology1TabPage);
this.tabControl.Controls.Add(this.metrology2TabPage);
this.tabControl.Controls.Add(this.processTabPage);
this.tabControl.Controls.Add(this.parametersTabPage);
resources.ApplyResources(this.tabControl, "tabControl");
this.tabControl.Name = "tabControl";
this.tabControl.SelectedIndex = 0;
this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
//
// generalTabPage
//
this.generalTabPage.Controls.Add(this.fileWriter4ComboBox);
this.generalTabPage.Controls.Add(this.fileWriter3ComboBox);
this.generalTabPage.Controls.Add(this.printer2ComboBox);
this.generalTabPage.Controls.Add(this.fileWriter2ComboBox);
this.generalTabPage.Controls.Add(this.protocolTitleTextBox);
this.generalTabPage.Controls.Add(this.protocolTitleLabel);
this.generalTabPage.Controls.Add(this.metersKindRadioButton2);
this.generalTabPage.Controls.Add(this.metersKindRadioButton1);
this.generalTabPage.Controls.Add(this.transitionEndComboBox);
this.generalTabPage.Controls.Add(this.transitionEndLabel);
this.generalTabPage.Controls.Add(this.transitionStartComboBox);
this.generalTabPage.Controls.Add(this.transitionStartLabel);
this.generalTabPage.Controls.Add(this.fileWriter1ComboBox);
this.generalTabPage.Controls.Add(this.printer1ComboBox);
this.generalTabPage.Controls.Add(this.dataEntryComboBox);
this.generalTabPage.Controls.Add(this.resultsWriterLabel);
this.generalTabPage.Controls.Add(this.resultsPrinterLabel);
this.generalTabPage.Controls.Add(this.dataEntryLabel);
this.generalTabPage.Controls.Add(this.notesTextBox);
this.generalTabPage.Controls.Add(this.label18);
this.generalTabPage.Controls.Add(this.watermetersTextBox);
this.generalTabPage.Controls.Add(this.watermetersLabel);
this.generalTabPage.Controls.Add(this.lastChangedOnTextBox);
this.generalTabPage.Controls.Add(this.label15);
this.generalTabPage.Controls.Add(this.lastChangedByTextBox);
this.generalTabPage.Controls.Add(this.label16);
this.generalTabPage.Controls.Add(this.createdOnTextBox);
this.generalTabPage.Controls.Add(this.label14);
this.generalTabPage.Controls.Add(this.createdByTextBox);
this.generalTabPage.Controls.Add(this.label13);
this.generalTabPage.Controls.Add(this.descriptionTextBox);
this.generalTabPage.Controls.Add(this.label12);
this.generalTabPage.Controls.Add(this.procNameTextBox);
this.generalTabPage.Controls.Add(this.label1);
resources.ApplyResources(this.generalTabPage, "generalTabPage");
this.generalTabPage.Name = "generalTabPage";
this.generalTabPage.UseVisualStyleBackColor = true;
//
// fileWriter2ComboBox
//
this.fileWriter2ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.fileWriter2ComboBox, "fileWriter2ComboBox");
this.fileWriter2ComboBox.Name = "fileWriter2ComboBox";
//
// protocolTitleTextBox
//
resources.ApplyResources(this.protocolTitleTextBox, "protocolTitleTextBox");
this.protocolTitleTextBox.Name = "protocolTitleTextBox";
//
// protocolTitleLabel
//
resources.ApplyResources(this.protocolTitleLabel, "protocolTitleLabel");
this.protocolTitleLabel.ImageKey = global::TBF.Resources.Strings.Closing_the_tank;
this.protocolTitleLabel.Name = "protocolTitleLabel";
//
// metersKindRadioButton2
//
resources.ApplyResources(this.metersKindRadioButton2, "metersKindRadioButton2");
this.metersKindRadioButton2.Name = "metersKindRadioButton2";
this.metersKindRadioButton2.TabStop = true;
this.metersKindRadioButton2.UseVisualStyleBackColor = true;
//
// metersKindRadioButton1
//
resources.ApplyResources(this.metersKindRadioButton1, "metersKindRadioButton1");
this.metersKindRadioButton1.Name = "metersKindRadioButton1";
this.metersKindRadioButton1.TabStop = true;
this.metersKindRadioButton1.UseVisualStyleBackColor = true;
//
// transitionEndComboBox
//
this.transitionEndComboBox.FormattingEnabled = true;
resources.ApplyResources(this.transitionEndComboBox, "transitionEndComboBox");
this.transitionEndComboBox.Name = "transitionEndComboBox";
//
// transitionEndLabel
//
resources.ApplyResources(this.transitionEndLabel, "transitionEndLabel");
this.transitionEndLabel.Name = "transitionEndLabel";
//
// transitionStartComboBox
//
this.transitionStartComboBox.FormattingEnabled = true;
resources.ApplyResources(this.transitionStartComboBox, "transitionStartComboBox");
this.transitionStartComboBox.Name = "transitionStartComboBox";
//
// transitionStartLabel
//
resources.ApplyResources(this.transitionStartLabel, "transitionStartLabel");
this.transitionStartLabel.Name = "transitionStartLabel";
//
// fileWriter1ComboBox
//
this.fileWriter1ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.fileWriter1ComboBox, "fileWriter1ComboBox");
this.fileWriter1ComboBox.Name = "fileWriter1ComboBox";
//
// printer1ComboBox
//
this.printer1ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.printer1ComboBox, "printer1ComboBox");
this.printer1ComboBox.Name = "printer1ComboBox";
//
// dataEntryComboBox
//
this.dataEntryComboBox.FormattingEnabled = true;
resources.ApplyResources(this.dataEntryComboBox, "dataEntryComboBox");
this.dataEntryComboBox.Name = "dataEntryComboBox";
//
// resultsWriterLabel
//
resources.ApplyResources(this.resultsWriterLabel, "resultsWriterLabel");
this.resultsWriterLabel.Name = "resultsWriterLabel";
//
// resultsPrinterLabel
//
resources.ApplyResources(this.resultsPrinterLabel, "resultsPrinterLabel");
this.resultsPrinterLabel.Name = "resultsPrinterLabel";
//
// dataEntryLabel
//
resources.ApplyResources(this.dataEntryLabel, "dataEntryLabel");
this.dataEntryLabel.Name = "dataEntryLabel";
//
// notesTextBox
//
resources.ApplyResources(this.notesTextBox, "notesTextBox");
this.notesTextBox.Name = "notesTextBox";
//
// label18
//
resources.ApplyResources(this.label18, "label18");
this.label18.Name = "label18";
//
// watermetersTextBox
//
resources.ApplyResources(this.watermetersTextBox, "watermetersTextBox");
this.watermetersTextBox.Name = "watermetersTextBox";
//
// watermetersLabel
//
resources.ApplyResources(this.watermetersLabel, "watermetersLabel");
this.watermetersLabel.Name = "watermetersLabel";
//
// lastChangedOnTextBox
//
resources.ApplyResources(this.lastChangedOnTextBox, "lastChangedOnTextBox");
this.lastChangedOnTextBox.Name = "lastChangedOnTextBox";
//
// label15
//
resources.ApplyResources(this.label15, "label15");
this.label15.Name = "label15";
//
// lastChangedByTextBox
//
resources.ApplyResources(this.lastChangedByTextBox, "lastChangedByTextBox");
this.lastChangedByTextBox.Name = "lastChangedByTextBox";
//
// label16
//
resources.ApplyResources(this.label16, "label16");
this.label16.Name = "label16";
//
// createdOnTextBox
//
resources.ApplyResources(this.createdOnTextBox, "createdOnTextBox");
this.createdOnTextBox.Name = "createdOnTextBox";
//
// label14
//
resources.ApplyResources(this.label14, "label14");
this.label14.Name = "label14";
//
// createdByTextBox
//
resources.ApplyResources(this.createdByTextBox, "createdByTextBox");
this.createdByTextBox.Name = "createdByTextBox";
//
// label13
//
resources.ApplyResources(this.label13, "label13");
this.label13.Name = "label13";
//
// descriptionTextBox
//
resources.ApplyResources(this.descriptionTextBox, "descriptionTextBox");
this.descriptionTextBox.Name = "descriptionTextBox";
//
// label12
//
resources.ApplyResources(this.label12, "label12");
this.label12.Name = "label12";
//
// procNameTextBox
//
resources.ApplyResources(this.procNameTextBox, "procNameTextBox");
this.procNameTextBox.Name = "procNameTextBox";
//
// label1
//
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
//
// historyTabPage
//
this.historyTabPage.Controls.Add(this.historyListViewEx);
resources.ApplyResources(this.historyTabPage, "historyTabPage");
this.historyTabPage.Name = "historyTabPage";
this.historyTabPage.UseVisualStyleBackColor = true;
//
// historyListViewEx
//
this.historyListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.historyListViewEx, "historyListViewEx");
this.historyListViewEx.DoubleClickActivation = false;
this.historyListViewEx.FullRowSelect = true;
this.historyListViewEx.GridLines = true;
this.historyListViewEx.Name = "historyListViewEx";
this.historyListViewEx.UseCompatibleStateImageBehavior = false;
this.historyListViewEx.View = System.Windows.Forms.View.Details;
//
// metrology1TabPage
//
this.metrology1TabPage.Controls.Add(this.metrology1ListViewEx);
resources.ApplyResources(this.metrology1TabPage, "metrology1TabPage");
this.metrology1TabPage.Name = "metrology1TabPage";
this.metrology1TabPage.UseVisualStyleBackColor = true;
//
// metrology1ListViewEx
//
this.metrology1ListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.metrology1ListViewEx, "metrology1ListViewEx");
this.metrology1ListViewEx.DoubleClickActivation = false;
this.metrology1ListViewEx.FullRowSelect = true;
this.metrology1ListViewEx.GridLines = true;
this.metrology1ListViewEx.Name = "metrology1ListViewEx";
this.metrology1ListViewEx.UseCompatibleStateImageBehavior = false;
this.metrology1ListViewEx.View = System.Windows.Forms.View.Details;
this.metrology1ListViewEx.SelectedIndexChanged += new System.EventHandler(this.metrology1ListViewEx_SelectedIndexChanged);
//
// metrology2TabPage
//
this.metrology2TabPage.Controls.Add(this.metrology2ListViewEx);
resources.ApplyResources(this.metrology2TabPage, "metrology2TabPage");
this.metrology2TabPage.Name = "metrology2TabPage";
this.metrology2TabPage.UseVisualStyleBackColor = true;
//
// metrology2ListViewEx
//
this.metrology2ListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.metrology2ListViewEx, "metrology2ListViewEx");
this.metrology2ListViewEx.DoubleClickActivation = false;
this.metrology2ListViewEx.FullRowSelect = true;
this.metrology2ListViewEx.GridLines = true;
this.metrology2ListViewEx.Name = "metrology2ListViewEx";
this.metrology2ListViewEx.UseCompatibleStateImageBehavior = false;
this.metrology2ListViewEx.View = System.Windows.Forms.View.Details;
this.metrology2ListViewEx.SelectedIndexChanged += new System.EventHandler(this.metrology2ListViewEx_SelectedIndexChanged);
//
// processTabPage
//
this.processTabPage.Controls.Add(this.processListViewEx);
resources.ApplyResources(this.processTabPage, "processTabPage");
this.processTabPage.Name = "processTabPage";
this.processTabPage.UseVisualStyleBackColor = true;
//
// processListViewEx
//
this.processListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.processListViewEx, "processListViewEx");
this.processListViewEx.DoubleClickActivation = false;
this.processListViewEx.FullRowSelect = true;
this.processListViewEx.GridLines = true;
this.processListViewEx.Name = "processListViewEx";
this.processListViewEx.UseCompatibleStateImageBehavior = false;
this.processListViewEx.View = System.Windows.Forms.View.Details;
this.processListViewEx.SelectedIndexChanged += new System.EventHandler(this.processListViewEx_SelectedIndexChanged);
//
// parametersTabPage
//
this.parametersTabPage.Controls.Add(this.parametersListViewEx);
resources.ApplyResources(this.parametersTabPage, "parametersTabPage");
this.parametersTabPage.Name = "parametersTabPage";
this.parametersTabPage.UseVisualStyleBackColor = true;
//
// parametersListViewEx
//
this.parametersListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.parametersListViewEx, "parametersListViewEx");
this.parametersListViewEx.DoubleClickActivation = false;
this.parametersListViewEx.FullRowSelect = true;
this.parametersListViewEx.Name = "parametersListViewEx";
this.parametersListViewEx.UseCompatibleStateImageBehavior = false;
this.parametersListViewEx.View = System.Windows.Forms.View.Details;
//
// sharedButtons
//
resources.ApplyResources(this.sharedButtons, "sharedButtons");
this.sharedButtons.Name = "sharedButtons";
//
// printer2ComboBox
//
this.printer2ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.printer2ComboBox, "printer2ComboBox");
this.printer2ComboBox.Name = "printer2ComboBox";
//
// fileWriter3ComboBox
//
this.fileWriter3ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.fileWriter3ComboBox, "fileWriter3ComboBox");
this.fileWriter3ComboBox.Name = "fileWriter3ComboBox";
//
// fileWriter4ComboBox
//
this.fileWriter4ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.fileWriter4ComboBox, "fileWriter4ComboBox");
this.fileWriter4ComboBox.Name = "fileWriter4ComboBox";
//
// ProcedureDlg
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.mainSplitContainer);
this.Name = "ProcedureDlg";
this.Load += new System.EventHandler(this.ProcedureDlg_Load);
this.mainSplitContainer.Panel1.ResumeLayout(false);
this.mainSplitContainer.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).EndInit();
this.mainSplitContainer.ResumeLayout(false);
this.tabControl.ResumeLayout(false);
this.generalTabPage.ResumeLayout(false);
this.generalTabPage.PerformLayout();
this.historyTabPage.ResumeLayout(false);
this.metrology1TabPage.ResumeLayout(false);
this.metrology2TabPage.ResumeLayout(false);
this.processTabPage.ResumeLayout(false);
this.parametersTabPage.ResumeLayout(false);
this.ResumeLayout(false);
}
@ -454,8 +478,8 @@ namespace TBF
private UiControls.ListViewEx processListViewEx;
private UiControls.SharedButtons sharedButtons;
private System.Windows.Forms.TabPage generalTabPage;
private System.Windows.Forms.ComboBox resultsWriterComboBox;
private System.Windows.Forms.ComboBox resultsPrinterComboBox;
private System.Windows.Forms.ComboBox fileWriter1ComboBox;
private System.Windows.Forms.ComboBox printer1ComboBox;
private System.Windows.Forms.ComboBox dataEntryComboBox;
private System.Windows.Forms.Label resultsWriterLabel;
private System.Windows.Forms.Label resultsPrinterLabel;
@ -486,6 +510,9 @@ namespace TBF
private UiControls.ListViewEx parametersListViewEx;
private System.Windows.Forms.TextBox protocolTitleTextBox;
private System.Windows.Forms.Label protocolTitleLabel;
private System.Windows.Forms.ComboBox resultsWriter2ComboBox;
private System.Windows.Forms.ComboBox fileWriter2ComboBox;
private System.Windows.Forms.ComboBox fileWriter3ComboBox;
private System.Windows.Forms.ComboBox printer2ComboBox;
private System.Windows.Forms.ComboBox fileWriter4ComboBox;
}
}

143
TestBenchFramework/ProcedureDlg.cs
View File

@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using log4net;
@ -97,19 +98,19 @@ namespace TBF
RegulValves = new List<IRegulValve>();
TestMethods = new List<ITestMethod>();
dataEntryComboBox.Items.Add("---");
resultsPrinterComboBox.Items.Add("---");
resultsWriterComboBox.Items.Add("---");
resultsWriter2ComboBox.Items.Add("---");
printer1ComboBox.Items.Add("---");
fileWriter1ComboBox.Items.Add("---");
fileWriter2ComboBox.Items.Add("---");
foreach (var cmpnt in TbfComponents)
{
if (cmpnt is IRegulValve) RegulValves.Add(cmpnt as IRegulValve);
if (cmpnt is ITestMethod) TestMethods.Add(cmpnt as ITestMethod);
if (cmpnt is IDataEntry) dataEntryComboBox.Items.Add(cmpnt.Cfg.Name);
if (cmpnt is IResultsPrinter) resultsPrinterComboBox.Items.Add(cmpnt.Cfg.Name);
if (cmpnt is IResultsPrinter) printer1ComboBox.Items.Add(cmpnt.Cfg.Name);
if (cmpnt is IResultsWriter)
{
resultsWriterComboBox.Items.Add(cmpnt.Cfg.Name);
resultsWriter2ComboBox.Items.Add(cmpnt.Cfg.Name);
fileWriter1ComboBox.Items.Add(cmpnt.Cfg.Name);
fileWriter2ComboBox.Items.Add(cmpnt.Cfg.Name);
}
}
}
@ -274,13 +275,16 @@ namespace TBF
watermetersTextBox.Enabled = false;
protocolTitleTextBox.Enabled = false;
dataEntryComboBox.Enabled = false;
metersKindRadioButton1.Enabled = false;
metersKindRadioButton2.Enabled = false;
resultsPrinterComboBox.Enabled = false;
resultsWriterComboBox.Enabled = false;
resultsWriter2ComboBox.Enabled = false;
transitionStartComboBox.Enabled = false;
transitionStartComboBox.Enabled = false;
transitionEndComboBox.Enabled = false;
printer1ComboBox.Enabled = false;
printer2ComboBox.Enabled = false;
fileWriter1ComboBox.Enabled = false;
fileWriter2ComboBox.Enabled = false;
fileWriter3ComboBox.Enabled = false;
fileWriter4ComboBox.Enabled = false;
metersKindRadioButton1.Enabled = false;
metersKindRadioButton2.Enabled = false;
notesTextBox.Enabled = false;
/// Make some controls readonly
@ -332,26 +336,41 @@ namespace TBF
}
watermetersTextBox.Text = LoadedProcedure.Watermeters;
protocolTitleTextBox.Text = LoadedProcedure.ProtocolTitle;
metersKindRadioButton1.Checked = (LoadedProcedure.MetersKind == MetersKind.Single);
metersKindRadioButton2.Checked = (LoadedProcedure.MetersKind == MetersKind.Combined);
notesTextBox.Text = LoadedProcedure.LongDescription;
dataEntryComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.DataEntry) ? "---" : LoadedProcedure.DataEntry;
resultsPrinterComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.ResultsPrinter) ? "---" : LoadedProcedure.ResultsPrinter;
transitionStartComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.TransitionStart) ? "---" : LoadedProcedure.TransitionStart;
transitionEndComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.TransitionEnd) ? "---" : LoadedProcedure.TransitionEnd;
if (string.IsNullOrEmpty(LoadedProcedure.ResultsPrinter))
{
printer1ComboBox.Text = "---";
printer2ComboBox.Text = "---";
}
else
{
string[] fields = LoadedProcedure.ResultsPrinter.Split(new char[] { '~' });
printer1ComboBox.Text = fields[0];
printer2ComboBox.Text = (fields.Length == 2) ? fields[1] : "---";
}
if (string.IsNullOrEmpty(LoadedProcedure.ResultsWriter))
{
resultsWriterComboBox.Text = "---";
resultsWriter2ComboBox.Text = "---";
}
fileWriter1ComboBox.Text = "---";
fileWriter2ComboBox.Text = "---";
fileWriter3ComboBox.Text = "---";
fileWriter4ComboBox.Text = "---";
}
else
{
string[] fields = LoadedProcedure.ResultsWriter.Split(new char[] { '~' });
resultsWriterComboBox.Text = fields[0];
resultsWriter2ComboBox.Text = (fields.Length == 2) ? fields[1] : "---";
}
fileWriter1ComboBox.Text = fields[0];
fileWriter2ComboBox.Text = (fields.Length >= 2) ? fields[1] : "---";
fileWriter3ComboBox.Text = (fields.Length >= 3) ? fields[2] : "---";
fileWriter4ComboBox.Text = (fields.Length >= 4) ? fields[3] : "---";
}
transitionStartComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.TransitionStart) ? "---" : LoadedProcedure.TransitionStart;
transitionEndComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.TransitionEnd) ? "---" : LoadedProcedure.TransitionEnd;
metersKindRadioButton1.Checked = (LoadedProcedure.MetersKind == MetersKind.Single);
metersKindRadioButton2.Checked = (LoadedProcedure.MetersKind == MetersKind.Combined);
notesTextBox.Text = LoadedProcedure.LongDescription;
}
void UpdateFromGeneralTab()
@ -362,38 +381,64 @@ namespace TBF
LoadedProcedure.Description = descriptionTextBox.Text;
LoadedProcedure.LastChgUser = User.CurrentUser.Name;
LoadedProcedure.LastChgTime = DateTime.Now;
LoadedProcedure.LongDescription = notesTextBox.Text;
LoadedProcedure.Watermeters = watermetersTextBox.Text;
LoadedProcedure.ProtocolTitle = protocolTitleTextBox.Text;
LoadedProcedure.MetersKind = (metersKindRadioButton1.Checked ? MetersKind.Single : MetersKind.Combined);
if (transitionStartComboBox.Items.Contains(transitionStartComboBox.Text))
{
LoadedProcedure.TransitionStart = transitionStartComboBox.Text.Equals("---") ? string.Empty : transitionStartComboBox.Text;
}
if (transitionEndComboBox.Items.Contains(transitionEndComboBox.Text))
{
LoadedProcedure.TransitionEnd = transitionEndComboBox.Text.Equals("---") ? string.Empty : transitionEndComboBox.Text;
}
if (dataEntryComboBox.Items.Contains(dataEntryComboBox.Text))
{
LoadedProcedure.DataEntry = dataEntryComboBox.Text.Equals("---") ? string.Empty : dataEntryComboBox.Text;
}
if (resultsPrinterComboBox.Items.Contains(resultsPrinterComboBox.Text))
{
LoadedProcedure.ResultsPrinter = resultsPrinterComboBox.Text.Equals("---") ? string.Empty : resultsPrinterComboBox.Text;
}
if (resultsWriterComboBox.Items.Contains(resultsWriterComboBox.Text) && resultsWriter2ComboBox.Items.Contains(resultsWriter2ComboBox.Text))
{
bool rw1 = !resultsWriterComboBox.Text.Equals("---");
bool rw2 = !resultsWriter2ComboBox.Text.Equals("---");
if (!rw1 && !rw2) LoadedProcedure.ResultsWriter = string.Empty;
else if (rw1 && !rw2) LoadedProcedure.ResultsWriter = resultsWriterComboBox.Text;
else if (!rw1 && rw2) LoadedProcedure.ResultsWriter = resultsWriter2ComboBox.Text;
else LoadedProcedure.ResultsWriter = resultsWriterComboBox.Text + '~' + resultsWriter2ComboBox.Text;
}
if (transitionStartComboBox.Items.Contains(transitionStartComboBox.Text))
if (printer1ComboBox.Items.Contains(printer1ComboBox.Text) && printer2ComboBox.Items.Contains(printer2ComboBox.Text))
{
bool pr = !printer1ComboBox.Text.Equals("---");
bool pr2 = !printer2ComboBox.Text.Equals("---");
if (!pr && !pr2) LoadedProcedure.ResultsPrinter = string.Empty;
else if (pr && !pr2) LoadedProcedure.ResultsPrinter = printer1ComboBox.Text;
else if (!pr && pr2) LoadedProcedure.ResultsPrinter = printer2ComboBox.Text;
else LoadedProcedure.ResultsPrinter = printer1ComboBox.Text + '~' + printer2ComboBox.Text;
}
if (fileWriter1ComboBox.Items.Contains(fileWriter1ComboBox.Text) &&
fileWriter2ComboBox.Items.Contains(fileWriter2ComboBox.Text) &&
fileWriter3ComboBox.Items.Contains(fileWriter3ComboBox.Text) &&
fileWriter4ComboBox.Items.Contains(fileWriter4ComboBox.Text))
{
LoadedProcedure.TransitionStart = transitionStartComboBox.Text.Equals("---") ? string.Empty : transitionStartComboBox.Text;
}
if (transitionEndComboBox.Items.Contains(transitionEndComboBox.Text))
{
LoadedProcedure.TransitionEnd = transitionEndComboBox.Text.Equals("---") ? string.Empty : transitionEndComboBox.Text;
bool first = true;
StringBuilder sb = new StringBuilder();
if (!fileWriter1ComboBox.Text.Equals("---"))
{
sb.Append(fileWriter1ComboBox.Text);
}
if (!fileWriter2ComboBox.Text.Equals("---"))
{
if (!first) { sb.Append("~"); first = false; }
sb.Append(fileWriter2ComboBox.Text);
}
if (!fileWriter3ComboBox.Text.Equals("---"))
{
if (!first) { sb.Append("~"); first = false; }
sb.Append(fileWriter3ComboBox.Text);
}
if (!fileWriter4ComboBox.Text.Equals("---"))
{
if (!first) { sb.Append("~"); first = false; }
sb.Append(fileWriter4ComboBox.Text);
}
LoadedProcedure.ResultsWriter = sb.ToString();
}
LoadedProcedure.MetersKind = (metersKindRadioButton1.Checked ? MetersKind.Single : MetersKind.Combined);
LoadedProcedure.LongDescription = notesTextBox.Text;
}
#endregion
@ -1236,9 +1281,9 @@ namespace TBF
dataEntryComboBox.Enabled = true;
metersKindRadioButton1.Enabled = true;
metersKindRadioButton2.Enabled = true;
resultsPrinterComboBox.Enabled = true;
resultsWriterComboBox.Enabled = true;
resultsWriter2ComboBox.Enabled = true;
printer1ComboBox.Enabled = true;
fileWriter1ComboBox.Enabled = true;
fileWriter2ComboBox.Enabled = true;
transitionStartComboBox.Enabled = true;
transitionEndComboBox.Enabled = true;
notesTextBox.Enabled = true;

277
TestBenchFramework/ProcedureDlg.resx
View File

@ -129,29 +129,92 @@
<data name="mainSplitContainer.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="resultsWriter2ComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 270</value>
<data name="fileWriter4ComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 335</value>
</data>
<data name="resultsWriter2ComboBox.Size" type="System.Drawing.Size, System.Drawing">
<data name="fileWriter4ComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 21</value>
</data>
<data name="resultsWriter2ComboBox.TabIndex" type="System.Int32, mscorlib">
<value>24</value>
<data name="fileWriter4ComboBox.TabIndex" type="System.Int32, mscorlib">
<value>29</value>
</data>
<data name="&gt;&gt;resultsWriter2ComboBox.Name" xml:space="preserve">
<value>resultsWriter2ComboBox</value>
<data name="&gt;&gt;fileWriter4ComboBox.Name" xml:space="preserve">
<value>fileWriter4ComboBox</value>
</data>
<data name="&gt;&gt;resultsWriter2ComboBox.Type" xml:space="preserve">
<data name="&gt;&gt;fileWriter4ComboBox.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;resultsWriter2ComboBox.Parent" xml:space="preserve">
<data name="&gt;&gt;fileWriter4ComboBox.Parent" xml:space="preserve">
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;resultsWriter2ComboBox.ZOrder" xml:space="preserve">
<data name="&gt;&gt;fileWriter4ComboBox.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="fileWriter3ComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 312</value>
</data>
<data name="fileWriter3ComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 21</value>
</data>
<data name="fileWriter3ComboBox.TabIndex" type="System.Int32, mscorlib">
<value>28</value>
</data>
<data name="&gt;&gt;fileWriter3ComboBox.Name" xml:space="preserve">
<value>fileWriter3ComboBox</value>
</data>
<data name="&gt;&gt;fileWriter3ComboBox.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;fileWriter3ComboBox.Parent" xml:space="preserve">
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;fileWriter3ComboBox.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="printer2ComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 243</value>
</data>
<data name="printer2ComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 21</value>
</data>
<data name="printer2ComboBox.TabIndex" type="System.Int32, mscorlib">
<value>24</value>
</data>
<data name="&gt;&gt;printer2ComboBox.Name" xml:space="preserve">
<value>printer2ComboBox</value>
</data>
<data name="&gt;&gt;printer2ComboBox.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;printer2ComboBox.Parent" xml:space="preserve">
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;printer2ComboBox.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="fileWriter2ComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 289</value>
</data>
<data name="fileWriter2ComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 21</value>
</data>
<data name="fileWriter2ComboBox.TabIndex" type="System.Int32, mscorlib">
<value>27</value>
</data>
<data name="&gt;&gt;fileWriter2ComboBox.Name" xml:space="preserve">
<value>fileWriter2ComboBox</value>
</data>
<data name="&gt;&gt;fileWriter2ComboBox.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;fileWriter2ComboBox.Parent" xml:space="preserve">
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;fileWriter2ComboBox.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="protocolTitleTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 138</value>
<value>139, 128</value>
</data>
<data name="protocolTitleTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>522, 20</value>
@ -169,7 +232,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;protocolTitleTextBox.ZOrder" xml:space="preserve">
<value>1</value>
<value>4</value>
</data>
<data name="protocolTitleLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -178,7 +241,7 @@
<value>NoControl</value>
</data>
<data name="protocolTitleLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>24, 141</value>
<value>24, 131</value>
</data>
<data name="protocolTitleLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 13</value>
@ -199,7 +262,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;protocolTitleLabel.ZOrder" xml:space="preserve">
<value>2</value>
<value>5</value>
</data>
<data name="metersKindRadioButton2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -208,13 +271,13 @@
<value>NoControl</value>
</data>
<data name="metersKindRadioButton2.Location" type="System.Drawing.Point, System.Drawing">
<value>98, 168</value>
<value>418, 163</value>
</data>
<data name="metersKindRadioButton2.Size" type="System.Drawing.Size, System.Drawing">
<value>72, 17</value>
</data>
<data name="metersKindRadioButton2.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
<value>31</value>
</data>
<data name="metersKindRadioButton2.Text" xml:space="preserve">
<value>Combined</value>
@ -229,19 +292,19 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;metersKindRadioButton2.ZOrder" xml:space="preserve">
<value>3</value>
<value>6</value>
</data>
<data name="metersKindRadioButton1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="metersKindRadioButton1.Location" type="System.Drawing.Point, System.Drawing">
<value>27, 168</value>
<value>347, 163</value>
</data>
<data name="metersKindRadioButton1.Size" type="System.Drawing.Size, System.Drawing">
<value>54, 17</value>
</data>
<data name="metersKindRadioButton1.TabIndex" type="System.Int32, mscorlib">
<value>16</value>
<value>30</value>
</data>
<data name="metersKindRadioButton1.Text" xml:space="preserve">
<value>Single</value>
@ -256,16 +319,16 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;metersKindRadioButton1.ZOrder" xml:space="preserve">
<value>4</value>
<value>7</value>
</data>
<data name="transitionEndComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 320</value>
<value>139, 197</value>
</data>
<data name="transitionEndComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 21</value>
</data>
<data name="transitionEndComboBox.TabIndex" type="System.Int32, mscorlib">
<value>28</value>
<value>21</value>
</data>
<data name="&gt;&gt;transitionEndComboBox.Name" xml:space="preserve">
<value>transitionEndComboBox</value>
@ -277,7 +340,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;transitionEndComboBox.ZOrder" xml:space="preserve">
<value>5</value>
<value>8</value>
</data>
<data name="transitionEndLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -286,13 +349,13 @@
<value>NoControl</value>
</data>
<data name="transitionEndLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>24, 325</value>
<value>24, 202</value>
</data>
<data name="transitionEndLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>63, 13</value>
</data>
<data name="transitionEndLabel.TabIndex" type="System.Int32, mscorlib">
<value>27</value>
<value>20</value>
</data>
<data name="transitionEndLabel.Text" xml:space="preserve">
<value>Purge - End</value>
@ -307,16 +370,16 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;transitionEndLabel.ZOrder" xml:space="preserve">
<value>6</value>
<value>9</value>
</data>
<data name="transitionStartComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 295</value>
<value>139, 174</value>
</data>
<data name="transitionStartComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 21</value>
</data>
<data name="transitionStartComboBox.TabIndex" type="System.Int32, mscorlib">
<value>26</value>
<value>19</value>
</data>
<data name="&gt;&gt;transitionStartComboBox.Name" xml:space="preserve">
<value>transitionStartComboBox</value>
@ -328,7 +391,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;transitionStartComboBox.ZOrder" xml:space="preserve">
<value>7</value>
<value>10</value>
</data>
<data name="transitionStartLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -337,13 +400,13 @@
<value>NoControl</value>
</data>
<data name="transitionStartLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>24, 298</value>
<value>24, 177</value>
</data>
<data name="transitionStartLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 13</value>
</data>
<data name="transitionStartLabel.TabIndex" type="System.Int32, mscorlib">
<value>25</value>
<value>18</value>
</data>
<data name="transitionStartLabel.Text" xml:space="preserve">
<value>Purge - Begin</value>
@ -358,58 +421,58 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;transitionStartLabel.ZOrder" xml:space="preserve">
<value>8</value>
<value>11</value>
</data>
<data name="resultsWriterComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 245</value>
<data name="fileWriter1ComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 266</value>
</data>
<data name="resultsWriterComboBox.Size" type="System.Drawing.Size, System.Drawing">
<data name="fileWriter1ComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 21</value>
</data>
<data name="resultsWriterComboBox.TabIndex" type="System.Int32, mscorlib">
<value>23</value>
<data name="fileWriter1ComboBox.TabIndex" type="System.Int32, mscorlib">
<value>26</value>
</data>
<data name="&gt;&gt;resultsWriterComboBox.Name" xml:space="preserve">
<value>resultsWriterComboBox</value>
<data name="&gt;&gt;fileWriter1ComboBox.Name" xml:space="preserve">
<value>fileWriter1ComboBox</value>
</data>
<data name="&gt;&gt;resultsWriterComboBox.Type" xml:space="preserve">
<data name="&gt;&gt;fileWriter1ComboBox.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;resultsWriterComboBox.Parent" xml:space="preserve">
<data name="&gt;&gt;fileWriter1ComboBox.Parent" xml:space="preserve">
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;resultsWriterComboBox.ZOrder" xml:space="preserve">
<value>9</value>
<data name="&gt;&gt;fileWriter1ComboBox.ZOrder" xml:space="preserve">
<value>12</value>
</data>
<data name="resultsPrinterComboBox.Location" type="System.Drawing.Point, System.Drawing">
<data name="printer1ComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 220</value>
</data>
<data name="resultsPrinterComboBox.Size" type="System.Drawing.Size, System.Drawing">
<data name="printer1ComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 21</value>
</data>
<data name="resultsPrinterComboBox.TabIndex" type="System.Int32, mscorlib">
<value>21</value>
<data name="printer1ComboBox.TabIndex" type="System.Int32, mscorlib">
<value>23</value>
</data>
<data name="&gt;&gt;resultsPrinterComboBox.Name" xml:space="preserve">
<value>resultsPrinterComboBox</value>
<data name="&gt;&gt;printer1ComboBox.Name" xml:space="preserve">
<value>printer1ComboBox</value>
</data>
<data name="&gt;&gt;resultsPrinterComboBox.Type" xml:space="preserve">
<data name="&gt;&gt;printer1ComboBox.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;resultsPrinterComboBox.Parent" xml:space="preserve">
<data name="&gt;&gt;printer1ComboBox.Parent" xml:space="preserve">
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;resultsPrinterComboBox.ZOrder" xml:space="preserve">
<value>10</value>
<data name="&gt;&gt;printer1ComboBox.ZOrder" xml:space="preserve">
<value>13</value>
</data>
<data name="dataEntryComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 195</value>
<value>139, 151</value>
</data>
<data name="dataEntryComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 21</value>
</data>
<data name="dataEntryComboBox.TabIndex" type="System.Int32, mscorlib">
<value>19</value>
<value>17</value>
</data>
<data name="&gt;&gt;dataEntryComboBox.Name" xml:space="preserve">
<value>dataEntryComboBox</value>
@ -421,7 +484,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;dataEntryComboBox.ZOrder" xml:space="preserve">
<value>11</value>
<value>14</value>
</data>
<data name="resultsWriterLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -430,13 +493,13 @@
<value>NoControl</value>
</data>
<data name="resultsWriterLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>24, 250</value>
<value>24, 271</value>
</data>
<data name="resultsWriterLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>70, 13</value>
</data>
<data name="resultsWriterLabel.TabIndex" type="System.Int32, mscorlib">
<value>22</value>
<value>25</value>
</data>
<data name="resultsWriterLabel.Text" xml:space="preserve">
<value>Results writer</value>
@ -451,7 +514,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;resultsWriterLabel.ZOrder" xml:space="preserve">
<value>12</value>
<value>15</value>
</data>
<data name="resultsPrinterLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -463,13 +526,13 @@
<value>24, 225</value>
</data>
<data name="resultsPrinterLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>74, 13</value>
<value>42, 13</value>
</data>
<data name="resultsPrinterLabel.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
<value>22</value>
</data>
<data name="resultsPrinterLabel.Text" xml:space="preserve">
<value>Results printer</value>
<value>Printers</value>
</data>
<data name="&gt;&gt;resultsPrinterLabel.Name" xml:space="preserve">
<value>resultsPrinterLabel</value>
@ -481,7 +544,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;resultsPrinterLabel.ZOrder" xml:space="preserve">
<value>13</value>
<value>16</value>
</data>
<data name="dataEntryLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -490,13 +553,13 @@
<value>NoControl</value>
</data>
<data name="dataEntryLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>25, 198</value>
<value>25, 154</value>
</data>
<data name="dataEntryLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>57, 13</value>
</data>
<data name="dataEntryLabel.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
<value>16</value>
</data>
<data name="dataEntryLabel.Text" xml:space="preserve">
<value>Data Entry</value>
@ -511,7 +574,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;dataEntryLabel.ZOrder" xml:space="preserve">
<value>14</value>
<value>17</value>
</data>
<data name="notesTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>344, 195</value>
@ -520,10 +583,10 @@
<value>True</value>
</data>
<data name="notesTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>317, 146</value>
<value>317, 161</value>
</data>
<data name="notesTextBox.TabIndex" type="System.Int32, mscorlib">
<value>30</value>
<value>33</value>
</data>
<data name="&gt;&gt;notesTextBox.Name" xml:space="preserve">
<value>notesTextBox</value>
@ -535,7 +598,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;notesTextBox.ZOrder" xml:space="preserve">
<value>15</value>
<value>18</value>
</data>
<data name="label18.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -550,7 +613,7 @@
<value>35, 13</value>
</data>
<data name="label18.TabIndex" type="System.Int32, mscorlib">
<value>29</value>
<value>32</value>
</data>
<data name="label18.Text" xml:space="preserve">
<value>Notes</value>
@ -565,10 +628,10 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;label18.ZOrder" xml:space="preserve">
<value>16</value>
<value>19</value>
</data>
<data name="watermetersTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 113</value>
<value>139, 105</value>
</data>
<data name="watermetersTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>522, 20</value>
@ -586,7 +649,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;watermetersTextBox.ZOrder" xml:space="preserve">
<value>17</value>
<value>20</value>
</data>
<data name="watermetersLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -595,7 +658,7 @@
<value>NoControl</value>
</data>
<data name="watermetersLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>24, 116</value>
<value>24, 108</value>
</data>
<data name="watermetersLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>94, 13</value>
@ -616,10 +679,10 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;watermetersLabel.ZOrder" xml:space="preserve">
<value>18</value>
<value>21</value>
</data>
<data name="lastChangedOnTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>344, 88</value>
<value>344, 82</value>
</data>
<data name="lastChangedOnTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>97, 20</value>
@ -637,7 +700,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;lastChangedOnTextBox.ZOrder" xml:space="preserve">
<value>19</value>
<value>22</value>
</data>
<data name="label15.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -646,7 +709,7 @@
<value>NoControl</value>
</data>
<data name="label15.Location" type="System.Drawing.Point, System.Drawing">
<value>291, 91</value>
<value>291, 85</value>
</data>
<data name="label15.Size" type="System.Drawing.Size, System.Drawing">
<value>30, 13</value>
@ -667,10 +730,10 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;label15.ZOrder" xml:space="preserve">
<value>20</value>
<value>23</value>
</data>
<data name="lastChangedByTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 88</value>
<value>139, 82</value>
</data>
<data name="lastChangedByTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 20</value>
@ -688,7 +751,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;lastChangedByTextBox.ZOrder" xml:space="preserve">
<value>21</value>
<value>24</value>
</data>
<data name="label16.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -697,7 +760,7 @@
<value>NoControl</value>
</data>
<data name="label16.Location" type="System.Drawing.Point, System.Drawing">
<value>24, 91</value>
<value>24, 85</value>
</data>
<data name="label16.Size" type="System.Drawing.Size, System.Drawing">
<value>86, 13</value>
@ -718,10 +781,10 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;label16.ZOrder" xml:space="preserve">
<value>22</value>
<value>25</value>
</data>
<data name="createdOnTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>344, 63</value>
<value>344, 59</value>
</data>
<data name="createdOnTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>97, 20</value>
@ -739,7 +802,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;createdOnTextBox.ZOrder" xml:space="preserve">
<value>23</value>
<value>26</value>
</data>
<data name="label14.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -748,7 +811,7 @@
<value>NoControl</value>
</data>
<data name="label14.Location" type="System.Drawing.Point, System.Drawing">
<value>291, 66</value>
<value>291, 62</value>
</data>
<data name="label14.Size" type="System.Drawing.Size, System.Drawing">
<value>30, 13</value>
@ -769,10 +832,10 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;label14.ZOrder" xml:space="preserve">
<value>24</value>
<value>27</value>
</data>
<data name="createdByTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 63</value>
<value>139, 59</value>
</data>
<data name="createdByTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 20</value>
@ -790,7 +853,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;createdByTextBox.ZOrder" xml:space="preserve">
<value>25</value>
<value>28</value>
</data>
<data name="label13.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -799,7 +862,7 @@
<value>NoControl</value>
</data>
<data name="label13.Location" type="System.Drawing.Point, System.Drawing">
<value>24, 66</value>
<value>24, 62</value>
</data>
<data name="label13.Size" type="System.Drawing.Size, System.Drawing">
<value>58, 13</value>
@ -820,10 +883,10 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
<value>26</value>
<value>29</value>
</data>
<data name="descriptionTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 38</value>
<value>139, 36</value>
</data>
<data name="descriptionTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>522, 20</value>
@ -841,7 +904,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;descriptionTextBox.ZOrder" xml:space="preserve">
<value>27</value>
<value>30</value>
</data>
<data name="label12.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -850,7 +913,7 @@
<value>NoControl</value>
</data>
<data name="label12.Location" type="System.Drawing.Point, System.Drawing">
<value>24, 41</value>
<value>24, 39</value>
</data>
<data name="label12.Size" type="System.Drawing.Size, System.Drawing">
<value>86, 13</value>
@ -871,7 +934,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;label12.ZOrder" xml:space="preserve">
<value>28</value>
<value>31</value>
</data>
<data name="procNameTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 13</value>
@ -892,7 +955,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;procNameTextBox.ZOrder" xml:space="preserve">
<value>29</value>
<value>32</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -922,7 +985,7 @@
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<value>30</value>
<value>33</value>
</data>
<data name="generalTabPage.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 34</value>
@ -931,7 +994,7 @@
<value>3, 3, 3, 3</value>
</data>
<data name="generalTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 352</value>
<value>923, 364</value>
</data>
<data name="generalTabPage.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -967,7 +1030,7 @@
<value>historyListViewEx</value>
</data>
<data name="&gt;&gt;historyListViewEx.Type" xml:space="preserve">
<value>TBF.UiControls.ListViewEx, TBF, Version=2.5.276.1, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UiControls.ListViewEx, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;historyListViewEx.Parent" xml:space="preserve">
<value>historyTabPage</value>
@ -1018,7 +1081,7 @@
<value>metrology1ListViewEx</value>
</data>
<data name="&gt;&gt;metrology1ListViewEx.Type" xml:space="preserve">
<value>TBF.UiControls.ListViewEx, TBF, Version=2.5.276.1, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UiControls.ListViewEx, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;metrology1ListViewEx.Parent" xml:space="preserve">
<value>metrology1TabPage</value>
@ -1069,7 +1132,7 @@
<value>metrology2ListViewEx</value>
</data>
<data name="&gt;&gt;metrology2ListViewEx.Type" xml:space="preserve">
<value>TBF.UiControls.ListViewEx, TBF, Version=2.5.276.1, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UiControls.ListViewEx, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;metrology2ListViewEx.Parent" xml:space="preserve">
<value>metrology2TabPage</value>
@ -1120,7 +1183,7 @@
<value>processListViewEx</value>
</data>
<data name="&gt;&gt;processListViewEx.Type" xml:space="preserve">
<value>TBF.UiControls.ListViewEx, TBF, Version=2.5.276.1, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UiControls.ListViewEx, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;processListViewEx.Parent" xml:space="preserve">
<value>processTabPage</value>
@ -1171,7 +1234,7 @@
<value>parametersListViewEx</value>
</data>
<data name="&gt;&gt;parametersListViewEx.Type" xml:space="preserve">
<value>TBF.UiControls.ListViewEx, TBF, Version=2.5.276.1, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UiControls.ListViewEx, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;parametersListViewEx.Parent" xml:space="preserve">
<value>parametersTabPage</value>
@ -1213,7 +1276,7 @@
<value>0, 0</value>
</data>
<data name="tabControl.Size" type="System.Drawing.Size, System.Drawing">
<value>931, 390</value>
<value>931, 402</value>
</data>
<data name="tabControl.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -1255,7 +1318,7 @@
<value>sharedButtons</value>
</data>
<data name="&gt;&gt;sharedButtons.Type" xml:space="preserve">
<value>TBF.UiControls.SharedButtons, TBF, Version=2.5.276.1, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UiControls.SharedButtons, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;sharedButtons.Parent" xml:space="preserve">
<value>mainSplitContainer.Panel2</value>
@ -1276,7 +1339,7 @@
<value>1</value>
</data>
<data name="mainSplitContainer.Size" type="System.Drawing.Size, System.Drawing">
<value>1034, 390</value>
<value>1034, 402</value>
</data>
<data name="mainSplitContainer.SplitterDistance" type="System.Int32, mscorlib">
<value>931</value>
@ -1303,7 +1366,7 @@
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1034, 390</value>
<value>1034, 402</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value>