From 9ac237a377fb6258042504936c7f94b1e4deabbf Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 26 Jun 2017 16:11:47 +0200 Subject: [PATCH] Alternative procedure - UI implemented. --- Config/Entities/Procedure.cs | 5 +- Config/Mappings/ProcedureMap.cs | 4 + TestBenchFramework/ProcedureDlg.Designer.cs | 960 ++++++++++---------- TestBenchFramework/ProcedureDlg.cs | 15 + TestBenchFramework/ProcedureDlg.resx | 296 ++++-- 5 files changed, 718 insertions(+), 562 deletions(-) diff --git a/Config/Entities/Procedure.cs b/Config/Entities/Procedure.cs index 01d8bd78f..4c787d7df 100644 --- a/Config/Entities/Procedure.cs +++ b/Config/Entities/Procedure.cs @@ -28,7 +28,7 @@ namespace Config.Entities public virtual int Revision { get; set; } public virtual int PredecessorId { get; set; } public virtual bool ObtainedByCopy { get; set; } /// Initial version of this procedure was a copy of another procedure - /// + /// public virtual MetersKind MetersKind { get; set; } /// single / compound / heat meters public virtual string Watermeters { get; set; } /// Water meter name or Id public virtual string ProtocolTitle { get; set; } /// Title of the printed and saved protocol @@ -42,6 +42,9 @@ namespace Config.Entities public virtual string TransitionStart { get; set; } public virtual string TransitionEnd { get; set; } + public virtual string AltProcName { get; set; } /// Alternative procedure name (default = null = no alt. procedure) + public virtual int AltProcPeriod { get; set; } /// Period of alternative procedures (default = 0 = no alt. procedure) + public virtual IList MoreParams { get; set; } public virtual IList Tests { get; set; } diff --git a/Config/Mappings/ProcedureMap.cs b/Config/Mappings/ProcedureMap.cs index f3cf37bfe..b47c1a677 100644 --- a/Config/Mappings/ProcedureMap.cs +++ b/Config/Mappings/ProcedureMap.cs @@ -38,6 +38,10 @@ namespace Config.Mappings Map(x => x.ResultsWriter); Map(x => x.TransitionStart); Map(x => x.TransitionEnd); + + Map(x => x.AltProcName); + Map(x => x.AltProcPeriod); + ////Map(x => x.MetrologicalClass); ////HasOne(x => x.WMType); HasMany(x => x.MoreParams) diff --git a/TestBenchFramework/ProcedureDlg.Designer.cs b/TestBenchFramework/ProcedureDlg.Designer.cs index aa1ca4696..90007fd49 100644 --- a/TestBenchFramework/ProcedureDlg.Designer.cs +++ b/TestBenchFramework/ProcedureDlg.Designer.cs @@ -31,470 +31,498 @@ 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.manualControlDisabledCheckBox = new System.Windows.Forms.CheckBox(); - this.mustBeCompleteCheckBox = new System.Windows.Forms.CheckBox(); - this.protectedCheckBox = new System.Windows.Forms.CheckBox(); - this.metersKindRadioButton3 = new System.Windows.Forms.RadioButton(); - this.fileWriter4ComboBox = new System.Windows.Forms.ComboBox(); - this.fileWriter3ComboBox = new System.Windows.Forms.ComboBox(); - this.printer2ComboBox = new System.Windows.Forms.ComboBox(); - 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 Results.Forms.ListViewEx(); - this.metrology1TabPage = new System.Windows.Forms.TabPage(); - this.metrology1ListViewEx = new Results.Forms.ListViewEx(); - this.metrology2TabPage = new System.Windows.Forms.TabPage(); - this.metrology2ListViewEx = new Results.Forms.ListViewEx(); - this.processTabPage = new System.Windows.Forms.TabPage(); - this.processListViewEx = new Results.Forms.ListViewEx(); - this.parametersTabPage = new System.Windows.Forms.TabPage(); - this.parametersListViewEx = new Results.Forms.ListViewEx(); - this.sharedButtons = new TBF.UiControls.SharedButtons(); - ((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.manualControlDisabledCheckBox); - this.generalTabPage.Controls.Add(this.mustBeCompleteCheckBox); - this.generalTabPage.Controls.Add(this.protectedCheckBox); - this.generalTabPage.Controls.Add(this.metersKindRadioButton3); - 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; - // - // manualControlDisabledCheckBox - // - resources.ApplyResources(this.manualControlDisabledCheckBox, "manualControlDisabledCheckBox"); - this.manualControlDisabledCheckBox.Name = "manualControlDisabledCheckBox"; - this.manualControlDisabledCheckBox.UseVisualStyleBackColor = true; - // - // mustBeCompleteCheckBox - // - resources.ApplyResources(this.mustBeCompleteCheckBox, "mustBeCompleteCheckBox"); - this.mustBeCompleteCheckBox.Name = "mustBeCompleteCheckBox"; - this.mustBeCompleteCheckBox.UseVisualStyleBackColor = true; - // - // protectedCheckBox - // - resources.ApplyResources(this.protectedCheckBox, "protectedCheckBox"); - this.protectedCheckBox.Name = "protectedCheckBox"; - this.protectedCheckBox.UseVisualStyleBackColor = true; - // - // metersKindRadioButton3 - // - resources.ApplyResources(this.metersKindRadioButton3, "metersKindRadioButton3"); - this.metersKindRadioButton3.Name = "metersKindRadioButton3"; - this.metersKindRadioButton3.TabStop = true; - this.metersKindRadioButton3.UseVisualStyleBackColor = true; - // - // fileWriter4ComboBox - // - this.fileWriter4ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.fileWriter4ComboBox, "fileWriter4ComboBox"); - this.fileWriter4ComboBox.Name = "fileWriter4ComboBox"; - // - // fileWriter3ComboBox - // - this.fileWriter3ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.fileWriter3ComboBox, "fileWriter3ComboBox"); - this.fileWriter3ComboBox.Name = "fileWriter3ComboBox"; - // - // printer2ComboBox - // - this.printer2ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.printer2ComboBox, "printer2ComboBox"); - this.printer2ComboBox.Name = "printer2ComboBox"; - // - // 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.GridLines = 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"; - // - // 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.manualControlDisabledCheckBox = new System.Windows.Forms.CheckBox(); + this.mustBeCompleteCheckBox = new System.Windows.Forms.CheckBox(); + this.protectedCheckBox = new System.Windows.Forms.CheckBox(); + this.metersKindRadioButton3 = new System.Windows.Forms.RadioButton(); + this.fileWriter4ComboBox = new System.Windows.Forms.ComboBox(); + this.fileWriter3ComboBox = new System.Windows.Forms.ComboBox(); + this.printer2ComboBox = new System.Windows.Forms.ComboBox(); + 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 Results.Forms.ListViewEx(); + this.metrology1TabPage = new System.Windows.Forms.TabPage(); + this.metrology1ListViewEx = new Results.Forms.ListViewEx(); + this.metrology2TabPage = new System.Windows.Forms.TabPage(); + this.metrology2ListViewEx = new Results.Forms.ListViewEx(); + this.processTabPage = new System.Windows.Forms.TabPage(); + this.processListViewEx = new Results.Forms.ListViewEx(); + this.parametersTabPage = new System.Windows.Forms.TabPage(); + this.parametersListViewEx = new Results.Forms.ListViewEx(); + this.sharedButtons = new TBF.UiControls.SharedButtons(); + this.altProcNameTextBox = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.altProcPeriodTextBox = new System.Windows.Forms.TextBox(); + ((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.altProcPeriodTextBox); + this.generalTabPage.Controls.Add(this.label3); + this.generalTabPage.Controls.Add(this.altProcNameTextBox); + this.generalTabPage.Controls.Add(this.label2); + this.generalTabPage.Controls.Add(this.manualControlDisabledCheckBox); + this.generalTabPage.Controls.Add(this.mustBeCompleteCheckBox); + this.generalTabPage.Controls.Add(this.protectedCheckBox); + this.generalTabPage.Controls.Add(this.metersKindRadioButton3); + 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; + // + // manualControlDisabledCheckBox + // + resources.ApplyResources(this.manualControlDisabledCheckBox, "manualControlDisabledCheckBox"); + this.manualControlDisabledCheckBox.Name = "manualControlDisabledCheckBox"; + this.manualControlDisabledCheckBox.UseVisualStyleBackColor = true; + // + // mustBeCompleteCheckBox + // + resources.ApplyResources(this.mustBeCompleteCheckBox, "mustBeCompleteCheckBox"); + this.mustBeCompleteCheckBox.Name = "mustBeCompleteCheckBox"; + this.mustBeCompleteCheckBox.UseVisualStyleBackColor = true; + // + // protectedCheckBox + // + resources.ApplyResources(this.protectedCheckBox, "protectedCheckBox"); + this.protectedCheckBox.Name = "protectedCheckBox"; + this.protectedCheckBox.UseVisualStyleBackColor = true; + // + // metersKindRadioButton3 + // + resources.ApplyResources(this.metersKindRadioButton3, "metersKindRadioButton3"); + this.metersKindRadioButton3.Name = "metersKindRadioButton3"; + this.metersKindRadioButton3.TabStop = true; + this.metersKindRadioButton3.UseVisualStyleBackColor = true; + // + // fileWriter4ComboBox + // + this.fileWriter4ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.fileWriter4ComboBox, "fileWriter4ComboBox"); + this.fileWriter4ComboBox.Name = "fileWriter4ComboBox"; + // + // fileWriter3ComboBox + // + this.fileWriter3ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.fileWriter3ComboBox, "fileWriter3ComboBox"); + this.fileWriter3ComboBox.Name = "fileWriter3ComboBox"; + // + // printer2ComboBox + // + this.printer2ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.printer2ComboBox, "printer2ComboBox"); + this.printer2ComboBox.Name = "printer2ComboBox"; + // + // 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.GridLines = 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"; + // + // altProcNameTextBox + // + resources.ApplyResources(this.altProcNameTextBox, "altProcNameTextBox"); + this.altProcNameTextBox.Name = "altProcNameTextBox"; + // + // label2 + // + resources.ApplyResources(this.label2, "label2"); + this.label2.Name = "label2"; + // + // label3 + // + resources.ApplyResources(this.label3, "label3"); + this.label3.Name = "label3"; + // + // altProcPeriodTextBox + // + resources.ApplyResources(this.altProcPeriodTextBox, "altProcPeriodTextBox"); + this.altProcPeriodTextBox.Name = "altProcPeriodTextBox"; + // + // 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); } @@ -552,5 +580,9 @@ namespace TBF private System.Windows.Forms.CheckBox mustBeCompleteCheckBox; private System.Windows.Forms.CheckBox protectedCheckBox; private System.Windows.Forms.CheckBox manualControlDisabledCheckBox; + private System.Windows.Forms.TextBox altProcNameTextBox; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox altProcPeriodTextBox; + private System.Windows.Forms.Label label3; } } \ No newline at end of file diff --git a/TestBenchFramework/ProcedureDlg.cs b/TestBenchFramework/ProcedureDlg.cs index da714a064..974c4fd9f 100644 --- a/TestBenchFramework/ProcedureDlg.cs +++ b/TestBenchFramework/ProcedureDlg.cs @@ -308,6 +308,8 @@ namespace TBF protectedCheckBox.Enabled = false; mustBeCompleteCheckBox.Enabled = false; manualControlDisabledCheckBox.Enabled = false; + altProcNameTextBox.Enabled = false; + altProcPeriodTextBox.Enabled = false; dataEntryComboBox.Enabled = false; transitionStartComboBox.Enabled = false; transitionEndComboBox.Enabled = false; @@ -408,6 +410,9 @@ namespace TBF transitionStartComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.TransitionStart) ? "---" : LoadedProcedure.TransitionStart; transitionEndComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.TransitionEnd) ? "---" : LoadedProcedure.TransitionEnd; + altProcNameTextBox.Text = string.IsNullOrEmpty(LoadedProcedure.AltProcName) ? "---" : LoadedProcedure.AltProcName; + altProcPeriodTextBox.Text = LoadedProcedure.AltProcPeriod.ToString(); + if (string.IsNullOrEmpty(LoadedProcedure.ResultsPrinter)) { printer1ComboBox.Text = "---"; @@ -457,6 +462,14 @@ namespace TBF LoadedProcedure.MustBeComplete = mustBeCompleteCheckBox.Checked; LoadedProcedure.ManualCtrlDisabled = manualControlDisabledCheckBox.Checked; + LoadedProcedure.AltProcName = altProcNameTextBox.Text.Equals("---") ? string.Empty : altProcNameTextBox.Text; + + int itmp; + if (int.TryParse(altProcPeriodTextBox.Text, out itmp) && itmp >= 0) + { + LoadedProcedure.AltProcPeriod = itmp; + } + if (transitionStartComboBox.Items.Contains(transitionStartComboBox.Text)) { LoadedProcedure.TransitionStart = transitionStartComboBox.Text.Equals("---") ? string.Empty : transitionStartComboBox.Text; @@ -1554,6 +1567,8 @@ namespace TBF dataEntryComboBox.Enabled = true; metersKindRadioButton1.Enabled = true; metersKindRadioButton2.Enabled = true; + altProcNameTextBox.Enabled = true; + altProcPeriodTextBox.Enabled = true; #if HEAT_METERS metersKindRadioButton3.Enabled = true; #endif diff --git a/TestBenchFramework/ProcedureDlg.resx b/TestBenchFramework/ProcedureDlg.resx index bf81f1b34..4e7ee358d 100644 --- a/TestBenchFramework/ProcedureDlg.resx +++ b/TestBenchFramework/ProcedureDlg.resx @@ -129,6 +129,108 @@ 0, 0 + + 636, 151 + + + 34, 20 + + + 19 + + + altProcPeriodTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 0 + + + True + + + NoControl + + + 502, 154 + + + 116, 13 + + + 18 + + + Alternative proc. period + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 1 + + + 148, 151 + + + 217, 20 + + + 17 + + + altProcNameTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 2 + + + True + + + NoControl + + + 20, 154 + + + 113, 13 + + + 16 + + + Alternative proc. name + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 3 + True @@ -136,13 +238,13 @@ NoControl - 505, 206 + 505, 229 138, 17 - 37 + 39 Manual control disabled @@ -157,7 +259,7 @@ generalTabPage - 0 + 4 True @@ -166,13 +268,13 @@ NoControl - 505, 185 + 505, 208 152, 17 - 36 + 38 All tests must be competed @@ -187,7 +289,7 @@ generalTabPage - 1 + 5 True @@ -196,13 +298,13 @@ NoControl - 505, 164 + 505, 187 123, 17 - 35 + 37 Protected procedure @@ -217,7 +319,7 @@ generalTabPage - 2 + 6 True @@ -226,13 +328,13 @@ NoControl - 356, 205 + 356, 228 77, 17 - 34 + 36 Heat meter @@ -247,16 +349,16 @@ generalTabPage - 3 + 7 - 148, 335 + 148, 358 121, 21 - 29 + 33 fileWriter4ComboBox @@ -268,16 +370,16 @@ generalTabPage - 4 + 8 - 148, 312 + 148, 335 121, 21 - 28 + 32 fileWriter3ComboBox @@ -289,16 +391,16 @@ generalTabPage - 5 + 9 - 148, 243 + 148, 266 121, 21 - 24 + 28 printer2ComboBox @@ -310,16 +412,16 @@ generalTabPage - 6 + 10 - 148, 289 + 148, 312 121, 21 - 27 + 31 fileWriter2ComboBox @@ -331,7 +433,7 @@ generalTabPage - 7 + 11 148, 128 @@ -352,7 +454,7 @@ generalTabPage - 8 + 12 True @@ -382,7 +484,7 @@ generalTabPage - 9 + 13 True @@ -391,13 +493,13 @@ NoControl - 356, 184 + 356, 207 72, 17 - 31 + 35 Combined @@ -412,7 +514,7 @@ generalTabPage - 10 + 14 True @@ -421,13 +523,13 @@ NoControl - 356, 163 + 356, 186 54, 17 - 30 + 34 Single @@ -442,16 +544,16 @@ generalTabPage - 11 + 15 - 148, 197 + 148, 220 121, 21 - 21 + 25 transitionEndComboBox @@ -463,7 +565,7 @@ generalTabPage - 12 + 16 True @@ -472,13 +574,13 @@ NoControl - 20, 202 + 20, 225 63, 13 - 20 + 24 Purge - End @@ -493,16 +595,16 @@ generalTabPage - 13 + 17 - 148, 174 + 148, 197 121, 21 - 19 + 23 transitionStartComboBox @@ -514,7 +616,7 @@ generalTabPage - 14 + 18 True @@ -523,13 +625,13 @@ NoControl - 20, 177 + 20, 200 71, 13 - 18 + 22 Purge - Begin @@ -544,16 +646,16 @@ generalTabPage - 15 + 19 - 148, 266 + 148, 289 121, 21 - 26 + 30 fileWriter1ComboBox @@ -565,16 +667,16 @@ generalTabPage - 16 + 20 - 148, 220 + 148, 243 121, 21 - 23 + 27 printer1ComboBox @@ -586,16 +688,16 @@ generalTabPage - 17 + 21 - 148, 151 + 148, 174 121, 21 - 17 + 21 dataEntryComboBox @@ -607,7 +709,7 @@ generalTabPage - 18 + 22 True @@ -616,13 +718,13 @@ NoControl - 20, 271 + 20, 294 70, 13 - 25 + 29 Results writer @@ -637,7 +739,7 @@ generalTabPage - 19 + 23 True @@ -646,13 +748,13 @@ NoControl - 20, 225 + 20, 248 42, 13 - 22 + 26 Printers @@ -667,7 +769,7 @@ generalTabPage - 20 + 24 True @@ -676,13 +778,13 @@ NoControl - 21, 154 + 21, 177 57, 13 - 16 + 20 Data Entry @@ -697,10 +799,10 @@ generalTabPage - 21 + 25 - 353, 243 + 353, 266 True @@ -709,7 +811,7 @@ 317, 113 - 33 + 41 notesTextBox @@ -721,7 +823,7 @@ generalTabPage - 22 + 26 True @@ -730,13 +832,13 @@ NoControl - 291, 243 + 291, 266 35, 13 - 32 + 40 Notes @@ -751,7 +853,7 @@ generalTabPage - 23 + 27 148, 105 @@ -772,7 +874,7 @@ generalTabPage - 24 + 28 True @@ -802,10 +904,10 @@ generalTabPage - 25 + 29 - 353, 82 + 362, 82 150, 20 @@ -823,7 +925,7 @@ generalTabPage - 26 + 30 True @@ -832,7 +934,7 @@ NoControl - 291, 85 + 300, 85 30, 13 @@ -853,7 +955,7 @@ generalTabPage - 27 + 31 148, 82 @@ -874,7 +976,7 @@ generalTabPage - 28 + 32 True @@ -904,10 +1006,10 @@ generalTabPage - 29 + 33 - 353, 59 + 362, 59 150, 20 @@ -925,7 +1027,7 @@ generalTabPage - 30 + 34 True @@ -934,7 +1036,7 @@ NoControl - 291, 62 + 300, 62 30, 13 @@ -955,7 +1057,7 @@ generalTabPage - 31 + 35 148, 59 @@ -976,7 +1078,7 @@ generalTabPage - 32 + 36 True @@ -1006,7 +1108,7 @@ generalTabPage - 33 + 37 148, 36 @@ -1027,7 +1129,7 @@ generalTabPage - 34 + 38 True @@ -1057,7 +1159,7 @@ generalTabPage - 35 + 39 148, 13 @@ -1078,7 +1180,7 @@ generalTabPage - 36 + 40 True @@ -1108,7 +1210,7 @@ generalTabPage - 37 + 41 4, 34 @@ -1117,7 +1219,7 @@ 3, 3, 3, 3 - 923, 364 + 923, 389 0 @@ -1153,7 +1255,7 @@ historyListViewEx - Results.Forms.ListViewEx, Results, Version=2.14.572.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.14.587.0, Culture=neutral, PublicKeyToken=null historyTabPage @@ -1204,7 +1306,7 @@ metrology1ListViewEx - Results.Forms.ListViewEx, Results, Version=2.14.572.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.14.587.0, Culture=neutral, PublicKeyToken=null metrology1TabPage @@ -1255,7 +1357,7 @@ metrology2ListViewEx - Results.Forms.ListViewEx, Results, Version=2.14.572.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.14.587.0, Culture=neutral, PublicKeyToken=null metrology2TabPage @@ -1306,7 +1408,7 @@ processListViewEx - Results.Forms.ListViewEx, Results, Version=2.14.572.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.14.587.0, Culture=neutral, PublicKeyToken=null processTabPage @@ -1357,7 +1459,7 @@ parametersListViewEx - Results.Forms.ListViewEx, Results, Version=2.14.572.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.14.587.0, Culture=neutral, PublicKeyToken=null parametersTabPage @@ -1399,10 +1501,10 @@ 0, 0 - 931, 402 + 931, 427 - 1 + 0 tabControl @@ -1441,7 +1543,7 @@ sharedButtons - TBF.UiControls.SharedButtons, TBF, Version=2.14.572.1, Culture=neutral, PublicKeyToken=null + TBF.UiControls.SharedButtons, TBF, Version=2.14.588.1, Culture=neutral, PublicKeyToken=null mainSplitContainer.Panel2 @@ -1462,7 +1564,7 @@ 1 - 1034, 402 + 1034, 427 931 @@ -1489,7 +1591,7 @@ 6, 13 - 1034, 402 + 1034, 427 CenterParent