diff --git a/TBF/UI/Procedures/ProcedureDlg.Designer.cs b/TBF/UI/Procedures/ProcedureDlg.Designer.cs index 672f48e06..fa427287f 100644 --- a/TBF/UI/Procedures/ProcedureDlg.Designer.cs +++ b/TBF/UI/Procedures/ProcedureDlg.Designer.cs @@ -35,6 +35,21 @@ namespace TBF.UI.Procedures this.mainSplitContainer = new System.Windows.Forms.SplitContainer(); this.tabControl = new System.Windows.Forms.TabControl(); this.generalTabPage = new System.Windows.Forms.TabPage(); + this.eventTrigger3NokLabel = new System.Windows.Forms.Label(); + this.eventTrigger2NokLabel = new System.Windows.Forms.Label(); + this.eventTrigger1NokLabel = new System.Windows.Forms.Label(); + this.fileWriter5NokLabel = new System.Windows.Forms.Label(); + this.fileWriter4NokLabel = new System.Windows.Forms.Label(); + this.fileWriter3NokLabel = new System.Windows.Forms.Label(); + this.fileWriter2NokLabel = new System.Windows.Forms.Label(); + this.fileWriter1NokLabel = new System.Windows.Forms.Label(); + this.printer2NokLabel = new System.Windows.Forms.Label(); + this.printer1NokLabel = new System.Windows.Forms.Label(); + this.transitionEndNokLabel = new System.Windows.Forms.Label(); + this.transitionStartNokLabel = new System.Windows.Forms.Label(); + this.dataEntryNokLabel = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.fileWriter5ComboBox = new System.Windows.Forms.ComboBox(); this.eventTrigger3ComboBox = new System.Windows.Forms.ComboBox(); this.eventTrigger2ComboBox = new System.Windows.Forms.ComboBox(); this.eventTrigger1ComboBox = new System.Windows.Forms.ComboBox(); @@ -82,14 +97,14 @@ namespace TBF.UI.Procedures 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.historyListViewEx = new Results.Forms.ListViewEx(); + this.metrology1ListViewEx = new Results.Forms.ListViewEx(); + this.metrology2ListViewEx = new Results.Forms.ListViewEx(); + this.processListViewEx = new Results.Forms.ListViewEx(); this.parametersListViewEx = new Results.Forms.ListViewEx(); this.sharedButtons = new TBF.UI.Shared.SharedButtons(); ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit(); @@ -134,6 +149,21 @@ namespace TBF.UI.Procedures // // generalTabPage // + this.generalTabPage.Controls.Add(this.eventTrigger3NokLabel); + this.generalTabPage.Controls.Add(this.eventTrigger2NokLabel); + this.generalTabPage.Controls.Add(this.eventTrigger1NokLabel); + this.generalTabPage.Controls.Add(this.fileWriter5NokLabel); + this.generalTabPage.Controls.Add(this.fileWriter4NokLabel); + this.generalTabPage.Controls.Add(this.fileWriter3NokLabel); + this.generalTabPage.Controls.Add(this.fileWriter2NokLabel); + this.generalTabPage.Controls.Add(this.fileWriter1NokLabel); + this.generalTabPage.Controls.Add(this.printer2NokLabel); + this.generalTabPage.Controls.Add(this.printer1NokLabel); + this.generalTabPage.Controls.Add(this.transitionEndNokLabel); + this.generalTabPage.Controls.Add(this.transitionStartNokLabel); + this.generalTabPage.Controls.Add(this.dataEntryNokLabel); + this.generalTabPage.Controls.Add(this.label2); + this.generalTabPage.Controls.Add(this.fileWriter5ComboBox); this.generalTabPage.Controls.Add(this.eventTrigger3ComboBox); this.generalTabPage.Controls.Add(this.eventTrigger2ComboBox); this.generalTabPage.Controls.Add(this.eventTrigger1ComboBox); @@ -184,23 +214,120 @@ namespace TBF.UI.Procedures this.generalTabPage.Name = "generalTabPage"; this.generalTabPage.UseVisualStyleBackColor = true; // + // eventTrigger3NokLabel + // + resources.ApplyResources(this.eventTrigger3NokLabel, "eventTrigger3NokLabel"); + this.eventTrigger3NokLabel.ForeColor = System.Drawing.Color.Red; + this.eventTrigger3NokLabel.Name = "eventTrigger3NokLabel"; + // + // eventTrigger2NokLabel + // + resources.ApplyResources(this.eventTrigger2NokLabel, "eventTrigger2NokLabel"); + this.eventTrigger2NokLabel.ForeColor = System.Drawing.Color.Red; + this.eventTrigger2NokLabel.Name = "eventTrigger2NokLabel"; + // + // eventTrigger1NokLabel + // + resources.ApplyResources(this.eventTrigger1NokLabel, "eventTrigger1NokLabel"); + this.eventTrigger1NokLabel.ForeColor = System.Drawing.Color.Red; + this.eventTrigger1NokLabel.Name = "eventTrigger1NokLabel"; + // + // fileWriter5NokLabel + // + resources.ApplyResources(this.fileWriter5NokLabel, "fileWriter5NokLabel"); + this.fileWriter5NokLabel.ForeColor = System.Drawing.Color.Red; + this.fileWriter5NokLabel.Name = "fileWriter5NokLabel"; + // + // fileWriter4NokLabel + // + resources.ApplyResources(this.fileWriter4NokLabel, "fileWriter4NokLabel"); + this.fileWriter4NokLabel.ForeColor = System.Drawing.Color.Red; + this.fileWriter4NokLabel.Name = "fileWriter4NokLabel"; + // + // fileWriter3NokLabel + // + resources.ApplyResources(this.fileWriter3NokLabel, "fileWriter3NokLabel"); + this.fileWriter3NokLabel.ForeColor = System.Drawing.Color.Red; + this.fileWriter3NokLabel.Name = "fileWriter3NokLabel"; + // + // fileWriter2NokLabel + // + resources.ApplyResources(this.fileWriter2NokLabel, "fileWriter2NokLabel"); + this.fileWriter2NokLabel.ForeColor = System.Drawing.Color.Red; + this.fileWriter2NokLabel.Name = "fileWriter2NokLabel"; + // + // fileWriter1NokLabel + // + resources.ApplyResources(this.fileWriter1NokLabel, "fileWriter1NokLabel"); + this.fileWriter1NokLabel.ForeColor = System.Drawing.Color.Red; + this.fileWriter1NokLabel.Name = "fileWriter1NokLabel"; + // + // printer2NokLabel + // + resources.ApplyResources(this.printer2NokLabel, "printer2NokLabel"); + this.printer2NokLabel.ForeColor = System.Drawing.Color.Red; + this.printer2NokLabel.Name = "printer2NokLabel"; + // + // printer1NokLabel + // + resources.ApplyResources(this.printer1NokLabel, "printer1NokLabel"); + this.printer1NokLabel.ForeColor = System.Drawing.Color.Red; + this.printer1NokLabel.Name = "printer1NokLabel"; + // + // transitionEndNokLabel + // + resources.ApplyResources(this.transitionEndNokLabel, "transitionEndNokLabel"); + this.transitionEndNokLabel.ForeColor = System.Drawing.Color.Red; + this.transitionEndNokLabel.Name = "transitionEndNokLabel"; + // + // transitionStartNokLabel + // + resources.ApplyResources(this.transitionStartNokLabel, "transitionStartNokLabel"); + this.transitionStartNokLabel.ForeColor = System.Drawing.Color.Red; + this.transitionStartNokLabel.Name = "transitionStartNokLabel"; + // + // dataEntryNokLabel + // + resources.ApplyResources(this.dataEntryNokLabel, "dataEntryNokLabel"); + this.dataEntryNokLabel.ForeColor = System.Drawing.Color.Red; + this.dataEntryNokLabel.Name = "dataEntryNokLabel"; + // + // label2 + // + resources.ApplyResources(this.label2, "label2"); + this.label2.Name = "label2"; + // + // fileWriter5ComboBox + // + this.fileWriter5ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.fileWriter5ComboBox, "fileWriter5ComboBox"); + this.fileWriter5ComboBox.Name = "fileWriter5ComboBox"; + this.fileWriter5ComboBox.SelectedIndexChanged += new System.EventHandler(this.fileWriter5ComboBox_SelectedIndexChanged); + this.fileWriter5ComboBox.TextChanged += new System.EventHandler(this.fileWriter5ComboBox_TextChanged); + // // eventTrigger3ComboBox // this.eventTrigger3ComboBox.FormattingEnabled = true; resources.ApplyResources(this.eventTrigger3ComboBox, "eventTrigger3ComboBox"); this.eventTrigger3ComboBox.Name = "eventTrigger3ComboBox"; + this.eventTrigger3ComboBox.SelectedIndexChanged += new System.EventHandler(this.eventTrigger3ComboBox_SelectedIndexChanged); + this.eventTrigger3ComboBox.TextChanged += new System.EventHandler(this.eventTrigger3ComboBox_TextChanged); // // eventTrigger2ComboBox // this.eventTrigger2ComboBox.FormattingEnabled = true; resources.ApplyResources(this.eventTrigger2ComboBox, "eventTrigger2ComboBox"); this.eventTrigger2ComboBox.Name = "eventTrigger2ComboBox"; + this.eventTrigger2ComboBox.SelectedIndexChanged += new System.EventHandler(this.eventTrigger2ComboBox_SelectedIndexChanged); + this.eventTrigger2ComboBox.TextChanged += new System.EventHandler(this.eventTrigger2ComboBox_TextChanged); // // eventTrigger1ComboBox // this.eventTrigger1ComboBox.FormattingEnabled = true; resources.ApplyResources(this.eventTrigger1ComboBox, "eventTrigger1ComboBox"); this.eventTrigger1ComboBox.Name = "eventTrigger1ComboBox"; + this.eventTrigger1ComboBox.SelectedIndexChanged += new System.EventHandler(this.eventTrigger1ComboBox_SelectedIndexChanged); + this.eventTrigger1ComboBox.TextChanged += new System.EventHandler(this.eventTrigger1ComboBox_TextChanged); // // eventTriggersLabel // @@ -267,24 +394,32 @@ namespace TBF.UI.Procedures this.fileWriter4ComboBox.FormattingEnabled = true; resources.ApplyResources(this.fileWriter4ComboBox, "fileWriter4ComboBox"); this.fileWriter4ComboBox.Name = "fileWriter4ComboBox"; + this.fileWriter4ComboBox.SelectedIndexChanged += new System.EventHandler(this.fileWriter4ComboBox_SelectedIndexChanged); + this.fileWriter4ComboBox.TextChanged += new System.EventHandler(this.fileWriter4ComboBox_TextChanged); // // fileWriter3ComboBox // this.fileWriter3ComboBox.FormattingEnabled = true; resources.ApplyResources(this.fileWriter3ComboBox, "fileWriter3ComboBox"); this.fileWriter3ComboBox.Name = "fileWriter3ComboBox"; + this.fileWriter3ComboBox.SelectedIndexChanged += new System.EventHandler(this.fileWriter3ComboBox_SelectedIndexChanged); + this.fileWriter3ComboBox.TextChanged += new System.EventHandler(this.fileWriter3ComboBox_TextChanged); // // printer2ComboBox // this.printer2ComboBox.FormattingEnabled = true; resources.ApplyResources(this.printer2ComboBox, "printer2ComboBox"); this.printer2ComboBox.Name = "printer2ComboBox"; + this.printer2ComboBox.SelectedIndexChanged += new System.EventHandler(this.printer2ComboBox_SelectedIndexChanged); + this.printer2ComboBox.TextChanged += new System.EventHandler(this.printer2ComboBox_TextChanged); // // fileWriter2ComboBox // this.fileWriter2ComboBox.FormattingEnabled = true; resources.ApplyResources(this.fileWriter2ComboBox, "fileWriter2ComboBox"); this.fileWriter2ComboBox.Name = "fileWriter2ComboBox"; + this.fileWriter2ComboBox.SelectedIndexChanged += new System.EventHandler(this.fileWriter2ComboBox_SelectedIndexChanged); + this.fileWriter2ComboBox.TextChanged += new System.EventHandler(this.fileWriter2ComboBox_TextChanged); // // metersKindRadioButton2 // @@ -305,6 +440,8 @@ namespace TBF.UI.Procedures this.transitionEndComboBox.FormattingEnabled = true; resources.ApplyResources(this.transitionEndComboBox, "transitionEndComboBox"); this.transitionEndComboBox.Name = "transitionEndComboBox"; + this.transitionEndComboBox.SelectedIndexChanged += new System.EventHandler(this.transitionEndComboBox_SelectedIndexChanged); + this.transitionEndComboBox.TextChanged += new System.EventHandler(this.transitionEndComboBox_TextChanged); // // transitionEndLabel // @@ -316,6 +453,8 @@ namespace TBF.UI.Procedures this.transitionStartComboBox.FormattingEnabled = true; resources.ApplyResources(this.transitionStartComboBox, "transitionStartComboBox"); this.transitionStartComboBox.Name = "transitionStartComboBox"; + this.transitionStartComboBox.SelectedIndexChanged += new System.EventHandler(this.transitionStartComboBox_SelectedIndexChanged); + this.transitionStartComboBox.TextChanged += new System.EventHandler(this.transitionStartComboBox_TextChanged); // // transitionStartLabel // @@ -327,18 +466,24 @@ namespace TBF.UI.Procedures this.fileWriter1ComboBox.FormattingEnabled = true; resources.ApplyResources(this.fileWriter1ComboBox, "fileWriter1ComboBox"); this.fileWriter1ComboBox.Name = "fileWriter1ComboBox"; + this.fileWriter1ComboBox.SelectedIndexChanged += new System.EventHandler(this.fileWriter1ComboBox_SelectedIndexChanged); + this.fileWriter1ComboBox.TextChanged += new System.EventHandler(this.fileWriter1ComboBox_TextChanged); // // printer1ComboBox // this.printer1ComboBox.FormattingEnabled = true; resources.ApplyResources(this.printer1ComboBox, "printer1ComboBox"); this.printer1ComboBox.Name = "printer1ComboBox"; + this.printer1ComboBox.SelectedIndexChanged += new System.EventHandler(this.printer1ComboBox_SelectedIndexChanged); + this.printer1ComboBox.TextChanged += new System.EventHandler(this.printer1ComboBox_TextChanged); // // dataEntryComboBox // this.dataEntryComboBox.FormattingEnabled = true; resources.ApplyResources(this.dataEntryComboBox, "dataEntryComboBox"); this.dataEntryComboBox.Name = "dataEntryComboBox"; + this.dataEntryComboBox.SelectedIndexChanged += new System.EventHandler(this.dataEntryComboBox_SelectedIndexChanged); + this.dataEntryComboBox.TextChanged += new System.EventHandler(this.dataEntryComboBox_TextChanged); // // fileWritersLabel // @@ -442,6 +587,34 @@ namespace TBF.UI.Procedures this.historyTabPage.Name = "historyTabPage"; this.historyTabPage.UseVisualStyleBackColor = true; // + // metrology1TabPage + // + this.metrology1TabPage.Controls.Add(this.metrology1ListViewEx); + resources.ApplyResources(this.metrology1TabPage, "metrology1TabPage"); + this.metrology1TabPage.Name = "metrology1TabPage"; + this.metrology1TabPage.UseVisualStyleBackColor = true; + // + // metrology2TabPage + // + this.metrology2TabPage.Controls.Add(this.metrology2ListViewEx); + resources.ApplyResources(this.metrology2TabPage, "metrology2TabPage"); + this.metrology2TabPage.Name = "metrology2TabPage"; + this.metrology2TabPage.UseVisualStyleBackColor = true; + // + // processTabPage + // + this.processTabPage.Controls.Add(this.processListViewEx); + resources.ApplyResources(this.processTabPage, "processTabPage"); + this.processTabPage.Name = "processTabPage"; + this.processTabPage.UseVisualStyleBackColor = true; + // + // parametersTabPage + // + this.parametersTabPage.Controls.Add(this.parametersListViewEx); + resources.ApplyResources(this.parametersTabPage, "parametersTabPage"); + this.parametersTabPage.Name = "parametersTabPage"; + this.parametersTabPage.UseVisualStyleBackColor = true; + // // historyListViewEx // this.historyListViewEx.AllowColumnReorder = true; @@ -454,13 +627,6 @@ namespace TBF.UI.Procedures this.historyListViewEx.View = System.Windows.Forms.View.Details; this.historyListViewEx.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.historyListViewEx_MouseDoubleClick); // - // 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; @@ -473,13 +639,6 @@ namespace TBF.UI.Procedures 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; @@ -492,13 +651,6 @@ namespace TBF.UI.Procedures 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; @@ -511,13 +663,6 @@ namespace TBF.UI.Procedures 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; @@ -620,5 +765,20 @@ namespace TBF.UI.Procedures private System.Windows.Forms.ComboBox eventTrigger1ComboBox; private System.Windows.Forms.Label eventTriggersLabel; private System.Windows.Forms.ComboBox eventTrigger3ComboBox; + private System.Windows.Forms.ComboBox fileWriter5ComboBox; + private System.Windows.Forms.Label eventTrigger3NokLabel; + private System.Windows.Forms.Label eventTrigger2NokLabel; + private System.Windows.Forms.Label eventTrigger1NokLabel; + private System.Windows.Forms.Label fileWriter5NokLabel; + private System.Windows.Forms.Label fileWriter4NokLabel; + private System.Windows.Forms.Label fileWriter3NokLabel; + private System.Windows.Forms.Label fileWriter2NokLabel; + private System.Windows.Forms.Label fileWriter1NokLabel; + private System.Windows.Forms.Label printer2NokLabel; + private System.Windows.Forms.Label printer1NokLabel; + private System.Windows.Forms.Label transitionEndNokLabel; + private System.Windows.Forms.Label transitionStartNokLabel; + private System.Windows.Forms.Label dataEntryNokLabel; + private System.Windows.Forms.Label label2; } } \ No newline at end of file diff --git a/TBF/UI/Procedures/ProcedureDlg.cs b/TBF/UI/Procedures/ProcedureDlg.cs index 5216d7fab..0b8fe2379 100644 --- a/TBF/UI/Procedures/ProcedureDlg.cs +++ b/TBF/UI/Procedures/ProcedureDlg.cs @@ -157,6 +157,7 @@ namespace TBF.UI.Procedures fileWriter2ComboBox.Items.Add("---"); fileWriter3ComboBox.Items.Add("---"); fileWriter4ComboBox.Items.Add("---"); + fileWriter5ComboBox.Items.Add("---"); eventTrigger1ComboBox.Items.Add("---"); eventTrigger2ComboBox.Items.Add("---"); eventTrigger3ComboBox.Items.Add("---"); @@ -177,6 +178,7 @@ namespace TBF.UI.Procedures fileWriter2ComboBox.Items.Add(cmpnt.Cfg.Name); fileWriter3ComboBox.Items.Add(cmpnt.Cfg.Name); fileWriter4ComboBox.Items.Add(cmpnt.Cfg.Name); + fileWriter5ComboBox.Items.Add(cmpnt.Cfg.Name); } if (cmpnt is IEventTrigger) { @@ -378,6 +380,7 @@ namespace TBF.UI.Procedures fileWriter2ComboBox.Enabled = false; fileWriter3ComboBox.Enabled = false; fileWriter4ComboBox.Enabled = false; + fileWriter5ComboBox.Enabled = false; eventTrigger1ComboBox.Enabled = false; eventTrigger2ComboBox.Enabled = false; eventTrigger3ComboBox.Enabled = false; @@ -425,6 +428,8 @@ namespace TBF.UI.Procedures sharedButtons.UnlockButtons(); Unlocked(sender, e); } + + ShowNokComponents(); } void Localize() @@ -508,7 +513,8 @@ namespace TBF.UI.Procedures fileWriter2ComboBox.Text = "---"; fileWriter3ComboBox.Text = "---"; fileWriter4ComboBox.Text = "---"; - } + fileWriter5ComboBox.Text = "---"; + } else { string[] fields = LoadedProcedure.ResultsWriter.Split(new char[] { '~' }); @@ -516,7 +522,8 @@ namespace TBF.UI.Procedures fileWriter2ComboBox.Text = (fields.Length >= 2) ? fields[1] : "---"; fileWriter3ComboBox.Text = (fields.Length >= 3) ? fields[2] : "---"; fileWriter4ComboBox.Text = (fields.Length >= 4) ? fields[3] : "---"; - } + fileWriter5ComboBox.Text = (fields.Length >= 5) ? fields[4] : "---"; + } if (string.IsNullOrEmpty(LoadedProcedure.EventTriggers)) { @@ -589,7 +596,8 @@ namespace TBF.UI.Procedures if (fileWriter1ComboBox.Items.Contains(fileWriter1ComboBox.Text) && fileWriter2ComboBox.Items.Contains(fileWriter2ComboBox.Text) && fileWriter3ComboBox.Items.Contains(fileWriter3ComboBox.Text) && - fileWriter4ComboBox.Items.Contains(fileWriter4ComboBox.Text)) + fileWriter4ComboBox.Items.Contains(fileWriter4ComboBox.Text) && + fileWriter5ComboBox.Items.Contains(fileWriter5ComboBox.Text)) { bool first = true; StringBuilder sb = new StringBuilder(); @@ -598,12 +606,14 @@ namespace TBF.UI.Procedures sb.Append(fileWriter1ComboBox.Text); first = false; } + if (!fileWriter2ComboBox.Text.Equals("---") && !fileWriter2ComboBox.Text.Equals(fileWriter1ComboBox.Text)) { if (!first) sb.Append("~"); sb.Append(fileWriter2ComboBox.Text); first = false; } + if (!fileWriter3ComboBox.Text.Equals("---") && !fileWriter3ComboBox.Text.Equals(fileWriter1ComboBox.Text) && !fileWriter3ComboBox.Text.Equals(fileWriter2ComboBox.Text)) { @@ -611,6 +621,7 @@ namespace TBF.UI.Procedures sb.Append(fileWriter3ComboBox.Text); first = false; } + if (!fileWriter4ComboBox.Text.Equals("---") && !fileWriter4ComboBox.Text.Equals(fileWriter1ComboBox.Text) && !fileWriter4ComboBox.Text.Equals(fileWriter2ComboBox.Text) && !fileWriter4ComboBox.Text.Equals(fileWriter3ComboBox.Text)) @@ -619,6 +630,17 @@ namespace TBF.UI.Procedures sb.Append(fileWriter4ComboBox.Text); first = false; } + + if (!fileWriter5ComboBox.Text.Equals("---") && !fileWriter5ComboBox.Text.Equals(fileWriter1ComboBox.Text) + && !fileWriter5ComboBox.Text.Equals(fileWriter2ComboBox.Text) + && !fileWriter5ComboBox.Text.Equals(fileWriter3ComboBox.Text) + && !fileWriter5ComboBox.Text.Equals(fileWriter4ComboBox.Text)) + { + if (!first) sb.Append("~"); + sb.Append(fileWriter5ComboBox.Text); + first = false; + } + LoadedProcedure.ResultsWriter = sb.ToString(); } @@ -1916,6 +1938,7 @@ namespace TBF.UI.Procedures fileWriter2ComboBox.Enabled = true; fileWriter3ComboBox.Enabled = true; fileWriter4ComboBox.Enabled = true; + fileWriter5ComboBox.Enabled = true; eventTrigger1ComboBox.Enabled = true; eventTrigger2ComboBox.Enabled = true; eventTrigger3ComboBox.Enabled = true; @@ -2862,5 +2885,50 @@ namespace TBF.UI.Procedures (new ProcedureDlg(lvi.Tag as Procedure, new List(), ProcedureDlg.Mode.PermanentlyLocked)).ShowDialog(); } } - } + + private void dataEntryComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void transitionStartComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void transitionEndComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void printer1ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void printer2ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void fileWriter1ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void fileWriter2ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void fileWriter3ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void fileWriter4ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void fileWriter5ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void eventTrigger1ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void eventTrigger2ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void eventTrigger3ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); } + + private void dataEntryComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void transitionStartComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void transitionEndComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void printer1ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void printer2ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void fileWriter1ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void fileWriter2ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void fileWriter3ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void fileWriter4ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void fileWriter5ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void eventTrigger1ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void eventTrigger2ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); } + private void eventTrigger3ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); } + + void ShowNokComponents() + { + dataEntryNokLabel.Visible = !dataEntryComboBox.Items.Contains(dataEntryComboBox.Text); + transitionStartNokLabel.Visible = !transitionStartComboBox.Items.Contains(transitionStartComboBox.Text); + transitionEndNokLabel.Visible = !transitionEndComboBox.Items.Contains(transitionEndComboBox.Text); + printer1NokLabel.Visible = !printer1ComboBox.Items.Contains(printer1ComboBox.Text); + printer2NokLabel.Visible = !printer2ComboBox.Items.Contains(printer2ComboBox.Text); + fileWriter1NokLabel.Visible = !fileWriter1ComboBox.Items.Contains(fileWriter1ComboBox.Text); + fileWriter2NokLabel.Visible = !fileWriter2ComboBox.Items.Contains(fileWriter2ComboBox.Text); + fileWriter3NokLabel.Visible = !fileWriter3ComboBox.Items.Contains(fileWriter3ComboBox.Text); + fileWriter4NokLabel.Visible = !fileWriter4ComboBox.Items.Contains(fileWriter4ComboBox.Text); + fileWriter5NokLabel.Visible = !fileWriter5ComboBox.Items.Contains(fileWriter5ComboBox.Text); + eventTrigger1NokLabel.Visible = !eventTrigger1ComboBox.Items.Contains(eventTrigger1ComboBox.Text); + eventTrigger2NokLabel.Visible = !eventTrigger2ComboBox.Items.Contains(eventTrigger2ComboBox.Text); + eventTrigger3NokLabel.Visible = !eventTrigger3ComboBox.Items.Contains(eventTrigger3ComboBox.Text); + } + } } diff --git a/TBF/UI/Procedures/ProcedureDlg.resx b/TBF/UI/Procedures/ProcedureDlg.resx index b16100da7..089cc44e3 100644 --- a/TBF/UI/Procedures/ProcedureDlg.resx +++ b/TBF/UI/Procedures/ProcedureDlg.resx @@ -129,8 +129,527 @@ 0, 0 + + True + + + Microsoft Sans Serif, 8.25pt, style=Bold + + + NoControl + + + 373, 409 + + + 11, 13 + + + 60 + + + ! + + + False + + + eventTrigger3NokLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 0 + + + True + + + Microsoft Sans Serif, 8.25pt, style=Bold + + + NoControl + + + 373, 386 + + + 11, 13 + + + 59 + + + ! + + + False + + + eventTrigger2NokLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 1 + + + True + + + Microsoft Sans Serif, 8.25pt, style=Bold + + + NoControl + + + 373, 363 + + + 11, 13 + + + 58 + + + ! + + + False + + + eventTrigger1NokLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 2 + + + True + + + Microsoft Sans Serif, 8.25pt, style=Bold + + + NoControl + + + 373, 340 + + + 11, 13 + + + 57 + + + ! + + + False + + + fileWriter5NokLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 3 + + + True + + + Microsoft Sans Serif, 8.25pt, style=Bold + + + NoControl + + + 373, 317 + + + 11, 13 + + + 56 + + + ! + + + False + + + fileWriter4NokLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 4 + + + True + + + Microsoft Sans Serif, 8.25pt, style=Bold + + + NoControl + + + 373, 294 + + + 11, 13 + + + 55 + + + ! + + + False + + + fileWriter3NokLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 5 + + + True + + + Microsoft Sans Serif, 8.25pt, style=Bold + + + NoControl + + + 373, 271 + + + 11, 13 + + + 54 + + + ! + + + False + + + fileWriter2NokLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 6 + + + True + + + Microsoft Sans Serif, 8.25pt, style=Bold + + + NoControl + + + 373, 248 + + + 11, 13 + + + 53 + + + ! + + + False + + + fileWriter1NokLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 7 + + + True + + + Microsoft Sans Serif, 8.25pt, style=Bold + + + NoControl + + + 373, 225 + + + 11, 13 + + + 52 + + + ! + + + False + + + printer2NokLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 8 + + + True + + + Microsoft Sans Serif, 8.25pt, style=Bold + + + NoControl + + + 373, 202 + + + 11, 13 + + + 51 + + + ! + + + False + + + printer1NokLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 9 + + + True + + + Microsoft Sans Serif, 8.25pt, style=Bold + + + NoControl + + + 373, 179 + + + 11, 13 + + + 50 + + + ! + + + False + + + transitionEndNokLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 10 + + + True + + + Microsoft Sans Serif, 8.25pt, style=Bold + + + NoControl + + + 373, 156 + + + 11, 13 + + + 49 + + + ! + + + False + + + transitionStartNokLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 11 + + + True + + + Microsoft Sans Serif, 8.25pt, style=Bold + + + NoControl + + + 373, 133 + + + 11, 13 + + + 48 + + + ! + + + False + + + dataEntryNokLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 12 + + + True + + + NoControl + + + 0, 0 + + + 35, 13 + + + 47 + + + label2 + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 13 + + + 188, 335 + + + 182, 21 + + + 46 + + + fileWriter5ComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 14 + - 188, 381 + 188, 404 182, 21 @@ -148,10 +667,10 @@ generalTabPage - 0 + 15 - 188, 358 + 188, 381 182, 21 @@ -169,10 +688,10 @@ generalTabPage - 1 + 16 - 188, 335 + 188, 358 182, 21 @@ -190,7 +709,7 @@ generalTabPage - 2 + 17 True @@ -199,7 +718,7 @@ NoControl - 20, 341 + 20, 364 72, 13 @@ -220,7 +739,7 @@ generalTabPage - 3 + 18 False @@ -244,7 +763,7 @@ generalTabPage - 4 + 19 True @@ -274,7 +793,7 @@ generalTabPage - 5 + 20 733, 382 @@ -298,7 +817,7 @@ generalTabPage - 6 + 21 True @@ -331,7 +850,7 @@ generalTabPage - 7 + 22 550, 358 @@ -355,7 +874,7 @@ generalTabPage - 8 + 23 True @@ -388,7 +907,7 @@ generalTabPage - 9 + 24 True @@ -418,7 +937,7 @@ generalTabPage - 10 + 25 True @@ -448,7 +967,7 @@ generalTabPage - 11 + 26 True @@ -478,7 +997,7 @@ generalTabPage - 12 + 27 True @@ -508,7 +1027,7 @@ generalTabPage - 13 + 28 188, 312 @@ -529,7 +1048,7 @@ generalTabPage - 14 + 29 188, 289 @@ -550,7 +1069,7 @@ generalTabPage - 15 + 30 188, 220 @@ -571,7 +1090,7 @@ generalTabPage - 16 + 31 188, 266 @@ -592,7 +1111,7 @@ generalTabPage - 17 + 32 True @@ -622,7 +1141,7 @@ generalTabPage - 18 + 33 True @@ -652,7 +1171,7 @@ generalTabPage - 19 + 34 188, 174 @@ -673,7 +1192,7 @@ generalTabPage - 20 + 35 True @@ -703,7 +1222,7 @@ generalTabPage - 21 + 36 188, 151 @@ -724,7 +1243,7 @@ generalTabPage - 22 + 37 True @@ -754,7 +1273,7 @@ generalTabPage - 23 + 38 188, 243 @@ -775,7 +1294,7 @@ generalTabPage - 24 + 39 188, 197 @@ -796,7 +1315,7 @@ generalTabPage - 25 + 40 188, 128 @@ -817,7 +1336,7 @@ generalTabPage - 26 + 41 True @@ -847,7 +1366,7 @@ generalTabPage - 27 + 42 True @@ -877,7 +1396,7 @@ generalTabPage - 28 + 43 True @@ -907,7 +1426,7 @@ generalTabPage - 29 + 44 402, 220 @@ -931,7 +1450,7 @@ generalTabPage - 30 + 45 True @@ -961,7 +1480,7 @@ generalTabPage - 31 + 46 188, 105 @@ -982,7 +1501,7 @@ generalTabPage - 32 + 47 True @@ -1012,7 +1531,7 @@ generalTabPage - 33 + 48 402, 82 @@ -1033,7 +1552,7 @@ generalTabPage - 34 + 49 True @@ -1063,7 +1582,7 @@ generalTabPage - 35 + 50 188, 82 @@ -1084,7 +1603,7 @@ generalTabPage - 36 + 51 True @@ -1114,7 +1633,7 @@ generalTabPage - 37 + 52 402, 59 @@ -1135,7 +1654,7 @@ generalTabPage - 38 + 53 True @@ -1165,7 +1684,7 @@ generalTabPage - 39 + 54 188, 59 @@ -1186,7 +1705,7 @@ generalTabPage - 40 + 55 True @@ -1216,7 +1735,7 @@ generalTabPage - 41 + 56 188, 36 @@ -1237,7 +1756,7 @@ generalTabPage - 42 + 57 True @@ -1267,7 +1786,7 @@ generalTabPage - 43 + 58 188, 13 @@ -1288,7 +1807,7 @@ generalTabPage - 44 + 59 True @@ -1318,7 +1837,7 @@ generalTabPage - 45 + 60 4, 34 @@ -1327,7 +1846,7 @@ 3, 3, 3, 3 - 923, 423 + 923, 433 0 @@ -1354,7 +1873,7 @@ 3, 3 - 917, 417 + 917, 427 0 @@ -1363,7 +1882,7 @@ historyListViewEx - Results.Forms.ListViewEx, Results, Version=2.26.1560.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=3.1.1464.0, Culture=neutral, PublicKeyToken=null historyTabPage @@ -1378,7 +1897,7 @@ 3, 3, 3, 3 - 923, 423 + 923, 433 1 @@ -1405,7 +1924,7 @@ 3, 3 - 917, 417 + 917, 427 0 @@ -1414,7 +1933,7 @@ metrology1ListViewEx - Results.Forms.ListViewEx, Results, Version=2.26.1560.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=3.1.1464.0, Culture=neutral, PublicKeyToken=null metrology1TabPage @@ -1429,7 +1948,7 @@ 3, 3, 3, 3 - 923, 423 + 923, 433 2 @@ -1456,7 +1975,7 @@ 3, 3 - 917, 417 + 917, 427 0 @@ -1465,7 +1984,7 @@ metrology2ListViewEx - Results.Forms.ListViewEx, Results, Version=2.26.1560.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=3.1.1464.0, Culture=neutral, PublicKeyToken=null metrology2TabPage @@ -1480,7 +1999,7 @@ 3, 3, 3, 3 - 923, 423 + 923, 433 3 @@ -1507,7 +2026,7 @@ 3, 3 - 917, 417 + 917, 427 0 @@ -1516,7 +2035,7 @@ processListViewEx - Results.Forms.ListViewEx, Results, Version=2.26.1560.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=3.1.1464.0, Culture=neutral, PublicKeyToken=null processTabPage @@ -1531,7 +2050,7 @@ 3, 3, 3, 3 - 923, 423 + 923, 433 4 @@ -1558,7 +2077,7 @@ 0, 0 - 923, 423 + 923, 433 0 @@ -1567,7 +2086,7 @@ parametersListViewEx - Results.Forms.ListViewEx, Results, Version=2.26.1560.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=3.1.1464.0, Culture=neutral, PublicKeyToken=null parametersTabPage @@ -1579,7 +2098,7 @@ 4, 34 - 923, 423 + 923, 433 5 @@ -1609,7 +2128,7 @@ 0, 0 - 931, 461 + 931, 471 0 @@ -1651,7 +2170,7 @@ sharedButtons - TBF.UI.Shared.SharedButtons, TBF, Version=2.26.1574.0, Culture=neutral, PublicKeyToken=null + TBF.UI.Shared.SharedButtons, TBF, Version=3.1.1646.0, Culture=neutral, PublicKeyToken=null mainSplitContainer.Panel2 @@ -1672,7 +2191,7 @@ 1 - 1034, 461 + 1034, 471 931 @@ -1699,7 +2218,10 @@ 6, 13 - 1034, 461 + 1034, 471 + + + NoControl CenterParent