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

UI.Procedures.ProcedureDlg 'Copy' a test feature added

Browse Source
This commit is contained in:
Milan Hanajik 2020-11-02 09:34:56 +01:00
parent 9758411519
commit 6ec3b7b287
3 changed files with 103 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
TBF/UI/Procedures/ProcedureDlg.Designer.cs generated
View File

@ -35,6 +35,10 @@ 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.eventTrigger3ComboBox = new System.Windows.Forms.ComboBox();
this.eventTrigger2ComboBox = new System.Windows.Forms.ComboBox();
this.eventTrigger1ComboBox = new System.Windows.Forms.ComboBox();
this.eventTriggersLabel = new System.Windows.Forms.Label();
this.testProfileTextBox = new System.Windows.Forms.TextBox();
this.testProfileLabel = new System.Windows.Forms.Label();
this.altProcPeriodTextBox = new System.Windows.Forms.TextBox();
@ -88,10 +92,6 @@ namespace TBF.UI.Procedures
this.parametersTabPage = new System.Windows.Forms.TabPage();
this.parametersListViewEx = new Results.Forms.ListViewEx();
this.sharedButtons = new TBF.UI.Shared.SharedButtons();
this.eventTrigger2ComboBox = new System.Windows.Forms.ComboBox();
this.eventTrigger1ComboBox = new System.Windows.Forms.ComboBox();
this.eventTriggersLabel = new System.Windows.Forms.Label();
this.eventTrigger3ComboBox = new System.Windows.Forms.ComboBox();
((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit();
this.mainSplitContainer.Panel1.SuspendLayout();
this.mainSplitContainer.Panel2.SuspendLayout();
@ -184,6 +184,29 @@ namespace TBF.UI.Procedures
this.generalTabPage.Name = "generalTabPage";
this.generalTabPage.UseVisualStyleBackColor = true;
//
// eventTrigger3ComboBox
//
this.eventTrigger3ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.eventTrigger3ComboBox, "eventTrigger3ComboBox");
this.eventTrigger3ComboBox.Name = "eventTrigger3ComboBox";
//
// eventTrigger2ComboBox
//
this.eventTrigger2ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.eventTrigger2ComboBox, "eventTrigger2ComboBox");
this.eventTrigger2ComboBox.Name = "eventTrigger2ComboBox";
//
// eventTrigger1ComboBox
//
this.eventTrigger1ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.eventTrigger1ComboBox, "eventTrigger1ComboBox");
this.eventTrigger1ComboBox.Name = "eventTrigger1ComboBox";
//
// eventTriggersLabel
//
resources.ApplyResources(this.eventTriggersLabel, "eventTriggersLabel");
this.eventTriggersLabel.Name = "eventTriggersLabel";
//
// testProfileTextBox
//
resources.ApplyResources(this.testProfileTextBox, "testProfileTextBox");
@ -511,29 +534,6 @@ namespace TBF.UI.Procedures
resources.ApplyResources(this.sharedButtons, "sharedButtons");
this.sharedButtons.Name = "sharedButtons";
//
// eventTrigger2ComboBox
//
this.eventTrigger2ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.eventTrigger2ComboBox, "eventTrigger2ComboBox");
this.eventTrigger2ComboBox.Name = "eventTrigger2ComboBox";
//
// eventTrigger1ComboBox
//
this.eventTrigger1ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.eventTrigger1ComboBox, "eventTrigger1ComboBox");
this.eventTrigger1ComboBox.Name = "eventTrigger1ComboBox";
//
// eventTriggersLabel
//
resources.ApplyResources(this.eventTriggersLabel, "eventTriggersLabel");
this.eventTriggersLabel.Name = "eventTriggersLabel";
//
// eventTrigger3ComboBox
//
this.eventTrigger3ComboBox.FormattingEnabled = true;
resources.ApplyResources(this.eventTrigger3ComboBox, "eventTrigger3ComboBox");
this.eventTrigger3ComboBox.Name = "eventTrigger3ComboBox";
//
// ProcedureDlg
//
resources.ApplyResources(this, "$this");

