diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs index a5a86a194..18e647e0e 100644 --- a/Results/WMeterRsltItemSpec.cs +++ b/Results/WMeterRsltItemSpec.cs @@ -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)))); } /// diff --git a/TestBenchFramework/ProcedureDlg.Designer.cs b/TestBenchFramework/ProcedureDlg.Designer.cs index 87e205d12..05c813a68 100644 --- a/TestBenchFramework/ProcedureDlg.Designer.cs +++ b/TestBenchFramework/ProcedureDlg.Designer.cs @@ -31,412 +31,436 @@ namespace TBF /// 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; } } \ No newline at end of file diff --git a/TestBenchFramework/ProcedureDlg.cs b/TestBenchFramework/ProcedureDlg.cs index 9e4348fad..877a52ae0 100644 --- a/TestBenchFramework/ProcedureDlg.cs +++ b/TestBenchFramework/ProcedureDlg.cs @@ -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(); TestMethods = new List(); 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; diff --git a/TestBenchFramework/ProcedureDlg.resx b/TestBenchFramework/ProcedureDlg.resx index 029bc56a5..aaf6ff571 100644 --- a/TestBenchFramework/ProcedureDlg.resx +++ b/TestBenchFramework/ProcedureDlg.resx @@ -129,29 +129,92 @@ 0, 0 - - 139, 270 + + 139, 335 - + 121, 21 - - 24 + + 29 - - resultsWriter2ComboBox + + fileWriter4ComboBox - + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + generalTabPage - + 0 + + 139, 312 + + + 121, 21 + + + 28 + + + fileWriter3ComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 1 + + + 139, 243 + + + 121, 21 + + + 24 + + + printer2ComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 2 + + + 139, 289 + + + 121, 21 + + + 27 + + + fileWriter2ComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 3 + - 139, 138 + 139, 128 522, 20 @@ -169,7 +232,7 @@ generalTabPage - 1 + 4 True @@ -178,7 +241,7 @@ NoControl - 24, 141 + 24, 131 65, 13 @@ -199,7 +262,7 @@ generalTabPage - 2 + 5 True @@ -208,13 +271,13 @@ NoControl - 98, 168 + 418, 163 72, 17 - 17 + 31 Combined @@ -229,19 +292,19 @@ generalTabPage - 3 + 6 True - 27, 168 + 347, 163 54, 17 - 16 + 30 Single @@ -256,16 +319,16 @@ generalTabPage - 4 + 7 - 139, 320 + 139, 197 121, 21 - 28 + 21 transitionEndComboBox @@ -277,7 +340,7 @@ generalTabPage - 5 + 8 True @@ -286,13 +349,13 @@ NoControl - 24, 325 + 24, 202 63, 13 - 27 + 20 Purge - End @@ -307,16 +370,16 @@ generalTabPage - 6 + 9 - 139, 295 + 139, 174 121, 21 - 26 + 19 transitionStartComboBox @@ -328,7 +391,7 @@ generalTabPage - 7 + 10 True @@ -337,13 +400,13 @@ NoControl - 24, 298 + 24, 177 71, 13 - 25 + 18 Purge - Begin @@ -358,58 +421,58 @@ generalTabPage - 8 + 11 - - 139, 245 + + 139, 266 - + 121, 21 - - 23 + + 26 - - resultsWriterComboBox + + fileWriter1ComboBox - + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + generalTabPage - - 9 + + 12 - + 139, 220 - + 121, 21 - - 21 + + 23 - - resultsPrinterComboBox + + printer1ComboBox - + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + generalTabPage - - 10 + + 13 - 139, 195 + 139, 151 121, 21 - 19 + 17 dataEntryComboBox @@ -421,7 +484,7 @@ generalTabPage - 11 + 14 True @@ -430,13 +493,13 @@ NoControl - 24, 250 + 24, 271 70, 13 - 22 + 25 Results writer @@ -451,7 +514,7 @@ generalTabPage - 12 + 15 True @@ -463,13 +526,13 @@ 24, 225 - 74, 13 + 42, 13 - 20 + 22 - Results printer + Printers resultsPrinterLabel @@ -481,7 +544,7 @@ generalTabPage - 13 + 16 True @@ -490,13 +553,13 @@ NoControl - 25, 198 + 25, 154 57, 13 - 18 + 16 Data Entry @@ -511,7 +574,7 @@ generalTabPage - 14 + 17 344, 195 @@ -520,10 +583,10 @@ True - 317, 146 + 317, 161 - 30 + 33 notesTextBox @@ -535,7 +598,7 @@ generalTabPage - 15 + 18 True @@ -550,7 +613,7 @@ 35, 13 - 29 + 32 Notes @@ -565,10 +628,10 @@ generalTabPage - 16 + 19 - 139, 113 + 139, 105 522, 20 @@ -586,7 +649,7 @@ generalTabPage - 17 + 20 True @@ -595,7 +658,7 @@ NoControl - 24, 116 + 24, 108 94, 13 @@ -616,10 +679,10 @@ generalTabPage - 18 + 21 - 344, 88 + 344, 82 97, 20 @@ -637,7 +700,7 @@ generalTabPage - 19 + 22 True @@ -646,7 +709,7 @@ NoControl - 291, 91 + 291, 85 30, 13 @@ -667,10 +730,10 @@ generalTabPage - 20 + 23 - 139, 88 + 139, 82 121, 20 @@ -688,7 +751,7 @@ generalTabPage - 21 + 24 True @@ -697,7 +760,7 @@ NoControl - 24, 91 + 24, 85 86, 13 @@ -718,10 +781,10 @@ generalTabPage - 22 + 25 - 344, 63 + 344, 59 97, 20 @@ -739,7 +802,7 @@ generalTabPage - 23 + 26 True @@ -748,7 +811,7 @@ NoControl - 291, 66 + 291, 62 30, 13 @@ -769,10 +832,10 @@ generalTabPage - 24 + 27 - 139, 63 + 139, 59 121, 20 @@ -790,7 +853,7 @@ generalTabPage - 25 + 28 True @@ -799,7 +862,7 @@ NoControl - 24, 66 + 24, 62 58, 13 @@ -820,10 +883,10 @@ generalTabPage - 26 + 29 - 139, 38 + 139, 36 522, 20 @@ -841,7 +904,7 @@ generalTabPage - 27 + 30 True @@ -850,7 +913,7 @@ NoControl - 24, 41 + 24, 39 86, 13 @@ -871,7 +934,7 @@ generalTabPage - 28 + 31 139, 13 @@ -892,7 +955,7 @@ generalTabPage - 29 + 32 True @@ -922,7 +985,7 @@ generalTabPage - 30 + 33 4, 34 @@ -931,7 +994,7 @@ 3, 3, 3, 3 - 923, 352 + 923, 364 0 @@ -967,7 +1030,7 @@ historyListViewEx - TBF.UiControls.ListViewEx, TBF, Version=2.5.276.1, Culture=neutral, PublicKeyToken=null + TBF.UiControls.ListViewEx, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null historyTabPage @@ -1018,7 +1081,7 @@ metrology1ListViewEx - TBF.UiControls.ListViewEx, TBF, Version=2.5.276.1, Culture=neutral, PublicKeyToken=null + TBF.UiControls.ListViewEx, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null metrology1TabPage @@ -1069,7 +1132,7 @@ metrology2ListViewEx - TBF.UiControls.ListViewEx, TBF, Version=2.5.276.1, Culture=neutral, PublicKeyToken=null + TBF.UiControls.ListViewEx, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null metrology2TabPage @@ -1120,7 +1183,7 @@ processListViewEx - TBF.UiControls.ListViewEx, TBF, Version=2.5.276.1, Culture=neutral, PublicKeyToken=null + TBF.UiControls.ListViewEx, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null processTabPage @@ -1171,7 +1234,7 @@ parametersListViewEx - TBF.UiControls.ListViewEx, TBF, Version=2.5.276.1, Culture=neutral, PublicKeyToken=null + TBF.UiControls.ListViewEx, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null parametersTabPage @@ -1213,7 +1276,7 @@ 0, 0 - 931, 390 + 931, 402 1 @@ -1255,7 +1318,7 @@ sharedButtons - TBF.UiControls.SharedButtons, TBF, Version=2.5.276.1, Culture=neutral, PublicKeyToken=null + TBF.UiControls.SharedButtons, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null mainSplitContainer.Panel2 @@ -1276,7 +1339,7 @@ 1 - 1034, 390 + 1034, 402 931 @@ -1303,7 +1366,7 @@ 6, 13 - 1034, 390 + 1034, 402 CenterParent