diff --git a/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfg.cs index 1e143d6e6..b3c7deed5 100644 --- a/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection public CombinedWithDetTestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new CombinedWithDetTestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/Endurance/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/Endurance/TestMethodCfg.cs index 9943bef16..d69a8bf2a 100644 --- a/TBF/BenchControl/TestMethods/Endurance/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/Endurance/TestMethodCfg.cs @@ -25,6 +25,10 @@ namespace TBF.BenchControl.TestMethods.Endurance public TestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new TestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } #endif /// Private parameterless constructor invoked by all other (public) constructors diff --git a/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestMethodCfg.cs index 0f127bc92..eefb36004 100644 --- a/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.FixedStart.HeatMeters public TestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new TestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfg.cs index c515ff0ea..2b262e7e8 100644 --- a/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEvaluation.HeatMeters public TestParams TestParams; /// Created in constructor public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new TestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs index edf986140..2cf5e93fb 100644 --- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters public TestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new TestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfg.cs index 232c8d3d4..c5fe55b11 100644 --- a/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.Compound public TestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new TestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfg.cs index 070ab2d3b..13ee0a8ce 100644 --- a/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters public TestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new TestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfg.cs index 8cec583fa..9bea53c69 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl.Compoun public TestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new TestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfg.cs index 9fc56900c..87a373ae5 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl.HeatMet public TestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new TestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfg.cs index d03f4ab99..d29f3dd18 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl.Single public TestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new TestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfg.cs index c04a7962c..9e4467a33 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.Compound public TestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new TestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfg.cs index 3ffb4b477..037c38047 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.HeatMeters public TestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new TestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfg.cs index d362d8ca8..e0951c28e 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.Single public TestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new TestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfg.cs index d211071d5..3ba10b5f0 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.Compound public CombinedTestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new CombinedTestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfg.cs index 92b0dd8ff..42834fd89 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters public TestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new TestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/LeakTest/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/LeakTest/TestMethodCfg.cs index 64ec09d57..12c98ba79 100644 --- a/TBF/BenchControl/TestMethods/LeakTest/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/LeakTest/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.LeakTest public LeakTestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new LeakTestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfg.cs index 4c267d699..ec3d39f6e 100644 --- a/TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.PMaxTest public PMaxTestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new PMaxTestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs index 86facb2f4..a95e49ef3 100644 --- a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest public SensitivityTestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new SensitivityTestParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs index b1b477856..9b0753f2c 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs @@ -33,9 +33,12 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication /// Test parameters [XmlIgnore] public iPerlCommunicationParams TestParams; - public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } public override IParamsProvider CreateTestParamsProvider() { return new iPerlCommunicationParams(true); } + public override IParamsProvider GetUITestParamsProvider(Test test) + { + return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; + } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() diff --git a/TBF/ProcedureDlg.Designer.cs b/TBF/ProcedureDlg.Designer.cs index 0fa630f2d..1b63d2ef7 100644 --- a/TBF/ProcedureDlg.Designer.cs +++ b/TBF/ProcedureDlg.Designer.cs @@ -31,483 +31,484 @@ 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.altProcPeriodTextBox = new System.Windows.Forms.TextBox(); - this.altProcPeriodLabel = new System.Windows.Forms.Label(); - this.altProcNameTextBox = new System.Windows.Forms.TextBox(); - this.altProcNameLabel = new System.Windows.Forms.Label(); - 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.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.altProcPeriodTextBox); - this.generalTabPage.Controls.Add(this.altProcPeriodLabel); - this.generalTabPage.Controls.Add(this.altProcNameTextBox); - this.generalTabPage.Controls.Add(this.altProcNameLabel); - 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.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; - // - // altProcPeriodTextBox - // - resources.ApplyResources(this.altProcPeriodTextBox, "altProcPeriodTextBox"); - this.altProcPeriodTextBox.Name = "altProcPeriodTextBox"; - // - // altProcPeriodLabel - // - resources.ApplyResources(this.altProcPeriodLabel, "altProcPeriodLabel"); - this.altProcPeriodLabel.Name = "altProcPeriodLabel"; - // - // altProcNameTextBox - // - resources.ApplyResources(this.altProcNameTextBox, "altProcNameTextBox"); - this.altProcNameTextBox.Name = "altProcNameTextBox"; - // - // altProcNameLabel - // - resources.ApplyResources(this.altProcNameLabel, "altProcNameLabel"); - this.altProcNameLabel.Name = "altProcNameLabel"; - // - // 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"; - // - // 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.altProcPeriodTextBox = new System.Windows.Forms.TextBox(); + this.altProcPeriodLabel = new System.Windows.Forms.Label(); + this.altProcNameTextBox = new System.Windows.Forms.TextBox(); + this.altProcNameLabel = new System.Windows.Forms.Label(); + 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.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.altProcPeriodTextBox); + this.generalTabPage.Controls.Add(this.altProcPeriodLabel); + this.generalTabPage.Controls.Add(this.altProcNameTextBox); + this.generalTabPage.Controls.Add(this.altProcNameLabel); + 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.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; + // + // altProcPeriodTextBox + // + resources.ApplyResources(this.altProcPeriodTextBox, "altProcPeriodTextBox"); + this.altProcPeriodTextBox.Name = "altProcPeriodTextBox"; + // + // altProcPeriodLabel + // + resources.ApplyResources(this.altProcPeriodLabel, "altProcPeriodLabel"); + this.altProcPeriodLabel.Name = "altProcPeriodLabel"; + // + // altProcNameTextBox + // + resources.ApplyResources(this.altProcNameTextBox, "altProcNameTextBox"); + this.altProcNameTextBox.Name = "altProcNameTextBox"; + // + // altProcNameLabel + // + resources.ApplyResources(this.altProcNameLabel, "altProcNameLabel"); + this.altProcNameLabel.Name = "altProcNameLabel"; + // + // 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"; + // + // 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; + this.parametersListViewEx.SelectedIndexChanged += new System.EventHandler(this.parametersListViewEx_SelectedIndexChanged); + // + // 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); } diff --git a/TBF/ProcedureDlg.cs b/TBF/ProcedureDlg.cs index 261e908a3..65ff57247 100644 --- a/TBF/ProcedureDlg.cs +++ b/TBF/ProcedureDlg.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2017 Sensus Metering Systems +/// Copyright (c) 2013-2018 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -29,8 +29,9 @@ namespace TBF /// Set by the constructor or updated by the parent after creation and before loading. /// public Procedure LoadedProcedure; + public int SelectedTestIx; /// -1 = none, 0 = 1st = top - IList usedNames; /// Already used names + IList usedNames; /// Already used names /// Auxiliary public lists used also by user controls in tab pages public IList TbfComponents; @@ -88,6 +89,8 @@ namespace TBF parametersListViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(parametersListViewEx_SubItemClicked); parametersListViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(parametersListViewEx_SubItemRightClicked); parametersListViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(parametersListViewEx_SubItemEndEditing); + + SelectedTestIx = -1; } public ProcedureDlg(Config.Entities.Procedure procedure, IList usedNames) @@ -181,11 +184,13 @@ namespace TBF { if (method.Cfg.GetRuntimeTestParamsProvider() != null) { - TabPage nwTab = new TabPage(method.Cfg.Name); - TestParamsCtrl nwCtrl = new TestParamsCtrl(this, method, true); - testParamsCtrls.Add(nwCtrl); - nwTab.Controls.Add(nwCtrl); - this.tabControl.TabPages.Add(nwTab); + TestParamsCtrl nwCtrl = new TestParamsCtrl(this, method, true); + testParamsCtrls.Add(nwCtrl); + + TabPage nwTab = new TabPage(method.Cfg.Name); + nwTab.Controls.Add(nwCtrl); + nwTab.Tag = nwCtrl; + tabControl.TabPages.Add(nwTab); } } @@ -194,11 +199,13 @@ namespace TBF { if ((cmpnt.Cfg.GetRuntimeTestParamsProvider() != null) && !(cmpnt is ITestMethod)) { - TabPage nwTab = new TabPage(cmpnt.Cfg.Name); - TestParamsCtrl nwCtrl = new TestParamsCtrl(this, cmpnt, true); - testParamsCtrls.Add(nwCtrl); + TestParamsCtrl nwCtrl = new TestParamsCtrl(this, cmpnt, true); + testParamsCtrls.Add(nwCtrl); + + TabPage nwTab = new TabPage(cmpnt.Cfg.Name); nwTab.Controls.Add(nwCtrl); - this.tabControl.TabPages.Add(nwTab); + nwTab.Tag = nwCtrl; + this.tabControl.TabPages.Add(nwTab); } } @@ -220,11 +227,13 @@ namespace TBF } { - TabPage newTab = new TabPage(Strings.Water_meters); - ProcedureParamsCtrl newCtrl = new ProcedureParamsCtrl(this, waterMeters, false); - procedureParamsCtrls.Add(newCtrl); + ProcedureParamsCtrl newCtrl = new ProcedureParamsCtrl(this, waterMeters, false); + procedureParamsCtrls.Add(newCtrl); + + TabPage newTab = new TabPage(Strings.Water_meters); newTab.Controls.Add(newCtrl); - this.tabControl.TabPages.Add(newTab); + newTab.Tag = newCtrl; + tabControl.TabPages.Add(newTab); } ///--------------------- @@ -254,11 +263,13 @@ namespace TBF cmpntsInMPath.Add(sensor); } - TabPage nwTab = new TabPage(usedPathName); - ProcedureParamsCtrl nwCtrl = new ProcedureParamsCtrl(this, cmpntsInMPath, true); - procedureParamsCtrls.Add(nwCtrl); + ProcedureParamsCtrl nwCtrl = new ProcedureParamsCtrl(this, cmpntsInMPath, true); + procedureParamsCtrls.Add(nwCtrl); + + TabPage nwTab = new TabPage(usedPathName); nwTab.Controls.Add(nwCtrl); - this.tabControl.TabPages.Add(nwTab); + nwTab.Tag = nwCtrl; + tabControl.TabPages.Add(nwTab); } } @@ -275,11 +286,13 @@ namespace TBF if (other.Count > 0) { - TabPage newTab = new TabPage(Strings.Temperature); - ProcedureParamsCtrl newCtrl = new ProcedureParamsCtrl(this, other, false); - procedureParamsCtrls.Add(newCtrl); + ProcedureParamsCtrl newCtrl = new ProcedureParamsCtrl(this, other, false); + procedureParamsCtrls.Add(newCtrl); + + TabPage newTab = new TabPage(Strings.Temperature); newTab.Controls.Add(newCtrl); - this.tabControl.TabPages.Add(newTab); + newTab.Tag = newCtrl; + tabControl.TabPages.Add(newTab); } } @@ -295,50 +308,60 @@ namespace TBF Left = (ls.OneProcedureDlgLeft != 0) ? ls.OneProcedureDlgLeft : 150; Top = (ls.OneProcedureDlgTop != 0) ? ls.OneProcedureDlgTop : 150; - InitializeHistoryTab(); /// Create ListViewEx columns for 'History of changes' - - /// Create LisViewEx columns and edit controls for 'Metrology1', 'Metrology2' and 'Process' tabs - PrepareMetrology12AndProcessTabs(); - - /// Disable controls in General tab + /// Enable/disable/show/hide controls in General tab #if IPERL - altProcNameLabel.Visible = true; - altProcNameTextBox.Visible = true; - altProcPeriodLabel.Visible = true; - altProcPeriodTextBox.Visible = true; + altProcNameLabel.Visible = true; + altProcNameTextBox.Visible = true; + altProcPeriodLabel.Visible = true; + altProcPeriodTextBox.Visible = true; #endif - procNameTextBox.Enabled = false; - descriptionTextBox.Enabled = false; - watermetersTextBox.Enabled = false; + procNameTextBox.Enabled = false; + descriptionTextBox.Enabled = false; + watermetersTextBox.Enabled = false; protectedCheckBox.Enabled = false; mustBeCompleteCheckBox.Enabled = false; - manualControlDisabledCheckBox.Enabled = false; + manualControlDisabledCheckBox.Enabled = false; altProcNameTextBox.Enabled = false; altProcPeriodTextBox.Enabled = false; dataEntryComboBox.Enabled = false; - transitionStartComboBox.Enabled = false; - transitionEndComboBox.Enabled = false; + transitionStartComboBox.Enabled = false; + transitionEndComboBox.Enabled = false; printer1ComboBox.Enabled = false; - printer2ComboBox.Enabled = false; - fileWriter1ComboBox.Enabled = false; + printer2ComboBox.Enabled = false; + fileWriter1ComboBox.Enabled = false; fileWriter2ComboBox.Enabled = false; - fileWriter3ComboBox.Enabled = false; - fileWriter4ComboBox.Enabled = false; - metersKindRadioButton1.Enabled = false; - metersKindRadioButton2.Enabled = false; + fileWriter3ComboBox.Enabled = false; + fileWriter4ComboBox.Enabled = false; + metersKindRadioButton1.Enabled = false; + metersKindRadioButton2.Enabled = false; metersKindRadioButton3.Enabled = false; notesTextBox.Enabled = false; #if !HEAT_METERS metersKindRadioButton3.Visible = false; #endif - /// Make some controls readonly + /// Make some controls readonly createdByTextBox.ReadOnly = true; createdOnTextBox.ReadOnly = true; lastChangedByTextBox.ReadOnly = true; lastChangedOnTextBox.ReadOnly = true; + /// History tab + InitializeHistoryTab(); /// Create ListViewEx columns for 'History of changes' + + /// LisViewEx columns and edit controls for 'Metrology1', 'Metrology2', 'Process' and 'Parameters' tabs + PrepareMetrology1Tab(); + PrepareMetrology2Tab(); + PrepareProcess(); + PrepareParameters(); + /// Now refresh the content of the dialog - foreach (var ctrl in testParamsCtrls) + RefreshGeneralTab(); + RefreshMetrology1Tab(); + RefreshMetrology2Tab(); + RefreshProcessTab(); + RefreshParametersTab(); + + foreach (var ctrl in testParamsCtrls) { ctrl.Initialize(); } @@ -346,8 +369,6 @@ namespace TBF { ctrl.Initialize(); } - - RefreshAllTabs(); } void Localize() @@ -383,12 +404,6 @@ namespace TBF metersKindRadioButton3.Text = Strings.Heat_meter; } - void RefreshAllTabs() - { - RefreshGeneralTab(); - RefreshMetrology12AndProcessTabs(); - } - #region General @@ -609,17 +624,9 @@ namespace TBF #endregion - #region Metrology1, Metrology2, Process, and Parameters + #region Metrology1 - void PrepareMetrology12AndProcessTabs() - { - PrepareMetrology1Tab(); - PrepareMetrology2Tab(); - PrepareProcess(); - PrepareParameters(); - } - - Control[] metrology1Editors; + Control[] metrology1Editors; public enum MtrlgyClmn { @@ -674,314 +681,33 @@ namespace TBF } } - public enum Mtrlgy2Clmn - { - Name, - Part, - TankDraining, - Uncertainty, - ControlWaterTemp, - TempLimLo, - TempLimHi, - Filter, - Publish, - Evaluate, - ColumnsCount - } - - Control[] metrology2Editors; - - void PrepareMetrology2Tab() - { - Results.Forms.ListViewEx lv = metrology2ListViewEx; - lv.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.Emptying_chdr, Width = 60 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.Uncertainty_pct_chdr, Width = 90 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.Control_water_temp_chdr, Width = 110 }); - lv.Columns.Add(new ColumnHeader { Text = string.Format("{0} [°C]", Strings.Temp_lim_lo_chdr), Width = 100 }); - lv.Columns.Add(new ColumnHeader { Text = string.Format("{0} [°C]", Strings.Temp_lim_hi_chdr), Width = 100 }); - lv.Columns.Add(new ColumnHeader { Text = "Filter", Width = 80 }); /// Strings.Tol_red_pct_chdr - lv.Columns.Add(new ColumnHeader { Text = Strings.Publish, Width = 100 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.Evaluate, Width = 100 }); - //lv.Columns.Add(new ColumnHeader { Text = Strings.Red_type_chdr, Width = 80 }); - //lv.Columns.Add(new ColumnHeader { Text = Strings.Err_cor_neg_pct_chdr, Width = 90 }); - //lv.Columns.Add(new ColumnHeader { Text = Strings.Err_cor_pos_pct_chdr, Width = 90 }); - - ComboBox publishCBox = new ComboBox(); /// control for Publish - for (Config.Entities.Publish pb = 0; pb < Config.Entities.Publish.Count; pb++) - { - publishCBox.Items.Add(pb.ToDescription()); - } - - - ComboBox yesNo1CBox = new ComboBox(); /// control for Emptying - yesNo1CBox.Items.Add(Strings.yes); - yesNo1CBox.Items.Add(Strings.no); - - ComboBox yesNo2CBox = new ComboBox(); /// control for Control water temp. - yesNo2CBox.Items.Add(Strings.yes); - yesNo2CBox.Items.Add(Strings.no); - - ComboBox yesNo3CBox = new ComboBox(); /// control for Evaluate - yesNo3CBox.Items.Add(Strings.yes); - yesNo3CBox.Items.Add(Strings.no); - - metrology2Editors = new Control[] - { - new TextBox(), /// Name - new TextBox(), /// Part - yesNo1CBox, /// Emptying - new TextBox(), /// Uncertainty - yesNo2CBox, /// Control water temp. - new TextBox(), /// Temp. lim. lo - new TextBox(), /// Temp. lim. hi - new TextBox(), /// Filter - publishCBox, /// Publish - yesNo3CBox, /// Evaluate - }; - - foreach (var ctrl in metrology2Editors) - { - metrology2TabPage.Controls.Add(ctrl); - } - } - - public enum ProcessClmn - { - Name, - Part, - Feeding, - Bench, - Output, - Sensor, -#if HEAT_METERS - HeatMeterSensors, -#endif - TrnStart, - TrnStop, - ColumnsCount - } - - Control[] processEditors; - - void PrepareProcess() + void RefreshMetrology1Tab() { - Results.Forms.ListViewEx lv = processListViewEx; - lv.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.Feeding_chdr, Width = 80 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.Bench_chdr, Width = 80 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.Output_chdr, Width = 80 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.Sensors_chdr, Width = 80 }); -#if HEAT_METERS - lv.Columns.Add(new ColumnHeader { Text = Strings.Heat_meter_sensors, Width = 110 }); -#endif - lv.Columns.Add(new ColumnHeader { Text = Strings.TransitionStart_chdr, Width = 100 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.TransitionEnd_chdr, Width = 100 }); + metrology1ListViewEx.Items.Clear(); + foreach (var test in LoadedProcedure.Tests) AddToMetrology1Tab(test); + if (SelectedTestIx >= 0) metrology1ListViewEx.Items[SelectedTestIx].Selected = true; + } - processEditors = new Control[] - { - new TextBox(), /// Name - new TextBox(), /// Part - new ComboBox(), /// Feeding - new ComboBox(), /// Table - new ComboBox(), /// Output - new ComboBox(), /// Meters -#if HEAT_METERS - new ComboBox(), /// Heat meters -#endif - new ComboBox(), /// TransitionStart - new ComboBox(), /// TransitionEnd - }; - - foreach (var path in feedingPaths) ((ComboBox)processEditors[(int)ProcessClmn.Feeding]).Items.Add(path.Name); - foreach (var path in benchPaths) ((ComboBox)processEditors[(int)ProcessClmn.Bench]).Items.Add(path.Name); - foreach (var path in outputPaths) ((ComboBox)processEditors[(int)ProcessClmn.Output]).Items.Add(path.Name); - foreach (var path in metersPaths) ((ComboBox)processEditors[(int)ProcessClmn.Sensor]).Items.Add(path.Name); -#if HEAT_METERS - foreach (var path in heatMetersPaths) ((ComboBox)processEditors[(int)ProcessClmn.HeatMeterSensors]).Items.Add(path.Name); -#endif - - ((ComboBox)processEditors[(int)ProcessClmn.TrnStart]).Items.Add("---"); - ((ComboBox)processEditors[(int)ProcessClmn.TrnStop]).Items.Add("---"); - foreach (var trans in transitionSequences) - { - ((ComboBox)processEditors[(int)ProcessClmn.TrnStart]).Items.Add(trans.Name); - ((ComboBox)processEditors[(int)ProcessClmn.TrnStop]).Items.Add(trans.Name); - } - - foreach (var ctrl in processEditors) - { - processTabPage.Controls.Add(ctrl); - } - } - - public enum ParametersClmn - { - Name, - Part, - PumpPower, - MassRepeats, -#if STABLE_MASS_EXTRAS - MassSpread, - MassMethod, -#endif - Time_Pump2StartV, - Time_BeforeFlow, - Time_Flow2Mass, - Time_Stop2Mass, - ColumnsCount - } - - Control[] parametersEditors; - - void PrepareParameters() - { - Results.Forms.ListViewEx lv = parametersListViewEx; - lv.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.Pump_power_pct, Width = 90 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.Mass_repeats, Width = 90 }); -#if STABLE_MASS_EXTRAS - lv.Columns.Add(new ColumnHeader { Text = Strings.Mass_spread_kg, Width = 110 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.Mass_method, Width = 90 }); -#endif - lv.Columns.Add(new ColumnHeader { Text = Strings.TimePump2StartV_chdr, Width = 70 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.TimeBeforeSettingFlow, Width = 70 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.TimeFlow2Start_chdr, Width = 70 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.Time2MassMsrmt_chdr, Width = 70 }); - - parametersEditors = new Control[] - { - new TextBox(), /// Name - new TextBox(), /// Part - new ComboBox(), /// PumpPower - new TextBox(), /// MassRepeats -#if STABLE_MASS_EXTRAS - new TextBox(), /// MassSpread - new ComboBox(), /// MassMethod -#endif - new TextBox(), /// Time_Pump2StartV - new TextBox(), /// Time_BeforeFlow - new TextBox(), /// Time_Flow2Mass - new TextBox(), /// Time_Stop2Mass - }; - - ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("0"); - ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("30"); - ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("40"); - ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("50"); - ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("60"); - ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("70"); - ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("75"); - ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("80"); - ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("85"); - ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("90"); - ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("92"); - ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("94"); - ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("96"); - ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("98"); - ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("100"); -#if STABLE_MASS_EXTRAS - for (MassMethod mm = 0; mm < MassMethod.Count; mm++) - { - ((ComboBox)parametersEditors[(int)ParametersClmn.MassMethod]).Items.Add(mm.ToDescription()); - } -#endif - foreach (var ctrl in parametersEditors) - { - parametersTabPage.Controls.Add(ctrl); - } - } - - void RefreshMetrology12AndProcessTabs() - { - metrology1ListViewEx.Items.Clear(); - metrology2ListViewEx.Items.Clear(); - processListViewEx.Items.Clear(); - parametersListViewEx.Items.Clear(); - foreach (var test in LoadedProcedure.Tests) AddToMetrology12AndProcessTab(test); - - foreach (var ctrl in testParamsCtrls) ctrl.RedrawAll(); - foreach (var ctrl in procedureParamsCtrls) ctrl.RedrawAll(); - } - - void AddToMetrology12AndProcessTab(Test test) + void AddToMetrology1Tab(Test test) { - ListViewItem lvi; - - /// - /// Metrology 1 item with subitems - /// - lvi = new ListViewItem(test.Name); /// Name - lvi.SubItems.Add((test.Part == 0) ? "-" : test.Part.ToString()); /// Part - lvi.SubItems.Add(test.Qfrom.ToString()); /// Q_from - lvi.SubItems.Add(test.Qto.ToString()); /// Q_to - lvi.SubItems.Add(test.Volume.ToString()); /// VOlume + /// + /// Metrology 1 item with subitems + /// + ListViewItem lvi = new ListViewItem(test.Name); /// Name + lvi.Tag = test; + lvi.SubItems.Add((test.Part == 0) ? "-" : test.Part.ToString()); /// Part + lvi.SubItems.Add(test.Qfrom.ToString()); /// Q_from + lvi.SubItems.Add(test.Qto.ToString()); /// Q_to + lvi.SubItems.Add(test.Volume.ToString()); /// VOlume lvi.SubItems.Add(test.TstTime.ToString()); - lvi.SubItems.Add(test.ErrLimLo.ToString()); - lvi.SubItems.Add(test.ErrLimHi.ToString()); + lvi.SubItems.Add(test.ErrLimLo.ToString()); + lvi.SubItems.Add(test.ErrLimHi.ToString()); //lvi.SubItems.Add(test.Zeroing ? Strings.yes : Strings.no); - lvi.SubItems.Add((test.Method != null) ? test.Method.ToString() : string.Empty); - lvi.SubItems.Add(test.Repeats.ToString()); - lvi.Tag = test; - metrology1ListViewEx.Items.Add(lvi); + lvi.SubItems.Add((test.Method != null) ? test.Method.ToString() : string.Empty); + lvi.SubItems.Add(test.Repeats.ToString()); - - /// - /// Metrology 2 item with subitems - /// - lvi = new ListViewItem(test.Name); /// Name - lvi.SubItems.Add((test.Part == 0) ? "-" : test.Part.ToString()); /// Part - lvi.SubItems.Add(test.DoDraining ? Strings.yes : Strings.no); - lvi.SubItems.Add(test.Uncertainty.ToString()); - lvi.SubItems.Add(test.DoControlWaterTemp? Strings.yes : Strings.no); - lvi.SubItems.Add(test.TempLimLo.ToString()); - lvi.SubItems.Add(test.TempLimHi.ToString()); - lvi.SubItems.Add(test.TolerRed.ToString()); - lvi.SubItems.Add(((Config.Entities.Publish)test.Publish).ToDescription()); - lvi.SubItems.Add(test.DoEvaluate ? Strings.yes : Strings.no); - lvi.Tag = test; - metrology2ListViewEx.Items.Add(lvi); - - - /// - /// Process item with subitems - /// - lvi = new ListViewItem(test.Name); /// Name - lvi.SubItems.Add((test.Part == 0) ? "-" : test.Part.ToString()); /// Part - lvi.SubItems.Add(test.FeedingPath); - lvi.SubItems.Add(test.BenchPath); - lvi.SubItems.Add(test.OutputPath); - lvi.SubItems.Add(test.MetersPath); -#if HEAT_METERS - lvi.SubItems.Add(test.HeatMetersPath); -#endif - lvi.SubItems.Add(string.IsNullOrEmpty(test.RelTransBefore) ? "---" : test.RelTransBefore); - lvi.SubItems.Add(string.IsNullOrEmpty(test.TransitionAfter) ? "---" : test.TransitionAfter); - lvi.Tag = test; - processListViewEx.Items.Add(lvi); - - - /// - /// Parameters item with subitems - /// - lvi = new ListViewItem(test.Name); /// Name - lvi.SubItems.Add((test.Part == 0) ? "-" : test.Part.ToString()); /// - lvi.SubItems.Add(test.PumpPower.ToString("F1")); - lvi.SubItems.Add((test.MassRepeats < 4 ? 5 : test.MassRepeats).ToString()); -#if STABLE_MASS_EXTRAS - lvi.SubItems.Add(test.MassSpread.ToString("F4")); - lvi.SubItems.Add(test.MassMethod.ToDescription()); -#endif - lvi.SubItems.Add(test.TimePump2StartV.ToString()); - lvi.SubItems.Add(test.TimeBeforeFlow.ToString()); - lvi.SubItems.Add(test.TimeFlow2Mass.ToString()); - lvi.SubItems.Add(test.TimeStop2Mass.ToString()); - lvi.Tag = test; - parametersListViewEx.Items.Add(lvi); - } + metrology1ListViewEx.Items.Add(lvi); + } void UpdateFromMetrology1Tab() { @@ -1021,150 +747,6 @@ namespace TBF } } - void UpdateFromMetrology2Tab() - { - for (int i = 0; i < metrology2ListViewEx.Items.Count; i++) - { - ListViewItem lvi = metrology2ListViewEx.Items[i]; - Test entity = (Test)lvi.Tag; - - entity.Name = lvi.Text; - - int part = entity.Part; - if (lvi.SubItems[(int)Mtrlgy2Clmn.Part].Text.Equals("-")) - { - entity.Part = 0; - } - else if (int.TryParse(lvi.SubItems[(int)Mtrlgy2Clmn.Part].Text, out part)) - { - entity.Part = part; - } - - if (lvi.SubItems[(int)Mtrlgy2Clmn.TankDraining].Text.Equals(Strings.yes)) entity.DoDraining = true; - else if (lvi.SubItems[(int)Mtrlgy2Clmn.TankDraining].Text.Equals(Strings.no)) entity.DoDraining = false; - - if (lvi.SubItems[(int)Mtrlgy2Clmn.ControlWaterTemp].Text.Equals(Strings.yes)) entity.DoControlWaterTemp = true; - else if (lvi.SubItems[(int)Mtrlgy2Clmn.ControlWaterTemp].Text.Equals(Strings.no)) entity.DoControlWaterTemp = false; - - float tmp; - if (Utils.TryParseUFloat(lvi.SubItems[(int)Mtrlgy2Clmn.Uncertainty].Text, out tmp)) entity.Uncertainty = tmp; - if (Utils.TryParseUFloat(lvi.SubItems[(int)Mtrlgy2Clmn.TempLimLo].Text, out tmp)) entity.TempLimLo = tmp; - if (Utils.TryParseUFloat(lvi.SubItems[(int)Mtrlgy2Clmn.TempLimHi].Text, out tmp)) entity.TempLimHi = tmp; - if (Utils.TryParseUFloat(lvi.SubItems[(int)Mtrlgy2Clmn.Filter].Text, out tmp)) entity.TolerRed = (double)tmp; - - for (Config.Entities.Publish pb = 0; pb < Config.Entities.Publish.Count; pb++) - { - if (lvi.SubItems[(int)Mtrlgy2Clmn.Publish].Text.Equals(pb.ToDescription())) - { - entity.Publish = (sbyte)pb; - break; - } - } - - if (lvi.SubItems[(int)Mtrlgy2Clmn.Evaluate].Text.Equals(Strings.yes)) entity.DoEvaluate = true; - else if (lvi.SubItems[(int)Mtrlgy2Clmn.Evaluate].Text.Equals(Strings.no)) entity.DoEvaluate = false; - } - } - - void UpdateFromProcessTab() - { - for (int i = 0; i < processListViewEx.Items.Count; i++) - { - ListViewItem lvi = processListViewEx.Items[i]; - Test entity = (Test)lvi.Tag; - - entity.Name = lvi.Text; - - int part = entity.Part; - if (lvi.SubItems[(int)ProcessClmn.Part].Text.Equals("-")) - { - entity.Part = 0; - } - else if (int.TryParse(lvi.SubItems[(int)ProcessClmn.Part].Text, out part)) - { - entity.Part = part; - } - - if ((processEditors[(int)ProcessClmn.Feeding] as ComboBox).Items.Contains(lvi.SubItems[(int)ProcessClmn.Feeding].Text)) - { - entity.FeedingPath = lvi.SubItems[(int)ProcessClmn.Feeding].Text; - } - if ((processEditors[(int)ProcessClmn.Bench] as ComboBox).Items.Contains(lvi.SubItems[(int)ProcessClmn.Bench].Text)) - { - entity.BenchPath = lvi.SubItems[(int)ProcessClmn.Bench].Text; - } - if ((processEditors[(int)ProcessClmn.Output] as ComboBox).Items.Contains(lvi.SubItems[(int)ProcessClmn.Output].Text)) - { - entity.OutputPath = lvi.SubItems[(int)ProcessClmn.Output].Text; - } - if ((processEditors[(int)ProcessClmn.Sensor] as ComboBox).Items.Contains(lvi.SubItems[(int)ProcessClmn.Sensor].Text)) - { - entity.MetersPath = lvi.SubItems[(int)ProcessClmn.Sensor].Text; - } -#if HEAT_METERS - if ((processEditors[(int)ProcessClmn.HeatMeterSensors] as ComboBox).Items.Contains(lvi.SubItems[(int)ProcessClmn.HeatMeterSensors].Text)) - { - entity.HeatMetersPath = lvi.SubItems[(int)ProcessClmn.HeatMeterSensors].Text; - } -#endif - if ((processEditors[(int)ProcessClmn.TrnStart] as ComboBox).Items.Contains(lvi.SubItems[(int)ProcessClmn.TrnStart].Text)) - { - entity.RelTransBefore = lvi.SubItems[(int)ProcessClmn.TrnStart].Text.Equals("---") ? string.Empty : lvi.SubItems[(int)ProcessClmn.TrnStart].Text; - } - if ((processEditors[(int)ProcessClmn.TrnStop] as ComboBox).Items.Contains(lvi.SubItems[(int)ProcessClmn.TrnStop].Text)) - { - entity.TransitionAfter = lvi.SubItems[(int)ProcessClmn.TrnStop].Text.Equals("---") ? string.Empty : lvi.SubItems[(int)ProcessClmn.TrnStop].Text; - } - } - } - - void UpdateFromParametersTab() - { - for (int i = 0; i < parametersListViewEx.Items.Count; i++) - { - ListViewItem lvi = parametersListViewEx.Items[i]; - Test entity = (Test)lvi.Tag; - - entity.Name = lvi.Text; - - int part = entity.Part; - if (lvi.SubItems[(int)ParametersClmn.Part].Text.Equals("-")) - { - entity.Part = 0; - } - else if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Part].Text, out part)) - { - entity.Part = part; - } - - float powerPct; - if (Utils.TryParseUFloat(lvi.SubItems[(int)ParametersClmn.PumpPower].Text, out powerPct) && powerPct >= 0 && powerPct <= 100.0f) - { - entity.PumpPower = powerPct; - } - - entity.MassRepeats = int.Parse(lvi.SubItems[(int)ParametersClmn.MassRepeats].Text); - -#if STABLE_MASS_EXTRAS - float massSpread; - if (Utils.TryParseUFloat(lvi.SubItems[(int)ParametersClmn.MassSpread].Text, out massSpread) && massSpread >= 0) - { - entity.MassSpread = massSpread; - } - - for (MassMethod mm = 0; mm < MassMethod.Count; mm++) - { - if (mm.ToDescription().Equals(lvi.SubItems[(int)ParametersClmn.MassMethod].Text)) entity.MassMethod = mm; - } -#endif - int itmp; - if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Time_Pump2StartV].Text, out itmp)) entity.TimePump2StartV = itmp; - if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Time_BeforeFlow].Text, out itmp)) entity.TimeBeforeFlow = itmp; - if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Time_Flow2Mass].Text, out itmp)) entity.TimeFlow2Mass = itmp; - if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Time_Stop2Mass].Text, out itmp)) entity.TimeStop2Mass = itmp; - } - } - private void metrology1ListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (unlocked && (e.SubItem < (int)MtrlgyClmn.CoulumnsCount)) @@ -1280,7 +862,156 @@ namespace TBF } } - private void metrology2ListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + #endregion + + #region Metrology2 + + public enum Mtrlgy2Clmn + { + Name, + Part, + TankDraining, + Uncertainty, + ControlWaterTemp, + TempLimLo, + TempLimHi, + Filter, + Publish, + Evaluate, + ColumnsCount + } + + Control[] metrology2Editors; + + void PrepareMetrology2Tab() + { + Results.Forms.ListViewEx lv = metrology2ListViewEx; + lv.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.Emptying_chdr, Width = 60 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.Uncertainty_pct_chdr, Width = 90 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.Control_water_temp_chdr, Width = 110 }); + lv.Columns.Add(new ColumnHeader { Text = string.Format("{0} [°C]", Strings.Temp_lim_lo_chdr), Width = 100 }); + lv.Columns.Add(new ColumnHeader { Text = string.Format("{0} [°C]", Strings.Temp_lim_hi_chdr), Width = 100 }); + lv.Columns.Add(new ColumnHeader { Text = "Filter", Width = 80 }); /// Strings.Tol_red_pct_chdr + lv.Columns.Add(new ColumnHeader { Text = Strings.Publish, Width = 100 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.Evaluate, Width = 100 }); + //lv.Columns.Add(new ColumnHeader { Text = Strings.Red_type_chdr, Width = 80 }); + //lv.Columns.Add(new ColumnHeader { Text = Strings.Err_cor_neg_pct_chdr, Width = 90 }); + //lv.Columns.Add(new ColumnHeader { Text = Strings.Err_cor_pos_pct_chdr, Width = 90 }); + + ComboBox publishCBox = new ComboBox(); /// control for Publish + for (Config.Entities.Publish pb = 0; pb < Config.Entities.Publish.Count; pb++) + { + publishCBox.Items.Add(pb.ToDescription()); + } + + + ComboBox yesNo1CBox = new ComboBox(); /// control for Emptying + yesNo1CBox.Items.Add(Strings.yes); + yesNo1CBox.Items.Add(Strings.no); + + ComboBox yesNo2CBox = new ComboBox(); /// control for Control water temp. + yesNo2CBox.Items.Add(Strings.yes); + yesNo2CBox.Items.Add(Strings.no); + + ComboBox yesNo3CBox = new ComboBox(); /// control for Evaluate + yesNo3CBox.Items.Add(Strings.yes); + yesNo3CBox.Items.Add(Strings.no); + + metrology2Editors = new Control[] + { + new TextBox(), /// Name + new TextBox(), /// Part + yesNo1CBox, /// Emptying + new TextBox(), /// Uncertainty + yesNo2CBox, /// Control water temp. + new TextBox(), /// Temp. lim. lo + new TextBox(), /// Temp. lim. hi + new TextBox(), /// Filter + publishCBox, /// Publish + yesNo3CBox, /// Evaluate + }; + + foreach (var ctrl in metrology2Editors) + { + metrology2TabPage.Controls.Add(ctrl); + } + } + + void RefreshMetrology2Tab() + { + metrology2ListViewEx.Items.Clear(); + foreach (var test in LoadedProcedure.Tests) AddToMetrology2Tab(test); + if (SelectedTestIx >= 0) metrology2ListViewEx.Items[SelectedTestIx].Selected = true; + } + + void AddToMetrology2Tab(Test test) + { + /// + /// Metrology 2 item with subitems + /// + ListViewItem lvi = new ListViewItem(test.Name); /// Name + lvi.Tag = test; + lvi.SubItems.Add((test.Part == 0) ? "-" : test.Part.ToString()); /// Part + lvi.SubItems.Add(test.DoDraining ? Strings.yes : Strings.no); + lvi.SubItems.Add(test.Uncertainty.ToString()); + lvi.SubItems.Add(test.DoControlWaterTemp ? Strings.yes : Strings.no); + lvi.SubItems.Add(test.TempLimLo.ToString()); + lvi.SubItems.Add(test.TempLimHi.ToString()); + lvi.SubItems.Add(test.TolerRed.ToString()); + lvi.SubItems.Add(((Config.Entities.Publish)test.Publish).ToDescription()); + lvi.SubItems.Add(test.DoEvaluate ? Strings.yes : Strings.no); + + metrology2ListViewEx.Items.Add(lvi); + } + + void UpdateFromMetrology2Tab() + { + for (int i = 0; i < metrology2ListViewEx.Items.Count; i++) + { + ListViewItem lvi = metrology2ListViewEx.Items[i]; + Test entity = (Test)lvi.Tag; + + entity.Name = lvi.Text; + + int part = entity.Part; + if (lvi.SubItems[(int)Mtrlgy2Clmn.Part].Text.Equals("-")) + { + entity.Part = 0; + } + else if (int.TryParse(lvi.SubItems[(int)Mtrlgy2Clmn.Part].Text, out part)) + { + entity.Part = part; + } + + if (lvi.SubItems[(int)Mtrlgy2Clmn.TankDraining].Text.Equals(Strings.yes)) entity.DoDraining = true; + else if (lvi.SubItems[(int)Mtrlgy2Clmn.TankDraining].Text.Equals(Strings.no)) entity.DoDraining = false; + + if (lvi.SubItems[(int)Mtrlgy2Clmn.ControlWaterTemp].Text.Equals(Strings.yes)) entity.DoControlWaterTemp = true; + else if (lvi.SubItems[(int)Mtrlgy2Clmn.ControlWaterTemp].Text.Equals(Strings.no)) entity.DoControlWaterTemp = false; + + float tmp; + if (Utils.TryParseUFloat(lvi.SubItems[(int)Mtrlgy2Clmn.Uncertainty].Text, out tmp)) entity.Uncertainty = tmp; + if (Utils.TryParseUFloat(lvi.SubItems[(int)Mtrlgy2Clmn.TempLimLo].Text, out tmp)) entity.TempLimLo = tmp; + if (Utils.TryParseUFloat(lvi.SubItems[(int)Mtrlgy2Clmn.TempLimHi].Text, out tmp)) entity.TempLimHi = tmp; + if (Utils.TryParseUFloat(lvi.SubItems[(int)Mtrlgy2Clmn.Filter].Text, out tmp)) entity.TolerRed = (double)tmp; + + for (Config.Entities.Publish pb = 0; pb < Config.Entities.Publish.Count; pb++) + { + if (lvi.SubItems[(int)Mtrlgy2Clmn.Publish].Text.Equals(pb.ToDescription())) + { + entity.Publish = (sbyte)pb; + break; + } + } + + if (lvi.SubItems[(int)Mtrlgy2Clmn.Evaluate].Text.Equals(Strings.yes)) entity.DoEvaluate = true; + else if (lvi.SubItems[(int)Mtrlgy2Clmn.Evaluate].Text.Equals(Strings.no)) entity.DoEvaluate = false; + } + } + + private void metrology2ListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.SubItem >= (int)Mtrlgy2Clmn.ColumnsCount) { @@ -1290,7 +1021,7 @@ namespace TBF metrology2ListViewEx.StartEditing(metrology2Editors[e.SubItem], e.Item, e.SubItem); } - void metrology2ListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void metrology2ListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.SubItem >= (int)Mtrlgy2Clmn.ColumnsCount) { @@ -1319,53 +1050,207 @@ namespace TBF } } - private void metrology2ListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + private void metrology2ListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { - if ((e.SubItem == (int)Mtrlgy2Clmn.TankDraining) && !(metrology2Editors[(int)Mtrlgy2Clmn.TankDraining] as ComboBox).Items.Contains(e.DisplayText)) - { - e.DisplayText = e.Item.SubItems[e.SubItem].Text; - e.Cancel = true; - return; - } + if ((e.SubItem == (int)Mtrlgy2Clmn.TankDraining) && !(metrology2Editors[(int)Mtrlgy2Clmn.TankDraining] as ComboBox).Items.Contains(e.DisplayText)) + { + e.DisplayText = e.Item.SubItems[e.SubItem].Text; + e.Cancel = true; + return; + } - if ((e.SubItem == (int)Mtrlgy2Clmn.ControlWaterTemp) && !(metrology2Editors[(int)Mtrlgy2Clmn.ControlWaterTemp] as ComboBox).Items.Contains(e.DisplayText)) - { - e.DisplayText = e.Item.SubItems[e.SubItem].Text; - e.Cancel = true; - return; - } + if ((e.SubItem == (int)Mtrlgy2Clmn.ControlWaterTemp) && !(metrology2Editors[(int)Mtrlgy2Clmn.ControlWaterTemp] as ComboBox).Items.Contains(e.DisplayText)) + { + e.DisplayText = e.Item.SubItems[e.SubItem].Text; + e.Cancel = true; + return; + } - if ((e.SubItem == (int)Mtrlgy2Clmn.Evaluate) && !(metrology2Editors[(int)Mtrlgy2Clmn.Evaluate] as ComboBox).Items.Contains(e.DisplayText)) - { - e.DisplayText = e.Item.SubItems[e.SubItem].Text; - e.Cancel = true; - return; - } + if ((e.SubItem == (int)Mtrlgy2Clmn.Evaluate) && !(metrology2Editors[(int)Mtrlgy2Clmn.Evaluate] as ComboBox).Items.Contains(e.DisplayText)) + { + e.DisplayText = e.Item.SubItems[e.SubItem].Text; + e.Cancel = true; + return; + } - int dummy; - if (e.SubItem == (int)Mtrlgy2Clmn.Part) - { - if (e.DisplayText.Equals("-")) return; /// OK - if (!int.TryParse(e.DisplayText, out dummy) || dummy < 1 || dummy > Config.Data.MaxPartNr) + int dummy; + if (e.SubItem == (int)Mtrlgy2Clmn.Part) + { + if (e.DisplayText.Equals("-")) return; /// OK + if (!int.TryParse(e.DisplayText, out dummy) || dummy < 1 || dummy > Config.Data.MaxPartNr) + { + e.DisplayText = e.Item.SubItems[e.SubItem].Text; + e.Cancel = true; + return; /// NOK + } + } + if (e.SubItem == (int)Mtrlgy2Clmn.Publish) + { + for (Config.Entities.Publish pb = 0; pb < Config.Entities.Publish.Count; pb++) + { + if (e.DisplayText.Equals(pb.ToDescription())) return; + } + e.DisplayText = e.Item.SubItems[e.SubItem].Text; + e.Cancel = true; + return; /// NOK + } + } + + #endregion + + #region Process + + public enum ProcessClmn + { + Name, + Part, + Feeding, + Bench, + Output, + Sensor, +#if HEAT_METERS + HeatMeterSensors, +#endif + TrnStart, + TrnStop, + ColumnsCount + } + + Control[] processEditors; + + void PrepareProcess() + { + Results.Forms.ListViewEx lv = processListViewEx; + lv.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.Feeding_chdr, Width = 80 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.Bench_chdr, Width = 80 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.Output_chdr, Width = 80 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.Sensors_chdr, Width = 80 }); +#if HEAT_METERS + lv.Columns.Add(new ColumnHeader { Text = Strings.Heat_meter_sensors, Width = 110 }); +#endif + lv.Columns.Add(new ColumnHeader { Text = Strings.TransitionStart_chdr, Width = 100 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.TransitionEnd_chdr, Width = 100 }); + + processEditors = new Control[] { - e.DisplayText = e.Item.SubItems[e.SubItem].Text; - e.Cancel = true; - return; /// NOK - } - } - if (e.SubItem == (int)Mtrlgy2Clmn.Publish) + new TextBox(), /// Name + new TextBox(), /// Part + new ComboBox(), /// Feeding + new ComboBox(), /// Table + new ComboBox(), /// Output + new ComboBox(), /// Meters +#if HEAT_METERS + new ComboBox(), /// Heat meters +#endif + new ComboBox(), /// TransitionStart + new ComboBox(), /// TransitionEnd + }; + + foreach (var path in feedingPaths) ((ComboBox)processEditors[(int)ProcessClmn.Feeding]).Items.Add(path.Name); + foreach (var path in benchPaths) ((ComboBox)processEditors[(int)ProcessClmn.Bench]).Items.Add(path.Name); + foreach (var path in outputPaths) ((ComboBox)processEditors[(int)ProcessClmn.Output]).Items.Add(path.Name); + foreach (var path in metersPaths) ((ComboBox)processEditors[(int)ProcessClmn.Sensor]).Items.Add(path.Name); +#if HEAT_METERS + foreach (var path in heatMetersPaths) ((ComboBox)processEditors[(int)ProcessClmn.HeatMeterSensors]).Items.Add(path.Name); +#endif + + ((ComboBox)processEditors[(int)ProcessClmn.TrnStart]).Items.Add("---"); + ((ComboBox)processEditors[(int)ProcessClmn.TrnStop]).Items.Add("---"); + foreach (var trans in transitionSequences) { - for (Config.Entities.Publish pb = 0; pb < Config.Entities.Publish.Count; pb++) - { - if (e.DisplayText.Equals(pb.ToDescription())) return; - } - e.DisplayText = e.Item.SubItems[e.SubItem].Text; - e.Cancel = true; - return; /// NOK + ((ComboBox)processEditors[(int)ProcessClmn.TrnStart]).Items.Add(trans.Name); + ((ComboBox)processEditors[(int)ProcessClmn.TrnStop]).Items.Add(trans.Name); + } + + foreach (var ctrl in processEditors) + { + processTabPage.Controls.Add(ctrl); } } - private void processListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void RefreshProcessTab() + { + processListViewEx.Items.Clear(); + foreach (var test in LoadedProcedure.Tests) AddToProcessTab(test); + if (SelectedTestIx >= 0) processListViewEx.Items[SelectedTestIx].Selected = true; + } + + void AddToProcessTab(Test test) + { + /// + /// Process item with subitems + /// + ListViewItem lvi = new ListViewItem(test.Name); /// Name + lvi.Tag = test; + lvi.SubItems.Add((test.Part == 0) ? "-" : test.Part.ToString()); /// Part + lvi.SubItems.Add(test.FeedingPath); + lvi.SubItems.Add(test.BenchPath); + lvi.SubItems.Add(test.OutputPath); + lvi.SubItems.Add(test.MetersPath); +#if HEAT_METERS + lvi.SubItems.Add(test.HeatMetersPath); +#endif + lvi.SubItems.Add(string.IsNullOrEmpty(test.RelTransBefore) ? "---" : test.RelTransBefore); + lvi.SubItems.Add(string.IsNullOrEmpty(test.TransitionAfter) ? "---" : test.TransitionAfter); + + processListViewEx.Items.Add(lvi); + } + + void UpdateFromProcessTab() + { + for (int i = 0; i < processListViewEx.Items.Count; i++) + { + ListViewItem lvi = processListViewEx.Items[i]; + Test entity = (Test)lvi.Tag; + + entity.Name = lvi.Text; + + int part = entity.Part; + if (lvi.SubItems[(int)ProcessClmn.Part].Text.Equals("-")) + { + entity.Part = 0; + } + else if (int.TryParse(lvi.SubItems[(int)ProcessClmn.Part].Text, out part)) + { + entity.Part = part; + } + + if ((processEditors[(int)ProcessClmn.Feeding] as ComboBox).Items.Contains(lvi.SubItems[(int)ProcessClmn.Feeding].Text)) + { + entity.FeedingPath = lvi.SubItems[(int)ProcessClmn.Feeding].Text; + } + if ((processEditors[(int)ProcessClmn.Bench] as ComboBox).Items.Contains(lvi.SubItems[(int)ProcessClmn.Bench].Text)) + { + entity.BenchPath = lvi.SubItems[(int)ProcessClmn.Bench].Text; + } + if ((processEditors[(int)ProcessClmn.Output] as ComboBox).Items.Contains(lvi.SubItems[(int)ProcessClmn.Output].Text)) + { + entity.OutputPath = lvi.SubItems[(int)ProcessClmn.Output].Text; + } + if ((processEditors[(int)ProcessClmn.Sensor] as ComboBox).Items.Contains(lvi.SubItems[(int)ProcessClmn.Sensor].Text)) + { + entity.MetersPath = lvi.SubItems[(int)ProcessClmn.Sensor].Text; + } +#if HEAT_METERS + if ((processEditors[(int)ProcessClmn.HeatMeterSensors] as ComboBox).Items.Contains(lvi.SubItems[(int)ProcessClmn.HeatMeterSensors].Text)) + { + entity.HeatMetersPath = lvi.SubItems[(int)ProcessClmn.HeatMeterSensors].Text; + } +#endif + if ((processEditors[(int)ProcessClmn.TrnStart] as ComboBox).Items.Contains(lvi.SubItems[(int)ProcessClmn.TrnStart].Text)) + { + entity.RelTransBefore = lvi.SubItems[(int)ProcessClmn.TrnStart].Text.Equals("---") ? string.Empty : lvi.SubItems[(int)ProcessClmn.TrnStart].Text; + } + if ((processEditors[(int)ProcessClmn.TrnStop] as ComboBox).Items.Contains(lvi.SubItems[(int)ProcessClmn.TrnStop].Text)) + { + entity.TransitionAfter = lvi.SubItems[(int)ProcessClmn.TrnStop].Text.Equals("---") ? string.Empty : lvi.SubItems[(int)ProcessClmn.TrnStop].Text; + } + } + } + + private void processListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.SubItem >= (int)ProcessClmn.ColumnsCount) { @@ -1375,7 +1260,7 @@ namespace TBF processListViewEx.StartEditing(processEditors[e.SubItem], e.Item, e.SubItem); } - void processListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void processListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.SubItem >= (int)ProcessClmn.ColumnsCount) { @@ -1404,43 +1289,201 @@ namespace TBF } } - private void processListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + private void processListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { - int dummy; - if (e.SubItem == (int)ProcessClmn.Part) - { - if (e.DisplayText.Equals("-")) return; /// OK - if (!int.TryParse(e.DisplayText, out dummy) || dummy < 1 || dummy > 3) - { - e.DisplayText = e.Item.SubItems[e.SubItem].Text; - e.Cancel = true; - return; /// NOK - } - } + int dummy; + if (e.SubItem == (int)ProcessClmn.Part) + { + if (e.DisplayText.Equals("-")) return; /// OK + if (!int.TryParse(e.DisplayText, out dummy) || dummy < 1 || dummy > 3) + { + e.DisplayText = e.Item.SubItems[e.SubItem].Text; + e.Cancel = true; + return; /// NOK + } + } - if (((e.SubItem == (int)ProcessClmn.Feeding) && !(processEditors[(int)ProcessClmn.Feeding] as ComboBox).Items.Contains(e.DisplayText)) || - ((e.SubItem == (int)ProcessClmn.Bench) && !(processEditors[(int)ProcessClmn.Bench] as ComboBox).Items.Contains(e.DisplayText)) || - ((e.SubItem == (int)ProcessClmn.Output) && !(processEditors[(int)ProcessClmn.Output] as ComboBox).Items.Contains(e.DisplayText)) || - ((e.SubItem == (int)ProcessClmn.Sensor) && !(processEditors[(int)ProcessClmn.Sensor] as ComboBox).Items.Contains(e.DisplayText)) || - ((e.SubItem == (int)ProcessClmn.TrnStart)&& !(processEditors[(int)ProcessClmn.TrnStart]as ComboBox).Items.Contains(e.DisplayText)) || - ((e.SubItem == (int)ProcessClmn.TrnStop) && !(processEditors[(int)ProcessClmn.TrnStop] as ComboBox).Items.Contains(e.DisplayText))) + if (((e.SubItem == (int)ProcessClmn.Feeding) && !(processEditors[(int)ProcessClmn.Feeding] as ComboBox).Items.Contains(e.DisplayText)) || + ((e.SubItem == (int)ProcessClmn.Bench) && !(processEditors[(int)ProcessClmn.Bench] as ComboBox).Items.Contains(e.DisplayText)) || + ((e.SubItem == (int)ProcessClmn.Output) && !(processEditors[(int)ProcessClmn.Output] as ComboBox).Items.Contains(e.DisplayText)) || + ((e.SubItem == (int)ProcessClmn.Sensor) && !(processEditors[(int)ProcessClmn.Sensor] as ComboBox).Items.Contains(e.DisplayText)) || + ((e.SubItem == (int)ProcessClmn.TrnStart) && !(processEditors[(int)ProcessClmn.TrnStart] as ComboBox).Items.Contains(e.DisplayText)) || + ((e.SubItem == (int)ProcessClmn.TrnStop) && !(processEditors[(int)ProcessClmn.TrnStop] as ComboBox).Items.Contains(e.DisplayText))) + { + e.DisplayText = e.Item.SubItems[e.SubItem].Text; + e.Cancel = true; + } + } + + #endregion + + #region Parameters + + public enum ParametersClmn + { + Name, + Part, + PumpPower, + MassRepeats, +#if STABLE_MASS_EXTRAS + MassSpread, + MassMethod, +#endif + Time_Pump2StartV, + Time_BeforeFlow, + Time_Flow2Mass, + Time_Stop2Mass, + ColumnsCount + } + + Control[] parametersEditors; + + void PrepareParameters() + { + Results.Forms.ListViewEx lv = parametersListViewEx; + lv.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.Pump_power_pct, Width = 90 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.Mass_repeats, Width = 90 }); +#if STABLE_MASS_EXTRAS + lv.Columns.Add(new ColumnHeader { Text = Strings.Mass_spread_kg, Width = 110 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.Mass_method, Width = 90 }); +#endif + lv.Columns.Add(new ColumnHeader { Text = Strings.TimePump2StartV_chdr, Width = 70 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.TimeBeforeSettingFlow, Width = 70 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.TimeFlow2Start_chdr, Width = 70 }); + lv.Columns.Add(new ColumnHeader { Text = Strings.Time2MassMsrmt_chdr, Width = 70 }); + + parametersEditors = new Control[] + { + new TextBox(), /// Name + new TextBox(), /// Part + new ComboBox(), /// PumpPower + new TextBox(), /// MassRepeats +#if STABLE_MASS_EXTRAS + new TextBox(), /// MassSpread + new ComboBox(), /// MassMethod +#endif + new TextBox(), /// Time_Pump2StartV + new TextBox(), /// Time_BeforeFlow + new TextBox(), /// Time_Flow2Mass + new TextBox(), /// Time_Stop2Mass + }; + + ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("0"); + ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("30"); + ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("40"); + ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("50"); + ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("60"); + ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("70"); + ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("75"); + ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("80"); + ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("85"); + ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("90"); + ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("92"); + ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("94"); + ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("96"); + ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("98"); + ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("100"); +#if STABLE_MASS_EXTRAS + for (MassMethod mm = 0; mm < MassMethod.Count; mm++) { - e.DisplayText = e.Item.SubItems[e.SubItem].Text; - e.Cancel = true; + ((ComboBox)parametersEditors[(int)ParametersClmn.MassMethod]).Items.Add(mm.ToDescription()); + } +#endif + foreach (var ctrl in parametersEditors) + { + parametersTabPage.Controls.Add(ctrl); } } - private void parametersListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void RefreshParametersTab() + { + parametersListViewEx.Items.Clear(); + foreach (var test in LoadedProcedure.Tests) AddToParametersTab(test); + if (SelectedTestIx >= 0) parametersListViewEx.Items[SelectedTestIx].Selected = true; + } + + void AddToParametersTab(Test test) + { + /// + /// Parameters item with subitems + /// + ListViewItem lvi = new ListViewItem(test.Name); /// Name + lvi.Tag = test; + lvi.SubItems.Add((test.Part == 0) ? "-" : test.Part.ToString()); /// + lvi.SubItems.Add(test.PumpPower.ToString("F1")); + lvi.SubItems.Add((test.MassRepeats < 4 ? 5 : test.MassRepeats).ToString()); +#if STABLE_MASS_EXTRAS + lvi.SubItems.Add(test.MassSpread.ToString("F4")); + lvi.SubItems.Add(test.MassMethod.ToDescription()); +#endif + lvi.SubItems.Add(test.TimePump2StartV.ToString()); + lvi.SubItems.Add(test.TimeBeforeFlow.ToString()); + lvi.SubItems.Add(test.TimeFlow2Mass.ToString()); + lvi.SubItems.Add(test.TimeStop2Mass.ToString()); + + parametersListViewEx.Items.Add(lvi); + } + + void UpdateFromParametersTab() { + for (int i = 0; i < parametersListViewEx.Items.Count; i++) + { + ListViewItem lvi = parametersListViewEx.Items[i]; + Test entity = (Test)lvi.Tag; + + entity.Name = lvi.Text; + + int part = entity.Part; + if (lvi.SubItems[(int)ParametersClmn.Part].Text.Equals("-")) + { + entity.Part = 0; + } + else if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Part].Text, out part)) + { + entity.Part = part; + } + + float powerPct; + if (Utils.TryParseUFloat(lvi.SubItems[(int)ParametersClmn.PumpPower].Text, out powerPct) && powerPct >= 0 && powerPct <= 100.0f) + { + entity.PumpPower = powerPct; + } + + entity.MassRepeats = int.Parse(lvi.SubItems[(int)ParametersClmn.MassRepeats].Text); + +#if STABLE_MASS_EXTRAS + float massSpread; + if (Utils.TryParseUFloat(lvi.SubItems[(int)ParametersClmn.MassSpread].Text, out massSpread) && massSpread >= 0) + { + entity.MassSpread = massSpread; + } + + for (MassMethod mm = 0; mm < MassMethod.Count; mm++) + { + if (mm.ToDescription().Equals(lvi.SubItems[(int)ParametersClmn.MassMethod].Text)) entity.MassMethod = mm; + } +#endif + int itmp; + if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Time_Pump2StartV].Text, out itmp)) entity.TimePump2StartV = itmp; + if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Time_BeforeFlow].Text, out itmp)) entity.TimeBeforeFlow = itmp; + if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Time_Flow2Mass].Text, out itmp)) entity.TimeFlow2Mass = itmp; + if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Time_Stop2Mass].Text, out itmp)) entity.TimeStop2Mass = itmp; + } + } + + private void parametersListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + { if (!unlocked || e.SubItem >= (int)ParametersClmn.ColumnsCount) { return; } parametersListViewEx.StartEditing(parametersEditors[e.SubItem], e.Item, e.SubItem); - } + } - void parametersListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void parametersListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.SubItem >= (int)ParametersClmn.ColumnsCount) { @@ -1469,59 +1512,59 @@ namespace TBF } } - private void parametersListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) - { - int dummy; - if (e.SubItem == (int)ParametersClmn.Part) - { - if (e.DisplayText.Equals("-")) return; /// OK - if (!int.TryParse(e.DisplayText, out dummy) || dummy < 1 || dummy > 3) - { - e.DisplayText = e.Item.SubItems[e.SubItem].Text; - e.Cancel = true; - return; /// NOK - } - } + private void parametersListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + { + int dummy; + if (e.SubItem == (int)ParametersClmn.Part) + { + if (e.DisplayText.Equals("-")) return; /// OK + if (!int.TryParse(e.DisplayText, out dummy) || dummy < 1 || dummy > 3) + { + e.DisplayText = e.Item.SubItems[e.SubItem].Text; + e.Cancel = true; + return; /// NOK + } + } - float powerPct; - if ((e.SubItem == (int)ParametersClmn.PumpPower) && - (!Utils.TryParseUFloat(e.DisplayText, out powerPct) || powerPct < 0 || powerPct > 100.0f)) - { - e.DisplayText = e.Item.SubItems[e.SubItem].Text; - e.Cancel = true; - } + float powerPct; + if ((e.SubItem == (int)ParametersClmn.PumpPower) && + (!Utils.TryParseUFloat(e.DisplayText, out powerPct) || powerPct < 0 || powerPct > 100.0f)) + { + e.DisplayText = e.Item.SubItems[e.SubItem].Text; + e.Cancel = true; + } - int itmp; - if ((e.SubItem == (int)ParametersClmn.Time_Pump2StartV) && - (!int.TryParse(e.DisplayText, out itmp) || itmp < 0 || itmp > 300)) - { - e.DisplayText = e.Item.SubItems[e.SubItem].Text; - e.Cancel = true; - } - if ((e.SubItem == (int)ParametersClmn.Time_BeforeFlow) && - (!int.TryParse(e.DisplayText, out itmp) || itmp < 0 || itmp > 300)) - { - e.DisplayText = e.Item.SubItems[e.SubItem].Text; - e.Cancel = true; - } - if ((e.SubItem == (int)ParametersClmn.Time_Flow2Mass) && - (!int.TryParse(e.DisplayText, out itmp) || itmp < 0 || itmp > 300)) - { - e.DisplayText = e.Item.SubItems[e.SubItem].Text; - e.Cancel = true; - } - if ((e.SubItem == (int)ParametersClmn.Time_Stop2Mass) && - (!int.TryParse(e.DisplayText, out itmp) || itmp < 0 || itmp > 300)) - { - e.DisplayText = e.Item.SubItems[e.SubItem].Text; - e.Cancel = true; - } - if ((e.SubItem == (int)ParametersClmn.MassRepeats) && - (!int.TryParse(e.DisplayText, out itmp) || itmp < 4 || itmp > 100)) - { - e.DisplayText = e.Item.SubItems[e.SubItem].Text; - e.Cancel = true; - } + int itmp; + if ((e.SubItem == (int)ParametersClmn.Time_Pump2StartV) && + (!int.TryParse(e.DisplayText, out itmp) || itmp < 0 || itmp > 300)) + { + e.DisplayText = e.Item.SubItems[e.SubItem].Text; + e.Cancel = true; + } + if ((e.SubItem == (int)ParametersClmn.Time_BeforeFlow) && + (!int.TryParse(e.DisplayText, out itmp) || itmp < 0 || itmp > 300)) + { + e.DisplayText = e.Item.SubItems[e.SubItem].Text; + e.Cancel = true; + } + if ((e.SubItem == (int)ParametersClmn.Time_Flow2Mass) && + (!int.TryParse(e.DisplayText, out itmp) || itmp < 0 || itmp > 300)) + { + e.DisplayText = e.Item.SubItems[e.SubItem].Text; + e.Cancel = true; + } + if ((e.SubItem == (int)ParametersClmn.Time_Stop2Mass) && + (!int.TryParse(e.DisplayText, out itmp) || itmp < 0 || itmp > 300)) + { + e.DisplayText = e.Item.SubItems[e.SubItem].Text; + e.Cancel = true; + } + if ((e.SubItem == (int)ParametersClmn.MassRepeats) && + (!int.TryParse(e.DisplayText, out itmp) || itmp < 4 || itmp > 100)) + { + e.DisplayText = e.Item.SubItems[e.SubItem].Text; + e.Cancel = true; + } #if STABLE_MASS_EXTRAS if ((e.SubItem == (int)ParametersClmn.MassSpread) && !Utils.TryParseUFloat(e.DisplayText, out powerPct)) @@ -1548,11 +1591,26 @@ namespace TBF } } #endif - } + } #endregion + void RefreshMetrology12AndProcessTabs() + { + RefreshMetrology1Tab(); + RefreshMetrology2Tab(); + RefreshProcessTab(); + RefreshParametersTab(); + } + + void RefreshOtherTabs() + { + foreach (var ctrl in testParamsCtrls) ctrl.RedrawAll(); + foreach (var ctrl in procedureParamsCtrls) ctrl.RedrawAll(); + } + + private void Unlocked(object sender, EventArgs e) { unlocked = true; @@ -1677,20 +1735,30 @@ namespace TBF { switch (selectedTab) { - case ProcedureTabs.General: UpdateFromGeneralTab(); break; - case ProcedureTabs.Metrology1: UpdateFromMetrology1Tab(); break; - case ProcedureTabs.Metrology2: UpdateFromMetrology2Tab(); break; - case ProcedureTabs.Process: UpdateFromProcessTab(); break; - case ProcedureTabs.Parameters: UpdateFromParametersTab(); break; + case ProcedureTabs.General: + UpdateFromGeneralTab(); + break; + case ProcedureTabs.Metrology1: + UpdateFromMetrology1Tab(); + break; + case ProcedureTabs.Metrology2: + UpdateFromMetrology2Tab(); + break; + case ProcedureTabs.Process: + UpdateFromProcessTab(); + break; + case ProcedureTabs.Parameters: + UpdateFromParametersTab(); + break; } selectedTab = (ProcedureTabs)tabControl.SelectedIndex; + bool isMetr12ProcOrParams = selectedTab == ProcedureTabs.Metrology1 || + selectedTab == ProcedureTabs.Metrology2 || + selectedTab == ProcedureTabs.Process || + selectedTab == ProcedureTabs.Parameters; - sharedButtons.SetEnabled(SharedButtons.Buttons.Add, - selectedTab == ProcedureTabs.Metrology1 || - selectedTab == ProcedureTabs.Metrology2 || - selectedTab == ProcedureTabs.Process || - selectedTab == ProcedureTabs.Parameters); + sharedButtons.SetEnabled(SharedButtons.Buttons.Add, isMetr12ProcOrParams); //bool removeBtnEnabled = (selectedTab != ProcedureTabs.General && // selectedTab != ProcedureTabs.History && @@ -1698,7 +1766,58 @@ namespace TBF sharedButtons.DisableButtons(SharedButtons.Buttons.Remove); - RefreshAllTabs(); + Results.Forms.ListViewEx lv = null; + /// + switch (selectedTab) + { + case ProcedureTabs.General: + RefreshGeneralTab(); + break; + + case ProcedureTabs.Metrology1: + RefreshMetrology1Tab(); + lv = metrology1ListViewEx; /// ListVIewEx for test selection + break; + + case ProcedureTabs.Metrology2: + RefreshMetrology2Tab(); + lv = metrology2ListViewEx; /// ListVIewEx for test selection + break; + + case ProcedureTabs.Process: + RefreshProcessTab(); + lv = processListViewEx; /// ListVIewEx for test selection + break; + + case ProcedureTabs.Parameters: + RefreshParametersTab(); + lv = parametersListViewEx; /// ListVIewEx for test selection + break; + + default: + object ctrl = tabControl.SelectedTab.Tag; + if (ctrl is TestParamsCtrl) + { + (ctrl as TestParamsCtrl).RedrawAll(); + lv = (ctrl as TestParamsCtrl).LVEx; /// ListVIewEx for test selection + } + else if (ctrl is ProcedureParamsCtrl) + { + (ctrl as ProcedureParamsCtrl).RedrawAll(); + } + UpdateButtonStates(SharedButtons.SelectedItemPos.None); + break; + } + + /// + /// Highlight the selected test + /// + if (lv != null && SelectedTestIx >= 0) + { + lv.Focus(); + lv.Items[SelectedTestIx].Selected = true; + lv.Items[SelectedTestIx].EnsureVisible(); + } } #endregion @@ -1713,7 +1832,7 @@ namespace TBF { case ProcedureTabs.Metrology1: listViewEx = metrology1ListViewEx; break; case ProcedureTabs.Metrology2: listViewEx = metrology2ListViewEx; break; - case ProcedureTabs.Process: listViewEx = processListViewEx; break; + case ProcedureTabs.Process: listViewEx = processListViewEx; break; case ProcedureTabs.Parameters: listViewEx = parametersListViewEx; break; default: return; @@ -1865,13 +1984,12 @@ namespace TBF done: LoadedProcedure.Tests.Add(test); - AddToMetrology12AndProcessTab(test); - foreach (var ctrl in testParamsCtrls) - { - ctrl.AddOne(test); - } - -// AddProcedureParamsToRoiComponents(); + /// + AddToMetrology1Tab(test); + AddToMetrology2Tab(test); + AddToProcessTab(test); + AddToParametersTab(test); + foreach (var ctrl in testParamsCtrls) ctrl.AddOne(test); listViewEx.Focus(); listViewEx.SelectedItems.Clear(); @@ -1974,6 +2092,8 @@ namespace TBF LoadedProcedure.Tests.RemoveAt(ix); LoadedProcedure.Tests.Insert(ix - 1, test2); + if (SelectedTestIx >= 1) SelectedTestIx--; + RefreshMetrology12AndProcessTabs(); listViewEx.Focus(); @@ -2023,6 +2143,8 @@ namespace TBF LoadedProcedure.Tests.RemoveAt(ix + 1); LoadedProcedure.Tests.Insert(ix, test2); + if ((SelectedTestIx >= 0) && (SelectedTestIx < listViewEx.Items.Count - 1)) SelectedTestIx++; + RefreshMetrology12AndProcessTabs(); listViewEx.Focus(); @@ -2032,68 +2154,35 @@ namespace TBF #endregion - public void UpdateButtonStates(SharedButtons.SelectedItemPos selectedItemPos) - { - if (selectedItemPos == SharedButtons.SelectedItemPos.None) - { - sharedButtons.DisableButtons(SharedButtons.Buttons.Remove | SharedButtons.Buttons.Up | SharedButtons.Buttons.Down); - } - else if (selectedItemPos == SharedButtons.SelectedItemPos.First) - { - sharedButtons.EnableButtons(SharedButtons.Buttons.Remove | SharedButtons.Buttons.Down); - sharedButtons.DisableButtons(SharedButtons.Buttons.Up); - } - else if (selectedItemPos == SharedButtons.SelectedItemPos.Last) - { - sharedButtons.EnableButtons(SharedButtons.Buttons.Remove | SharedButtons.Buttons.Up); - sharedButtons.DisableButtons(SharedButtons.Buttons.Down); - } - else if (selectedItemPos == SharedButtons.SelectedItemPos.FirstAndLast) - { - sharedButtons.EnableButtons(SharedButtons.Buttons.Remove); - sharedButtons.DisableButtons(SharedButtons.Buttons.Up | SharedButtons.Buttons.Down); - } - else - { - sharedButtons.EnableButtons(SharedButtons.Buttons.Remove | SharedButtons.Buttons.Up | SharedButtons.Buttons.Down); - } - } - - private void metrology1ListViewEx_SelectedIndexChanged(object sender, EventArgs e) - { - SelectedIndexChanged(sender, e); - } - - private void metrology2ListViewEx_SelectedIndexChanged(object sender, EventArgs e) - { - SelectedIndexChanged(sender, e); - } - - private void processListViewEx_SelectedIndexChanged(object sender, EventArgs e) - { - SelectedIndexChanged(sender, e); - } + private void metrology1ListViewEx_SelectedIndexChanged(object sender, EventArgs e) { SelectedIndexChanged(sender, e); } + private void metrology2ListViewEx_SelectedIndexChanged(object sender, EventArgs e) { SelectedIndexChanged(sender, e); } + private void processListViewEx_SelectedIndexChanged(object sender, EventArgs e) { SelectedIndexChanged(sender, e); } + private void parametersListViewEx_SelectedIndexChanged(object sender, EventArgs e) { SelectedIndexChanged(sender, e); } /// - /// Common part for three xxxListViewEx_SelectedIndexChanged event handlers + /// Common part for four xxxListViewEx_SelectedIndexChanged event handlers /// - /// void SelectedIndexChanged(object sender, EventArgs e) { Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx; if (listViewEx.SelectedItems.Count != 1) { UpdateButtonStates(SharedButtons.SelectedItemPos.None); + SelectedTestIx = -1; + return; } - else if (listViewEx.Items.Count == 1) + + SelectedTestIx = listViewEx.SelectedIndices[0]; + + if (listViewEx.Items.Count == 1) { UpdateButtonStates(SharedButtons.SelectedItemPos.FirstAndLast); } - else if (listViewEx.SelectedIndices[0] == 0) + else if (SelectedTestIx == 0) { UpdateButtonStates(SharedButtons.SelectedItemPos.First); } - else if (listViewEx.SelectedIndices[0] == (listViewEx.Items.Count - 1)) + else if (SelectedTestIx == (listViewEx.Items.Count - 1)) { UpdateButtonStates(SharedButtons.SelectedItemPos.Last); } @@ -2103,6 +2192,33 @@ namespace TBF } } + public void UpdateButtonStates(SharedButtons.SelectedItemPos selectedItemPos) + { + if (selectedItemPos == SharedButtons.SelectedItemPos.None) + { + sharedButtons.DisableButtons(SharedButtons.Buttons.Remove | SharedButtons.Buttons.Up | SharedButtons.Buttons.Down); + } + else if (selectedItemPos == SharedButtons.SelectedItemPos.First) + { + sharedButtons.EnableButtons(SharedButtons.Buttons.Remove | SharedButtons.Buttons.Down); + sharedButtons.DisableButtons(SharedButtons.Buttons.Up); + } + else if (selectedItemPos == SharedButtons.SelectedItemPos.Last) + { + sharedButtons.EnableButtons(SharedButtons.Buttons.Remove | SharedButtons.Buttons.Up); + sharedButtons.DisableButtons(SharedButtons.Buttons.Down); + } + else if (selectedItemPos == SharedButtons.SelectedItemPos.FirstAndLast) + { + sharedButtons.EnableButtons(SharedButtons.Buttons.Remove); + sharedButtons.DisableButtons(SharedButtons.Buttons.Up | SharedButtons.Buttons.Down); + } + else + { + sharedButtons.EnableButtons(SharedButtons.Buttons.Remove | SharedButtons.Buttons.Up | SharedButtons.Buttons.Down); + } + } + /// /// Adds ROI data/process data prepared by the wizard to ROI-components in the selected sensors path /// diff --git a/TBF/ProcedureDlg.resx b/TBF/ProcedureDlg.resx index 281a380f1..5b88076a0 100644 --- a/TBF/ProcedureDlg.resx +++ b/TBF/ProcedureDlg.resx @@ -1216,7 +1216,7 @@ historyListViewEx - Results.Forms.ListViewEx, Results, Version=2.15.619.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.18.893.0, Culture=neutral, PublicKeyToken=null historyTabPage @@ -1267,7 +1267,7 @@ metrology1ListViewEx - Results.Forms.ListViewEx, Results, Version=2.15.619.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.18.893.0, Culture=neutral, PublicKeyToken=null metrology1TabPage @@ -1318,7 +1318,7 @@ metrology2ListViewEx - Results.Forms.ListViewEx, Results, Version=2.15.619.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.18.893.0, Culture=neutral, PublicKeyToken=null metrology2TabPage @@ -1369,7 +1369,7 @@ processListViewEx - Results.Forms.ListViewEx, Results, Version=2.15.619.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.18.893.0, Culture=neutral, PublicKeyToken=null processTabPage @@ -1420,7 +1420,7 @@ parametersListViewEx - Results.Forms.ListViewEx, Results, Version=2.15.619.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.18.893.0, Culture=neutral, PublicKeyToken=null parametersTabPage @@ -1504,7 +1504,7 @@ sharedButtons - TBF.UiControls.SharedButtons, TBF, Version=2.15.626.1, Culture=neutral, PublicKeyToken=null + TBF.UiControls.SharedButtons, TBF, Version=2.18.901.0, Culture=neutral, PublicKeyToken=null mainSplitContainer.Panel2 diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 00d97d7d9..a5c69db68 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.901.0")] -[assembly: AssemblyFileVersion("2.18.901.0")] +[assembly: AssemblyVersion("2.18.902.0")] +[assembly: AssemblyFileVersion("2.18.902.0")] diff --git a/TBF/UiControls/TestParamsCtrl.cs b/TBF/UiControls/TestParamsCtrl.cs index 8eeef1b75..986e160db 100644 --- a/TBF/UiControls/TestParamsCtrl.cs +++ b/TBF/UiControls/TestParamsCtrl.cs @@ -24,6 +24,7 @@ namespace TBF.UiControls bool showTestsColumn; BenchControl.Generic.IComponent cmpnt; + IList testParamsProviders; int paramsCount; @@ -31,7 +32,9 @@ namespace TBF.UiControls Control[] editors; bool unlocked; - public void Unlock(){ unlocked = true; } + public void Unlock() { unlocked = true; } + + public Results.Forms.ListViewEx LVEx { get { return listViewEx; } } public TestParamsCtrl() { @@ -99,7 +102,10 @@ namespace TBF.UiControls foreach (var test in tests) { IParamsProvider testParams = cmpnt.Cfg.GetUITestParamsProvider(test); - if (sampleToCreateHeader == null) sampleToCreateHeader = testParams; + if (testParams != null && (sampleToCreateHeader == null || testParams.ParamsCount() > sampleToCreateHeader.ParamsCount())) + { + sampleToCreateHeader = testParams; + } providers.Add(testParams); }