62
TBF/UI/Procedures/ProcedureDlg.cs
View File

@ -74,7 +74,8 @@ namespace TBF.UI.Procedures
#if TURA_SPECIAL || TURA_IPERL || TURA_IPERL_NEW
sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove |
SharedButtons.Buttons.Up | SharedButtons.Buttons.Down |SharedButtons.Buttons.Custom1;
SharedButtons.Buttons.Up | SharedButtons.Buttons.Down |
SharedButtons.Buttons.Copy | SharedButtons.Buttons.Custom1;
sharedButtons.Custom1Caption = string.Format("Načítaj testy{0}iPerl z Oracle", Environment.NewLine);
sharedButtons.Custom1Clicked += iPerlWizardButton_Click;
#else
@ -88,6 +89,7 @@ namespace TBF.UI.Procedures
sharedButtons.RemoveClicked += removeButton_Click;
sharedButtons.UpClicked += upButton_Click;
sharedButtons.DownClicked += downButton_Click;
sharedButtons.CopyClicked += copyButton_Click;
/// ListViewEx-es configuration
metrology1ListViewEx.SubItemClicked += new SubItemEventHandler(metrology1ListViewEx_SubItemClicked);
@ -2469,6 +2471,64 @@ namespace TBF.UI.Procedures
listViewEx.Items[ix + 1].EnsureVisible();
}
private void copyButton_Click(object sender, EventArgs e)
{
ListViewEx listViewEx;
switch (selectedTab)
{
case ProcedureTabs.Metrology1:
UpdateFromMetrology1Tab();
listViewEx = metrology1ListViewEx;
break;
case ProcedureTabs.Metrology2:
UpdateFromMetrology2Tab();
listViewEx = metrology2ListViewEx;
break;
case ProcedureTabs.Process:
UpdateFromProcessTab();
listViewEx = processListViewEx;
break;
case ProcedureTabs.Parameters:
UpdateFromParametersTab();
listViewEx = parametersListViewEx;
break;
default: return;
}
/// Check the selected index validity
if (listViewEx.SelectedItems.Count != 1) return;
int ix = listViewEx.SelectedIndices[0];
if (ix < 0 || ix >= listViewEx.Items.Count) return;
Test selectedTest = LoadedProcedure.Tests[ix];
/// Add a copy of the selected test
Test newTest = selectedTest.Clone();
newTest.ItemNr = listViewEx.Items.Count;
newTest.Name = selectedTest.Name + " copy";
LoadedProcedure.Tests.Add(newTest);
///
AddToMetrology1Tab(newTest);
AddToMetrology2Tab(newTest);
AddToProcessTab(newTest);
AddToParametersTab(newTest);
foreach (var ctrl in testParamsCtrls) ctrl.AddOne(newTest);
if (listViewEx != null)
{
listViewEx.Focus();
listViewEx.SelectedItems.Clear();
listViewEx.Items[listViewEx.Items.Count - 1].Selected = true;
listViewEx.Items[listViewEx.Items.Count - 1].EnsureVisible();
}
}
#endregion
private void metrology1ListViewEx_SelectedIndexChanged(object sender, EventArgs e) { SelectedIndexChanged(sender, e); }

30
TBF/UI/Procedures/ProcedureDlg.resx
View File

@ -1363,7 +1363,7 @@
<value>historyListViewEx</value>
</data>
<data name="&gt;&gt;historyListViewEx.Type" xml:space="preserve">
<value>Results.Forms.ListViewEx, Results, Version=2.25.1440.0, Culture=neutral, PublicKeyToken=null</value>
<value>Results.Forms.ListViewEx, Results, Version=2.26.1458.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;historyListViewEx.Parent" xml:space="preserve">
<value>historyTabPage</value>
@ -1405,7 +1405,7 @@
<value>3, 3</value>
</data>
<data name="metrology1ListViewEx.Size" type="System.Drawing.Size, System.Drawing">
<value>917, 385</value>
<value>917, 417</value>
</data>
<data name="metrology1ListViewEx.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -1414,7 +1414,7 @@
<value>metrology1ListViewEx</value>
</data>
<data name="&gt;&gt;metrology1ListViewEx.Type" xml:space="preserve">
<value>Results.Forms.ListViewEx, Results, Version=2.25.1440.0, Culture=neutral, PublicKeyToken=null</value>
<value>Results.Forms.ListViewEx, Results, Version=2.26.1458.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;metrology1ListViewEx.Parent" xml:space="preserve">
<value>metrology1TabPage</value>
@ -1429,7 +1429,7 @@
<value>3, 3, 3, 3</value>
</data>
<data name="metrology1TabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 391</value>
<value>923, 423</value>
</data>
<data name="metrology1TabPage.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -1456,7 +1456,7 @@
<value>3, 3</value>
</data>
<data name="metrology2ListViewEx.Size" type="System.Drawing.Size, System.Drawing">
<value>917, 385</value>
<value>917, 417</value>
</data>
<data name="metrology2ListViewEx.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -1465,7 +1465,7 @@
<value>metrology2ListViewEx</value>
</data>
<data name="&gt;&gt;metrology2ListViewEx.Type" xml:space="preserve">
<value>Results.Forms.ListViewEx, Results, Version=2.25.1440.0, Culture=neutral, PublicKeyToken=null</value>
<value>Results.Forms.ListViewEx, Results, Version=2.26.1458.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;metrology2ListViewEx.Parent" xml:space="preserve">
<value>metrology2TabPage</value>
@ -1480,7 +1480,7 @@
<value>3, 3, 3, 3</value>
</data>
<data name="metrology2TabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 391</value>
<value>923, 423</value>
</data>
<data name="metrology2TabPage.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -1507,7 +1507,7 @@
<value>3, 3</value>
</data>
<data name="processListViewEx.Size" type="System.Drawing.Size, System.Drawing">
<value>917, 385</value>
<value>917, 417</value>
</data>
<data name="processListViewEx.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -1516,7 +1516,7 @@
<value>processListViewEx</value>
</data>
<data name="&gt;&gt;processListViewEx.Type" xml:space="preserve">
<value>Results.Forms.ListViewEx, Results, Version=2.25.1440.0, Culture=neutral, PublicKeyToken=null</value>
<value>Results.Forms.ListViewEx, Results, Version=2.26.1458.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;processListViewEx.Parent" xml:space="preserve">
<value>processTabPage</value>
@ -1531,7 +1531,7 @@
<value>3, 3, 3, 3</value>
</data>
<data name="processTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 391</value>
<value>923, 423</value>
</data>
<data name="processTabPage.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -1558,7 +1558,7 @@
<value>0, 0</value>
</data>
<data name="parametersListViewEx.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 391</value>
<value>923, 423</value>
</data>
<data name="parametersListViewEx.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -1567,7 +1567,7 @@
<value>parametersListViewEx</value>
</data>
<data name="&gt;&gt;parametersListViewEx.Type" xml:space="preserve">
<value>Results.Forms.ListViewEx, Results, Version=2.25.1440.0, Culture=neutral, PublicKeyToken=null</value>
<value>Results.Forms.ListViewEx, Results, Version=2.26.1458.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;parametersListViewEx.Parent" xml:space="preserve">
<value>parametersTabPage</value>
@ -1579,7 +1579,7 @@
<value>4, 34</value>
</data>
<data name="parametersTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 391</value>
<value>923, 423</value>
</data>
<data name="parametersTabPage.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -1642,7 +1642,7 @@
<value>-1, 0</value>
</data>
<data name="sharedButtons.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 400</value>
<value>100, 461</value>
</data>
<data name="sharedButtons.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -1651,7 +1651,7 @@
<value>sharedButtons</value>
</data>
<data name="&gt;&gt;sharedButtons.Type" xml:space="preserve">
<value>TBF.UI.Shared.SharedButtons, TBF, Version=2.25.1440.0, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UI.Shared.SharedButtons, TBF, Version=2.26.1537.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;sharedButtons.Parent" xml:space="preserve">
<value>mainSplitContainer.Panel2</value>