diff --git a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs index a18fffe4d..5414c5dc1 100644 --- a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs +++ b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs @@ -256,50 +256,50 @@ namespace TBF.BenchControl.Sequences int[] waterMeterParts = new int[waterMetersCount]; for (int wmNr = 0; wmNr < waterMetersCount; wmNr++) { - int i = compound ? 2 * wmNr : wmNr; + int ix = compound ? (2 * wmNr) : wmNr; waterMeterParts[wmNr] = Utils.PartNr(wmNr + 1, compound); waterMeterData[wmNr] = new Results.Entities.WaterMeterData() { ProductName = StateMachine.Procedure.Name, - Producer = WaterMeters[i].Producer, + Producer = WaterMeters[ix].Producer, - L = WaterMeters[i].L, - DN = WaterMeters[i].DN, - Mounting = WaterMeters[i].Mounting, + L = WaterMeters[ix].L, + DN = WaterMeters[ix].DN, + Mounting = WaterMeters[ix].Mounting, - Q4_Qmax = WaterMeters[i].Q4_Qmax, - Q3_Qn = WaterMeters[i].Q3_Qn, - Q2_Qt = WaterMeters[i].Q2_Qt, - Q1_Qmin = WaterMeters[i].Q1_Qmin, + Q4_Qmax = WaterMeters[ix].Q4_Qmax, + Q3_Qn = WaterMeters[ix].Q3_Qn, + Q2_Qt = WaterMeters[ix].Q2_Qt, + Q1_Qmin = WaterMeters[ix].Q1_Qmin, - MetrologicalClass = WaterMeters[i].MetrologicalClass, - TemperatureClass = WaterMeters[i].TemperatureClass, - PressureLossClass = WaterMeters[i].PressureLossClass, - MaxAdmissiblePressure = WaterMeters[i].MaxAdmissiblePressure, - FlowProfileSensitivityClass = WaterMeters[i].FlowProfileSensitivityClass, + MetrologicalClass = WaterMeters[ix].MetrologicalClass, + TemperatureClass = WaterMeters[ix].TemperatureClass, + PressureLossClass = WaterMeters[ix].PressureLossClass, + MaxAdmissiblePressure = WaterMeters[ix].MaxAdmissiblePressure, + FlowProfileSensitivityClass = WaterMeters[ix].FlowProfileSensitivityClass, - ApprovalInfo = WaterMeters[i].ApprovalInfo, - Certificate = WaterMeters[i].Certificate, + ApprovalInfo = WaterMeters[ix].ApprovalInfo, + Certificate = WaterMeters[ix].Certificate, - PulsesPerLtr = WaterMeters[i].PulsesPerLtr, + PulsesPerLtr = WaterMeters[ix].PulsesPerLtr, - Text1 = WaterMeters[i].Text1, - Text2 = WaterMeters[i].Text2, - Text3 = WaterMeters[i].Text3, - Text4 = WaterMeters[i].Text4, - Text5 = WaterMeters[i].Text5, + Text1 = WaterMeters[ix].Text1, + Text2 = WaterMeters[ix].Text2, + Text3 = WaterMeters[ix].Text3, + Text4 = WaterMeters[ix].Text4, + Text5 = WaterMeters[ix].Text5, Compound = compound, }; if (compound) { - int j = 2 * wmNr + 1; - waterMeterData[wmNr].ProducerAux = WaterMeters[j].Producer; - waterMeterData[wmNr].Q3_Qn_Aux = WaterMeters[j].Q3_Qn; - waterMeterData[wmNr].MetrologicalClassAux = WaterMeters[j].MetrologicalClass; - waterMeterData[wmNr].ApprovalInfoAux = WaterMeters[j].ApprovalInfo; + int auxIx = 2 * wmNr + 1; + waterMeterData[wmNr].ProducerAux = WaterMeters[auxIx].Producer; + waterMeterData[wmNr].Q3_Qn_Aux = WaterMeters[auxIx].Q3_Qn; + waterMeterData[wmNr].MetrologicalClassAux = WaterMeters[auxIx].MetrologicalClass; + waterMeterData[wmNr].ApprovalInfoAux = WaterMeters[auxIx].ApprovalInfo; } #if IPERLST || IPERLST_SPECIAL diff --git a/TestBenchFramework/ProcedureDlg.Designer.cs b/TestBenchFramework/ProcedureDlg.Designer.cs index 05c813a68..5892e35ee 100644 --- a/TestBenchFramework/ProcedureDlg.Designer.cs +++ b/TestBenchFramework/ProcedureDlg.Designer.cs @@ -31,436 +31,436 @@ namespace TBF /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProcedureDlg)); - this.mainSplitContainer = new System.Windows.Forms.SplitContainer(); - this.tabControl = new System.Windows.Forms.TabControl(); - this.generalTabPage = new System.Windows.Forms.TabPage(); - this.fileWriter2ComboBox = new System.Windows.Forms.ComboBox(); - this.protocolTitleTextBox = new System.Windows.Forms.TextBox(); - this.protocolTitleLabel = new System.Windows.Forms.Label(); - this.metersKindRadioButton2 = new System.Windows.Forms.RadioButton(); - this.metersKindRadioButton1 = new System.Windows.Forms.RadioButton(); - this.transitionEndComboBox = new System.Windows.Forms.ComboBox(); - this.transitionEndLabel = new System.Windows.Forms.Label(); - this.transitionStartComboBox = new System.Windows.Forms.ComboBox(); - this.transitionStartLabel = new System.Windows.Forms.Label(); - this.fileWriter1ComboBox = new System.Windows.Forms.ComboBox(); - this.printer1ComboBox = new System.Windows.Forms.ComboBox(); - this.dataEntryComboBox = new System.Windows.Forms.ComboBox(); - this.resultsWriterLabel = new System.Windows.Forms.Label(); - this.resultsPrinterLabel = new System.Windows.Forms.Label(); - this.dataEntryLabel = new System.Windows.Forms.Label(); - this.notesTextBox = new System.Windows.Forms.TextBox(); - this.label18 = new System.Windows.Forms.Label(); - this.watermetersTextBox = new System.Windows.Forms.TextBox(); - this.watermetersLabel = new System.Windows.Forms.Label(); - this.lastChangedOnTextBox = new System.Windows.Forms.TextBox(); - this.label15 = new System.Windows.Forms.Label(); - this.lastChangedByTextBox = new System.Windows.Forms.TextBox(); - this.label16 = new System.Windows.Forms.Label(); - this.createdOnTextBox = new System.Windows.Forms.TextBox(); - this.label14 = new System.Windows.Forms.Label(); - this.createdByTextBox = new System.Windows.Forms.TextBox(); - this.label13 = new System.Windows.Forms.Label(); - this.descriptionTextBox = new System.Windows.Forms.TextBox(); - this.label12 = new System.Windows.Forms.Label(); - this.procNameTextBox = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.historyTabPage = new System.Windows.Forms.TabPage(); - this.historyListViewEx = new TBF.UiControls.ListViewEx(); - this.metrology1TabPage = new System.Windows.Forms.TabPage(); - this.metrology1ListViewEx = new TBF.UiControls.ListViewEx(); - this.metrology2TabPage = new System.Windows.Forms.TabPage(); - this.metrology2ListViewEx = new TBF.UiControls.ListViewEx(); - this.processTabPage = new System.Windows.Forms.TabPage(); - this.processListViewEx = new TBF.UiControls.ListViewEx(); - this.parametersTabPage = new System.Windows.Forms.TabPage(); - this.parametersListViewEx = new TBF.UiControls.ListViewEx(); - this.sharedButtons = new TBF.UiControls.SharedButtons(); - this.printer2ComboBox = new System.Windows.Forms.ComboBox(); - this.fileWriter3ComboBox = new System.Windows.Forms.ComboBox(); - this.fileWriter4ComboBox = new System.Windows.Forms.ComboBox(); - ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit(); - this.mainSplitContainer.Panel1.SuspendLayout(); - this.mainSplitContainer.Panel2.SuspendLayout(); - this.mainSplitContainer.SuspendLayout(); - this.tabControl.SuspendLayout(); - this.generalTabPage.SuspendLayout(); - this.historyTabPage.SuspendLayout(); - this.metrology1TabPage.SuspendLayout(); - this.metrology2TabPage.SuspendLayout(); - this.processTabPage.SuspendLayout(); - this.parametersTabPage.SuspendLayout(); - this.SuspendLayout(); - // - // mainSplitContainer - // - resources.ApplyResources(this.mainSplitContainer, "mainSplitContainer"); - this.mainSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.mainSplitContainer.Name = "mainSplitContainer"; - // - // mainSplitContainer.Panel1 - // - this.mainSplitContainer.Panel1.Controls.Add(this.tabControl); - // - // mainSplitContainer.Panel2 - // - this.mainSplitContainer.Panel2.Controls.Add(this.sharedButtons); - // - // tabControl - // - this.tabControl.Controls.Add(this.generalTabPage); - this.tabControl.Controls.Add(this.historyTabPage); - this.tabControl.Controls.Add(this.metrology1TabPage); - this.tabControl.Controls.Add(this.metrology2TabPage); - this.tabControl.Controls.Add(this.processTabPage); - this.tabControl.Controls.Add(this.parametersTabPage); - resources.ApplyResources(this.tabControl, "tabControl"); - this.tabControl.Name = "tabControl"; - this.tabControl.SelectedIndex = 0; - this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged); - // - // generalTabPage - // - this.generalTabPage.Controls.Add(this.fileWriter4ComboBox); - this.generalTabPage.Controls.Add(this.fileWriter3ComboBox); - this.generalTabPage.Controls.Add(this.printer2ComboBox); - this.generalTabPage.Controls.Add(this.fileWriter2ComboBox); - this.generalTabPage.Controls.Add(this.protocolTitleTextBox); - this.generalTabPage.Controls.Add(this.protocolTitleLabel); - this.generalTabPage.Controls.Add(this.metersKindRadioButton2); - this.generalTabPage.Controls.Add(this.metersKindRadioButton1); - this.generalTabPage.Controls.Add(this.transitionEndComboBox); - this.generalTabPage.Controls.Add(this.transitionEndLabel); - this.generalTabPage.Controls.Add(this.transitionStartComboBox); - this.generalTabPage.Controls.Add(this.transitionStartLabel); - this.generalTabPage.Controls.Add(this.fileWriter1ComboBox); - this.generalTabPage.Controls.Add(this.printer1ComboBox); - this.generalTabPage.Controls.Add(this.dataEntryComboBox); - this.generalTabPage.Controls.Add(this.resultsWriterLabel); - this.generalTabPage.Controls.Add(this.resultsPrinterLabel); - this.generalTabPage.Controls.Add(this.dataEntryLabel); - this.generalTabPage.Controls.Add(this.notesTextBox); - this.generalTabPage.Controls.Add(this.label18); - this.generalTabPage.Controls.Add(this.watermetersTextBox); - this.generalTabPage.Controls.Add(this.watermetersLabel); - this.generalTabPage.Controls.Add(this.lastChangedOnTextBox); - this.generalTabPage.Controls.Add(this.label15); - this.generalTabPage.Controls.Add(this.lastChangedByTextBox); - this.generalTabPage.Controls.Add(this.label16); - this.generalTabPage.Controls.Add(this.createdOnTextBox); - this.generalTabPage.Controls.Add(this.label14); - this.generalTabPage.Controls.Add(this.createdByTextBox); - this.generalTabPage.Controls.Add(this.label13); - this.generalTabPage.Controls.Add(this.descriptionTextBox); - this.generalTabPage.Controls.Add(this.label12); - this.generalTabPage.Controls.Add(this.procNameTextBox); - this.generalTabPage.Controls.Add(this.label1); - resources.ApplyResources(this.generalTabPage, "generalTabPage"); - this.generalTabPage.Name = "generalTabPage"; - this.generalTabPage.UseVisualStyleBackColor = true; - // - // fileWriter2ComboBox - // - this.fileWriter2ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.fileWriter2ComboBox, "fileWriter2ComboBox"); - this.fileWriter2ComboBox.Name = "fileWriter2ComboBox"; - // - // protocolTitleTextBox - // - resources.ApplyResources(this.protocolTitleTextBox, "protocolTitleTextBox"); - this.protocolTitleTextBox.Name = "protocolTitleTextBox"; - // - // protocolTitleLabel - // - resources.ApplyResources(this.protocolTitleLabel, "protocolTitleLabel"); - this.protocolTitleLabel.ImageKey = global::TBF.Resources.Strings.Closing_the_tank; - this.protocolTitleLabel.Name = "protocolTitleLabel"; - // - // metersKindRadioButton2 - // - resources.ApplyResources(this.metersKindRadioButton2, "metersKindRadioButton2"); - this.metersKindRadioButton2.Name = "metersKindRadioButton2"; - this.metersKindRadioButton2.TabStop = true; - this.metersKindRadioButton2.UseVisualStyleBackColor = true; - // - // metersKindRadioButton1 - // - resources.ApplyResources(this.metersKindRadioButton1, "metersKindRadioButton1"); - this.metersKindRadioButton1.Name = "metersKindRadioButton1"; - this.metersKindRadioButton1.TabStop = true; - this.metersKindRadioButton1.UseVisualStyleBackColor = true; - // - // transitionEndComboBox - // - this.transitionEndComboBox.FormattingEnabled = true; - resources.ApplyResources(this.transitionEndComboBox, "transitionEndComboBox"); - this.transitionEndComboBox.Name = "transitionEndComboBox"; - // - // transitionEndLabel - // - resources.ApplyResources(this.transitionEndLabel, "transitionEndLabel"); - this.transitionEndLabel.Name = "transitionEndLabel"; - // - // transitionStartComboBox - // - this.transitionStartComboBox.FormattingEnabled = true; - resources.ApplyResources(this.transitionStartComboBox, "transitionStartComboBox"); - this.transitionStartComboBox.Name = "transitionStartComboBox"; - // - // transitionStartLabel - // - resources.ApplyResources(this.transitionStartLabel, "transitionStartLabel"); - this.transitionStartLabel.Name = "transitionStartLabel"; - // - // fileWriter1ComboBox - // - this.fileWriter1ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.fileWriter1ComboBox, "fileWriter1ComboBox"); - this.fileWriter1ComboBox.Name = "fileWriter1ComboBox"; - // - // printer1ComboBox - // - this.printer1ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.printer1ComboBox, "printer1ComboBox"); - this.printer1ComboBox.Name = "printer1ComboBox"; - // - // dataEntryComboBox - // - this.dataEntryComboBox.FormattingEnabled = true; - resources.ApplyResources(this.dataEntryComboBox, "dataEntryComboBox"); - this.dataEntryComboBox.Name = "dataEntryComboBox"; - // - // resultsWriterLabel - // - resources.ApplyResources(this.resultsWriterLabel, "resultsWriterLabel"); - this.resultsWriterLabel.Name = "resultsWriterLabel"; - // - // resultsPrinterLabel - // - resources.ApplyResources(this.resultsPrinterLabel, "resultsPrinterLabel"); - this.resultsPrinterLabel.Name = "resultsPrinterLabel"; - // - // dataEntryLabel - // - resources.ApplyResources(this.dataEntryLabel, "dataEntryLabel"); - this.dataEntryLabel.Name = "dataEntryLabel"; - // - // notesTextBox - // - resources.ApplyResources(this.notesTextBox, "notesTextBox"); - this.notesTextBox.Name = "notesTextBox"; - // - // label18 - // - resources.ApplyResources(this.label18, "label18"); - this.label18.Name = "label18"; - // - // watermetersTextBox - // - resources.ApplyResources(this.watermetersTextBox, "watermetersTextBox"); - this.watermetersTextBox.Name = "watermetersTextBox"; - // - // watermetersLabel - // - resources.ApplyResources(this.watermetersLabel, "watermetersLabel"); - this.watermetersLabel.Name = "watermetersLabel"; - // - // lastChangedOnTextBox - // - resources.ApplyResources(this.lastChangedOnTextBox, "lastChangedOnTextBox"); - this.lastChangedOnTextBox.Name = "lastChangedOnTextBox"; - // - // label15 - // - resources.ApplyResources(this.label15, "label15"); - this.label15.Name = "label15"; - // - // lastChangedByTextBox - // - resources.ApplyResources(this.lastChangedByTextBox, "lastChangedByTextBox"); - this.lastChangedByTextBox.Name = "lastChangedByTextBox"; - // - // label16 - // - resources.ApplyResources(this.label16, "label16"); - this.label16.Name = "label16"; - // - // createdOnTextBox - // - resources.ApplyResources(this.createdOnTextBox, "createdOnTextBox"); - this.createdOnTextBox.Name = "createdOnTextBox"; - // - // label14 - // - resources.ApplyResources(this.label14, "label14"); - this.label14.Name = "label14"; - // - // createdByTextBox - // - resources.ApplyResources(this.createdByTextBox, "createdByTextBox"); - this.createdByTextBox.Name = "createdByTextBox"; - // - // label13 - // - resources.ApplyResources(this.label13, "label13"); - this.label13.Name = "label13"; - // - // descriptionTextBox - // - resources.ApplyResources(this.descriptionTextBox, "descriptionTextBox"); - this.descriptionTextBox.Name = "descriptionTextBox"; - // - // label12 - // - resources.ApplyResources(this.label12, "label12"); - this.label12.Name = "label12"; - // - // procNameTextBox - // - resources.ApplyResources(this.procNameTextBox, "procNameTextBox"); - this.procNameTextBox.Name = "procNameTextBox"; - // - // label1 - // - resources.ApplyResources(this.label1, "label1"); - this.label1.Name = "label1"; - // - // historyTabPage - // - this.historyTabPage.Controls.Add(this.historyListViewEx); - resources.ApplyResources(this.historyTabPage, "historyTabPage"); - this.historyTabPage.Name = "historyTabPage"; - this.historyTabPage.UseVisualStyleBackColor = true; - // - // historyListViewEx - // - this.historyListViewEx.AllowColumnReorder = true; - resources.ApplyResources(this.historyListViewEx, "historyListViewEx"); - this.historyListViewEx.DoubleClickActivation = false; - this.historyListViewEx.FullRowSelect = true; - this.historyListViewEx.GridLines = true; - this.historyListViewEx.Name = "historyListViewEx"; - this.historyListViewEx.UseCompatibleStateImageBehavior = false; - this.historyListViewEx.View = System.Windows.Forms.View.Details; - // - // metrology1TabPage - // - this.metrology1TabPage.Controls.Add(this.metrology1ListViewEx); - resources.ApplyResources(this.metrology1TabPage, "metrology1TabPage"); - this.metrology1TabPage.Name = "metrology1TabPage"; - this.metrology1TabPage.UseVisualStyleBackColor = true; - // - // metrology1ListViewEx - // - this.metrology1ListViewEx.AllowColumnReorder = true; - resources.ApplyResources(this.metrology1ListViewEx, "metrology1ListViewEx"); - this.metrology1ListViewEx.DoubleClickActivation = false; - this.metrology1ListViewEx.FullRowSelect = true; - this.metrology1ListViewEx.GridLines = true; - this.metrology1ListViewEx.Name = "metrology1ListViewEx"; - this.metrology1ListViewEx.UseCompatibleStateImageBehavior = false; - this.metrology1ListViewEx.View = System.Windows.Forms.View.Details; - this.metrology1ListViewEx.SelectedIndexChanged += new System.EventHandler(this.metrology1ListViewEx_SelectedIndexChanged); - // - // metrology2TabPage - // - this.metrology2TabPage.Controls.Add(this.metrology2ListViewEx); - resources.ApplyResources(this.metrology2TabPage, "metrology2TabPage"); - this.metrology2TabPage.Name = "metrology2TabPage"; - this.metrology2TabPage.UseVisualStyleBackColor = true; - // - // metrology2ListViewEx - // - this.metrology2ListViewEx.AllowColumnReorder = true; - resources.ApplyResources(this.metrology2ListViewEx, "metrology2ListViewEx"); - this.metrology2ListViewEx.DoubleClickActivation = false; - this.metrology2ListViewEx.FullRowSelect = true; - this.metrology2ListViewEx.GridLines = true; - this.metrology2ListViewEx.Name = "metrology2ListViewEx"; - this.metrology2ListViewEx.UseCompatibleStateImageBehavior = false; - this.metrology2ListViewEx.View = System.Windows.Forms.View.Details; - this.metrology2ListViewEx.SelectedIndexChanged += new System.EventHandler(this.metrology2ListViewEx_SelectedIndexChanged); - // - // processTabPage - // - this.processTabPage.Controls.Add(this.processListViewEx); - resources.ApplyResources(this.processTabPage, "processTabPage"); - this.processTabPage.Name = "processTabPage"; - this.processTabPage.UseVisualStyleBackColor = true; - // - // processListViewEx - // - this.processListViewEx.AllowColumnReorder = true; - resources.ApplyResources(this.processListViewEx, "processListViewEx"); - this.processListViewEx.DoubleClickActivation = false; - this.processListViewEx.FullRowSelect = true; - this.processListViewEx.GridLines = true; - this.processListViewEx.Name = "processListViewEx"; - this.processListViewEx.UseCompatibleStateImageBehavior = false; - this.processListViewEx.View = System.Windows.Forms.View.Details; - this.processListViewEx.SelectedIndexChanged += new System.EventHandler(this.processListViewEx_SelectedIndexChanged); - // - // parametersTabPage - // - this.parametersTabPage.Controls.Add(this.parametersListViewEx); - resources.ApplyResources(this.parametersTabPage, "parametersTabPage"); - this.parametersTabPage.Name = "parametersTabPage"; - this.parametersTabPage.UseVisualStyleBackColor = true; - // - // parametersListViewEx - // - this.parametersListViewEx.AllowColumnReorder = true; - resources.ApplyResources(this.parametersListViewEx, "parametersListViewEx"); - this.parametersListViewEx.DoubleClickActivation = false; - this.parametersListViewEx.FullRowSelect = true; - this.parametersListViewEx.Name = "parametersListViewEx"; - this.parametersListViewEx.UseCompatibleStateImageBehavior = false; - this.parametersListViewEx.View = System.Windows.Forms.View.Details; - // - // sharedButtons - // - resources.ApplyResources(this.sharedButtons, "sharedButtons"); - this.sharedButtons.Name = "sharedButtons"; - // - // printer2ComboBox - // - this.printer2ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.printer2ComboBox, "printer2ComboBox"); - this.printer2ComboBox.Name = "printer2ComboBox"; - // - // fileWriter3ComboBox - // - this.fileWriter3ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.fileWriter3ComboBox, "fileWriter3ComboBox"); - this.fileWriter3ComboBox.Name = "fileWriter3ComboBox"; - // - // fileWriter4ComboBox - // - this.fileWriter4ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.fileWriter4ComboBox, "fileWriter4ComboBox"); - this.fileWriter4ComboBox.Name = "fileWriter4ComboBox"; - // - // ProcedureDlg - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.mainSplitContainer); - this.Name = "ProcedureDlg"; - this.Load += new System.EventHandler(this.ProcedureDlg_Load); - this.mainSplitContainer.Panel1.ResumeLayout(false); - this.mainSplitContainer.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).EndInit(); - this.mainSplitContainer.ResumeLayout(false); - this.tabControl.ResumeLayout(false); - this.generalTabPage.ResumeLayout(false); - this.generalTabPage.PerformLayout(); - this.historyTabPage.ResumeLayout(false); - this.metrology1TabPage.ResumeLayout(false); - this.metrology2TabPage.ResumeLayout(false); - this.processTabPage.ResumeLayout(false); - this.parametersTabPage.ResumeLayout(false); - this.ResumeLayout(false); + 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.fileWriter4ComboBox = new System.Windows.Forms.ComboBox(); + this.fileWriter3ComboBox = new System.Windows.Forms.ComboBox(); + this.printer2ComboBox = new System.Windows.Forms.ComboBox(); + this.fileWriter2ComboBox = new System.Windows.Forms.ComboBox(); + this.protocolTitleTextBox = new System.Windows.Forms.TextBox(); + this.protocolTitleLabel = new System.Windows.Forms.Label(); + this.metersKindRadioButton2 = new System.Windows.Forms.RadioButton(); + this.metersKindRadioButton1 = new System.Windows.Forms.RadioButton(); + this.transitionEndComboBox = new System.Windows.Forms.ComboBox(); + this.transitionEndLabel = new System.Windows.Forms.Label(); + this.transitionStartComboBox = new System.Windows.Forms.ComboBox(); + this.transitionStartLabel = new System.Windows.Forms.Label(); + this.fileWriter1ComboBox = new System.Windows.Forms.ComboBox(); + this.printer1ComboBox = new System.Windows.Forms.ComboBox(); + this.dataEntryComboBox = new System.Windows.Forms.ComboBox(); + this.resultsWriterLabel = new System.Windows.Forms.Label(); + this.resultsPrinterLabel = new System.Windows.Forms.Label(); + this.dataEntryLabel = new System.Windows.Forms.Label(); + this.notesTextBox = new System.Windows.Forms.TextBox(); + this.label18 = new System.Windows.Forms.Label(); + this.watermetersTextBox = new System.Windows.Forms.TextBox(); + this.watermetersLabel = new System.Windows.Forms.Label(); + this.lastChangedOnTextBox = new System.Windows.Forms.TextBox(); + this.label15 = new System.Windows.Forms.Label(); + this.lastChangedByTextBox = new System.Windows.Forms.TextBox(); + this.label16 = new System.Windows.Forms.Label(); + this.createdOnTextBox = new System.Windows.Forms.TextBox(); + this.label14 = new System.Windows.Forms.Label(); + this.createdByTextBox = new System.Windows.Forms.TextBox(); + this.label13 = new System.Windows.Forms.Label(); + this.descriptionTextBox = new System.Windows.Forms.TextBox(); + this.label12 = new System.Windows.Forms.Label(); + this.procNameTextBox = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.historyTabPage = new System.Windows.Forms.TabPage(); + this.historyListViewEx = new TBF.UiControls.ListViewEx(); + this.metrology1TabPage = new System.Windows.Forms.TabPage(); + this.metrology1ListViewEx = new TBF.UiControls.ListViewEx(); + this.metrology2TabPage = new System.Windows.Forms.TabPage(); + this.metrology2ListViewEx = new TBF.UiControls.ListViewEx(); + this.processTabPage = new System.Windows.Forms.TabPage(); + this.processListViewEx = new TBF.UiControls.ListViewEx(); + this.parametersTabPage = new System.Windows.Forms.TabPage(); + this.parametersListViewEx = new TBF.UiControls.ListViewEx(); + this.sharedButtons = new TBF.UiControls.SharedButtons(); + ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit(); + this.mainSplitContainer.Panel1.SuspendLayout(); + this.mainSplitContainer.Panel2.SuspendLayout(); + this.mainSplitContainer.SuspendLayout(); + this.tabControl.SuspendLayout(); + this.generalTabPage.SuspendLayout(); + this.historyTabPage.SuspendLayout(); + this.metrology1TabPage.SuspendLayout(); + this.metrology2TabPage.SuspendLayout(); + this.processTabPage.SuspendLayout(); + this.parametersTabPage.SuspendLayout(); + this.SuspendLayout(); + // + // mainSplitContainer + // + resources.ApplyResources(this.mainSplitContainer, "mainSplitContainer"); + this.mainSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.mainSplitContainer.Name = "mainSplitContainer"; + // + // mainSplitContainer.Panel1 + // + this.mainSplitContainer.Panel1.Controls.Add(this.tabControl); + // + // mainSplitContainer.Panel2 + // + this.mainSplitContainer.Panel2.Controls.Add(this.sharedButtons); + // + // tabControl + // + this.tabControl.Controls.Add(this.generalTabPage); + this.tabControl.Controls.Add(this.historyTabPage); + this.tabControl.Controls.Add(this.metrology1TabPage); + this.tabControl.Controls.Add(this.metrology2TabPage); + this.tabControl.Controls.Add(this.processTabPage); + this.tabControl.Controls.Add(this.parametersTabPage); + resources.ApplyResources(this.tabControl, "tabControl"); + this.tabControl.Name = "tabControl"; + this.tabControl.SelectedIndex = 0; + this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged); + // + // generalTabPage + // + this.generalTabPage.Controls.Add(this.fileWriter4ComboBox); + this.generalTabPage.Controls.Add(this.fileWriter3ComboBox); + this.generalTabPage.Controls.Add(this.printer2ComboBox); + this.generalTabPage.Controls.Add(this.fileWriter2ComboBox); + this.generalTabPage.Controls.Add(this.protocolTitleTextBox); + this.generalTabPage.Controls.Add(this.protocolTitleLabel); + this.generalTabPage.Controls.Add(this.metersKindRadioButton2); + this.generalTabPage.Controls.Add(this.metersKindRadioButton1); + this.generalTabPage.Controls.Add(this.transitionEndComboBox); + this.generalTabPage.Controls.Add(this.transitionEndLabel); + this.generalTabPage.Controls.Add(this.transitionStartComboBox); + this.generalTabPage.Controls.Add(this.transitionStartLabel); + this.generalTabPage.Controls.Add(this.fileWriter1ComboBox); + this.generalTabPage.Controls.Add(this.printer1ComboBox); + this.generalTabPage.Controls.Add(this.dataEntryComboBox); + this.generalTabPage.Controls.Add(this.resultsWriterLabel); + this.generalTabPage.Controls.Add(this.resultsPrinterLabel); + this.generalTabPage.Controls.Add(this.dataEntryLabel); + this.generalTabPage.Controls.Add(this.notesTextBox); + this.generalTabPage.Controls.Add(this.label18); + this.generalTabPage.Controls.Add(this.watermetersTextBox); + this.generalTabPage.Controls.Add(this.watermetersLabel); + this.generalTabPage.Controls.Add(this.lastChangedOnTextBox); + this.generalTabPage.Controls.Add(this.label15); + this.generalTabPage.Controls.Add(this.lastChangedByTextBox); + this.generalTabPage.Controls.Add(this.label16); + this.generalTabPage.Controls.Add(this.createdOnTextBox); + this.generalTabPage.Controls.Add(this.label14); + this.generalTabPage.Controls.Add(this.createdByTextBox); + this.generalTabPage.Controls.Add(this.label13); + this.generalTabPage.Controls.Add(this.descriptionTextBox); + this.generalTabPage.Controls.Add(this.label12); + this.generalTabPage.Controls.Add(this.procNameTextBox); + this.generalTabPage.Controls.Add(this.label1); + resources.ApplyResources(this.generalTabPage, "generalTabPage"); + this.generalTabPage.Name = "generalTabPage"; + this.generalTabPage.UseVisualStyleBackColor = true; + // + // fileWriter4ComboBox + // + this.fileWriter4ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.fileWriter4ComboBox, "fileWriter4ComboBox"); + this.fileWriter4ComboBox.Name = "fileWriter4ComboBox"; + // + // fileWriter3ComboBox + // + this.fileWriter3ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.fileWriter3ComboBox, "fileWriter3ComboBox"); + this.fileWriter3ComboBox.Name = "fileWriter3ComboBox"; + // + // printer2ComboBox + // + this.printer2ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.printer2ComboBox, "printer2ComboBox"); + this.printer2ComboBox.Name = "printer2ComboBox"; + // + // fileWriter2ComboBox + // + this.fileWriter2ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.fileWriter2ComboBox, "fileWriter2ComboBox"); + this.fileWriter2ComboBox.Name = "fileWriter2ComboBox"; + // + // protocolTitleTextBox + // + resources.ApplyResources(this.protocolTitleTextBox, "protocolTitleTextBox"); + this.protocolTitleTextBox.Name = "protocolTitleTextBox"; + // + // protocolTitleLabel + // + resources.ApplyResources(this.protocolTitleLabel, "protocolTitleLabel"); + this.protocolTitleLabel.ImageKey = global::TBF.Resources.Strings.Closing_the_tank; + this.protocolTitleLabel.Name = "protocolTitleLabel"; + // + // metersKindRadioButton2 + // + resources.ApplyResources(this.metersKindRadioButton2, "metersKindRadioButton2"); + this.metersKindRadioButton2.Name = "metersKindRadioButton2"; + this.metersKindRadioButton2.TabStop = true; + this.metersKindRadioButton2.UseVisualStyleBackColor = true; + // + // metersKindRadioButton1 + // + resources.ApplyResources(this.metersKindRadioButton1, "metersKindRadioButton1"); + this.metersKindRadioButton1.Name = "metersKindRadioButton1"; + this.metersKindRadioButton1.TabStop = true; + this.metersKindRadioButton1.UseVisualStyleBackColor = true; + // + // transitionEndComboBox + // + this.transitionEndComboBox.FormattingEnabled = true; + resources.ApplyResources(this.transitionEndComboBox, "transitionEndComboBox"); + this.transitionEndComboBox.Name = "transitionEndComboBox"; + // + // transitionEndLabel + // + resources.ApplyResources(this.transitionEndLabel, "transitionEndLabel"); + this.transitionEndLabel.Name = "transitionEndLabel"; + // + // transitionStartComboBox + // + this.transitionStartComboBox.FormattingEnabled = true; + resources.ApplyResources(this.transitionStartComboBox, "transitionStartComboBox"); + this.transitionStartComboBox.Name = "transitionStartComboBox"; + // + // transitionStartLabel + // + resources.ApplyResources(this.transitionStartLabel, "transitionStartLabel"); + this.transitionStartLabel.Name = "transitionStartLabel"; + // + // fileWriter1ComboBox + // + this.fileWriter1ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.fileWriter1ComboBox, "fileWriter1ComboBox"); + this.fileWriter1ComboBox.Name = "fileWriter1ComboBox"; + // + // printer1ComboBox + // + this.printer1ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.printer1ComboBox, "printer1ComboBox"); + this.printer1ComboBox.Name = "printer1ComboBox"; + // + // dataEntryComboBox + // + this.dataEntryComboBox.FormattingEnabled = true; + resources.ApplyResources(this.dataEntryComboBox, "dataEntryComboBox"); + this.dataEntryComboBox.Name = "dataEntryComboBox"; + // + // resultsWriterLabel + // + resources.ApplyResources(this.resultsWriterLabel, "resultsWriterLabel"); + this.resultsWriterLabel.Name = "resultsWriterLabel"; + // + // resultsPrinterLabel + // + resources.ApplyResources(this.resultsPrinterLabel, "resultsPrinterLabel"); + this.resultsPrinterLabel.Name = "resultsPrinterLabel"; + // + // dataEntryLabel + // + resources.ApplyResources(this.dataEntryLabel, "dataEntryLabel"); + this.dataEntryLabel.Name = "dataEntryLabel"; + // + // notesTextBox + // + resources.ApplyResources(this.notesTextBox, "notesTextBox"); + this.notesTextBox.Name = "notesTextBox"; + // + // label18 + // + resources.ApplyResources(this.label18, "label18"); + this.label18.Name = "label18"; + // + // watermetersTextBox + // + resources.ApplyResources(this.watermetersTextBox, "watermetersTextBox"); + this.watermetersTextBox.Name = "watermetersTextBox"; + // + // watermetersLabel + // + resources.ApplyResources(this.watermetersLabel, "watermetersLabel"); + this.watermetersLabel.Name = "watermetersLabel"; + // + // lastChangedOnTextBox + // + resources.ApplyResources(this.lastChangedOnTextBox, "lastChangedOnTextBox"); + this.lastChangedOnTextBox.Name = "lastChangedOnTextBox"; + // + // label15 + // + resources.ApplyResources(this.label15, "label15"); + this.label15.Name = "label15"; + // + // lastChangedByTextBox + // + resources.ApplyResources(this.lastChangedByTextBox, "lastChangedByTextBox"); + this.lastChangedByTextBox.Name = "lastChangedByTextBox"; + // + // label16 + // + resources.ApplyResources(this.label16, "label16"); + this.label16.Name = "label16"; + // + // createdOnTextBox + // + resources.ApplyResources(this.createdOnTextBox, "createdOnTextBox"); + this.createdOnTextBox.Name = "createdOnTextBox"; + // + // label14 + // + resources.ApplyResources(this.label14, "label14"); + this.label14.Name = "label14"; + // + // createdByTextBox + // + resources.ApplyResources(this.createdByTextBox, "createdByTextBox"); + this.createdByTextBox.Name = "createdByTextBox"; + // + // label13 + // + resources.ApplyResources(this.label13, "label13"); + this.label13.Name = "label13"; + // + // descriptionTextBox + // + resources.ApplyResources(this.descriptionTextBox, "descriptionTextBox"); + this.descriptionTextBox.Name = "descriptionTextBox"; + // + // label12 + // + resources.ApplyResources(this.label12, "label12"); + this.label12.Name = "label12"; + // + // procNameTextBox + // + resources.ApplyResources(this.procNameTextBox, "procNameTextBox"); + this.procNameTextBox.Name = "procNameTextBox"; + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // + // historyTabPage + // + this.historyTabPage.Controls.Add(this.historyListViewEx); + resources.ApplyResources(this.historyTabPage, "historyTabPage"); + this.historyTabPage.Name = "historyTabPage"; + this.historyTabPage.UseVisualStyleBackColor = true; + // + // historyListViewEx + // + this.historyListViewEx.AllowColumnReorder = true; + resources.ApplyResources(this.historyListViewEx, "historyListViewEx"); + this.historyListViewEx.DoubleClickActivation = false; + this.historyListViewEx.FullRowSelect = true; + this.historyListViewEx.GridLines = true; + this.historyListViewEx.Name = "historyListViewEx"; + this.historyListViewEx.UseCompatibleStateImageBehavior = false; + this.historyListViewEx.View = System.Windows.Forms.View.Details; + // + // metrology1TabPage + // + this.metrology1TabPage.Controls.Add(this.metrology1ListViewEx); + resources.ApplyResources(this.metrology1TabPage, "metrology1TabPage"); + this.metrology1TabPage.Name = "metrology1TabPage"; + this.metrology1TabPage.UseVisualStyleBackColor = true; + // + // metrology1ListViewEx + // + this.metrology1ListViewEx.AllowColumnReorder = true; + resources.ApplyResources(this.metrology1ListViewEx, "metrology1ListViewEx"); + this.metrology1ListViewEx.DoubleClickActivation = false; + this.metrology1ListViewEx.FullRowSelect = true; + this.metrology1ListViewEx.GridLines = true; + this.metrology1ListViewEx.Name = "metrology1ListViewEx"; + this.metrology1ListViewEx.UseCompatibleStateImageBehavior = false; + this.metrology1ListViewEx.View = System.Windows.Forms.View.Details; + this.metrology1ListViewEx.SelectedIndexChanged += new System.EventHandler(this.metrology1ListViewEx_SelectedIndexChanged); + // + // metrology2TabPage + // + this.metrology2TabPage.Controls.Add(this.metrology2ListViewEx); + resources.ApplyResources(this.metrology2TabPage, "metrology2TabPage"); + this.metrology2TabPage.Name = "metrology2TabPage"; + this.metrology2TabPage.UseVisualStyleBackColor = true; + // + // metrology2ListViewEx + // + this.metrology2ListViewEx.AllowColumnReorder = true; + resources.ApplyResources(this.metrology2ListViewEx, "metrology2ListViewEx"); + this.metrology2ListViewEx.DoubleClickActivation = false; + this.metrology2ListViewEx.FullRowSelect = true; + this.metrology2ListViewEx.GridLines = true; + this.metrology2ListViewEx.Name = "metrology2ListViewEx"; + this.metrology2ListViewEx.UseCompatibleStateImageBehavior = false; + this.metrology2ListViewEx.View = System.Windows.Forms.View.Details; + this.metrology2ListViewEx.SelectedIndexChanged += new System.EventHandler(this.metrology2ListViewEx_SelectedIndexChanged); + // + // processTabPage + // + this.processTabPage.Controls.Add(this.processListViewEx); + resources.ApplyResources(this.processTabPage, "processTabPage"); + this.processTabPage.Name = "processTabPage"; + this.processTabPage.UseVisualStyleBackColor = true; + // + // processListViewEx + // + this.processListViewEx.AllowColumnReorder = true; + resources.ApplyResources(this.processListViewEx, "processListViewEx"); + this.processListViewEx.DoubleClickActivation = false; + this.processListViewEx.FullRowSelect = true; + this.processListViewEx.GridLines = true; + this.processListViewEx.Name = "processListViewEx"; + this.processListViewEx.UseCompatibleStateImageBehavior = false; + this.processListViewEx.View = System.Windows.Forms.View.Details; + this.processListViewEx.SelectedIndexChanged += new System.EventHandler(this.processListViewEx_SelectedIndexChanged); + // + // parametersTabPage + // + this.parametersTabPage.Controls.Add(this.parametersListViewEx); + resources.ApplyResources(this.parametersTabPage, "parametersTabPage"); + this.parametersTabPage.Name = "parametersTabPage"; + this.parametersTabPage.UseVisualStyleBackColor = true; + // + // parametersListViewEx + // + this.parametersListViewEx.AllowColumnReorder = true; + resources.ApplyResources(this.parametersListViewEx, "parametersListViewEx"); + this.parametersListViewEx.DoubleClickActivation = false; + this.parametersListViewEx.FullRowSelect = true; + this.parametersListViewEx.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); } diff --git a/TestBenchFramework/ProcedureDlg.de.resx b/TestBenchFramework/ProcedureDlg.de.resx index 635077b84..a2344e182 100644 --- a/TestBenchFramework/ProcedureDlg.de.resx +++ b/TestBenchFramework/ProcedureDlg.de.resx @@ -118,29 +118,62 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 27, 182 + + 931, 409 - - 77, 17 + + 1034, 409 - - Verbunden + + 923, 371 - - 27, 162 + + Allgemein - + + 148, 335 + + + 148, 312 + + + 148, 243 + + + 148, 289 + + + 148, 105 + + + 526, 20 + + + 20, 108 + + + 428, 162 + + + 65, 17 + + + Verbund + + + 357, 162 + + 53, 17 - + Einzel - 148, 325 + 148, 197 - 24, 330 + 20, 200 62, 13 @@ -149,10 +182,10 @@ Entwässern - 148, 297 + 148, 174 - 24, 302 + 20, 177 45, 13 @@ -160,17 +193,17 @@ Befüllen - - 148, 268 + + 148, 266 - - 148, 239 + + 148, 220 - 148, 211 + 148, 151 - 24, 271 + 20, 269 122, 13 @@ -179,7 +212,7 @@ Speichern auf Festplatte - 24, 242 + 20, 223 45, 13 @@ -188,7 +221,7 @@ Drucker - 24, 214 + 20, 154 112, 13 @@ -197,10 +230,10 @@ Zählernummereingabe - 357, 211 + 357, 195 - 290, 214 + 290, 200 61, 13 @@ -209,13 +242,13 @@ Bemerkung - 148, 138 + 148, 128 526, 20 - 24, 140 + 20, 131 70, 13 @@ -224,10 +257,10 @@ Wasserzellen - 357, 108 + 357, 82 - 300, 111 + 290, 85 38, 13 @@ -236,7 +269,10 @@ Datum - 149, 109 + 148, 82 + + + 20, 85 102, 13 @@ -245,10 +281,10 @@ letzte Änderung von - 357, 79 + 357, 59 - 300, 82 + 290, 62 38, 13 @@ -257,7 +293,10 @@ Datum - 148, 79 + 148, 59 + + + 20, 62 62, 13 @@ -266,13 +305,13 @@ Errstellt von - 148, 49 + 148, 36 526, 20 - 24, 49 + 20, 39 92, 13 @@ -281,7 +320,10 @@ Kurzbeschreibung - 148, 21 + 148, 13 + + + 20, 16 75, 13 @@ -289,31 +331,13 @@ Prüfungsname - - 923, 371 - - - Allgemein - - - Benutzername - - - Datum - - - Kurzbeschreibung - - - 917, 365 - 923, 371 Änderungen - + 917, 365 @@ -322,7 +346,7 @@ Metrologie I. - + 917, 365 @@ -331,7 +355,7 @@ Metrologie II. - + 917, 365 @@ -340,11 +364,14 @@ Prüfstrecke - - 931, 409 + + 917, 365 - - 1034, 409 + + 923, 371 + + + 923, 371 1034, 409 diff --git a/TestBenchFramework/ProcedureDlg.resx b/TestBenchFramework/ProcedureDlg.resx index aaf6ff571..e17138bbf 100644 --- a/TestBenchFramework/ProcedureDlg.resx +++ b/TestBenchFramework/ProcedureDlg.resx @@ -130,7 +130,7 @@ 0, 0 - 139, 335 + 148, 335 121, 21 @@ -151,7 +151,7 @@ 0 - 139, 312 + 148, 312 121, 21 @@ -172,7 +172,7 @@ 1 - 139, 243 + 148, 243 121, 21 @@ -193,7 +193,7 @@ 2 - 139, 289 + 148, 289 121, 21 @@ -214,7 +214,7 @@ 3 - 139, 128 + 148, 128 522, 20 @@ -241,7 +241,7 @@ NoControl - 24, 131 + 20, 131 65, 13 @@ -271,7 +271,7 @@ NoControl - 418, 163 + 427, 163 72, 17 @@ -298,7 +298,7 @@ True - 347, 163 + 356, 163 54, 17 @@ -322,7 +322,7 @@ 7 - 139, 197 + 148, 197 121, 21 @@ -349,7 +349,7 @@ NoControl - 24, 202 + 20, 202 63, 13 @@ -373,7 +373,7 @@ 9 - 139, 174 + 148, 174 121, 21 @@ -400,7 +400,7 @@ NoControl - 24, 177 + 20, 177 71, 13 @@ -424,7 +424,7 @@ 11 - 139, 266 + 148, 266 121, 21 @@ -445,7 +445,7 @@ 12 - 139, 220 + 148, 220 121, 21 @@ -466,7 +466,7 @@ 13 - 139, 151 + 148, 151 121, 21 @@ -493,7 +493,7 @@ NoControl - 24, 271 + 20, 271 70, 13 @@ -523,7 +523,7 @@ NoControl - 24, 225 + 20, 225 42, 13 @@ -553,7 +553,7 @@ NoControl - 25, 154 + 21, 154 57, 13 @@ -577,7 +577,7 @@ 17 - 344, 195 + 353, 195 True @@ -631,7 +631,7 @@ 19 - 139, 105 + 148, 105 522, 20 @@ -658,7 +658,7 @@ NoControl - 24, 108 + 20, 108 94, 13 @@ -682,7 +682,7 @@ 21 - 344, 82 + 353, 82 97, 20 @@ -733,7 +733,7 @@ 23 - 139, 82 + 148, 82 121, 20 @@ -760,7 +760,7 @@ NoControl - 24, 85 + 20, 85 86, 13 @@ -784,7 +784,7 @@ 25 - 344, 59 + 353, 59 97, 20 @@ -835,7 +835,7 @@ 27 - 139, 59 + 148, 59 121, 20 @@ -862,7 +862,7 @@ NoControl - 24, 62 + 20, 62 58, 13 @@ -886,7 +886,7 @@ 29 - 139, 36 + 148, 36 522, 20 @@ -913,7 +913,7 @@ NoControl - 24, 39 + 20, 39 86, 13 @@ -937,7 +937,7 @@ 31 - 139, 13 + 148, 13 217, 20 @@ -964,7 +964,7 @@ NoControl - 24, 16 + 20, 16 85, 13 @@ -1021,7 +1021,7 @@ 3, 3 - 917, 346 + 917, 358 0 @@ -1030,7 +1030,7 @@ historyListViewEx - TBF.UiControls.ListViewEx, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null + TBF.UiControls.ListViewEx, TBF, Version=2.7.283.1, Culture=neutral, PublicKeyToken=null historyTabPage @@ -1045,7 +1045,7 @@ 3, 3, 3, 3 - 923, 352 + 923, 364 1 @@ -1072,7 +1072,7 @@ 3, 3 - 917, 346 + 917, 358 0 @@ -1081,7 +1081,7 @@ metrology1ListViewEx - TBF.UiControls.ListViewEx, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null + TBF.UiControls.ListViewEx, TBF, Version=2.7.283.1, Culture=neutral, PublicKeyToken=null metrology1TabPage @@ -1096,7 +1096,7 @@ 3, 3, 3, 3 - 923, 352 + 923, 364 2 @@ -1123,7 +1123,7 @@ 3, 3 - 917, 346 + 917, 358 0 @@ -1132,7 +1132,7 @@ metrology2ListViewEx - TBF.UiControls.ListViewEx, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null + TBF.UiControls.ListViewEx, TBF, Version=2.7.283.1, Culture=neutral, PublicKeyToken=null metrology2TabPage @@ -1147,7 +1147,7 @@ 3, 3, 3, 3 - 923, 352 + 923, 364 3 @@ -1174,7 +1174,7 @@ 3, 3 - 917, 346 + 917, 358 0 @@ -1183,7 +1183,7 @@ processListViewEx - TBF.UiControls.ListViewEx, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null + TBF.UiControls.ListViewEx, TBF, Version=2.7.283.1, Culture=neutral, PublicKeyToken=null processTabPage @@ -1198,7 +1198,7 @@ 3, 3, 3, 3 - 923, 352 + 923, 364 4 @@ -1225,7 +1225,7 @@ 0, 0 - 923, 352 + 923, 364 0 @@ -1234,7 +1234,7 @@ parametersListViewEx - TBF.UiControls.ListViewEx, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null + TBF.UiControls.ListViewEx, TBF, Version=2.7.283.1, Culture=neutral, PublicKeyToken=null parametersTabPage @@ -1246,7 +1246,7 @@ 4, 34 - 923, 352 + 923, 364 5 @@ -1318,7 +1318,7 @@ sharedButtons - TBF.UiControls.SharedButtons, TBF, Version=2.6.276.1, Culture=neutral, PublicKeyToken=null + TBF.UiControls.SharedButtons, TBF, Version=2.7.283.1, Culture=neutral, PublicKeyToken=null mainSplitContainer.Panel2 diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs index 4c6eb8b19..b5af5ccb8 100644 --- a/TestBenchFramework/Resources/Strings.Designer.cs +++ b/TestBenchFramework/Resources/Strings.Designer.cs @@ -141,6 +141,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Air density [kg/m3]:. + /// + internal static string Air_density_kg_m3_ { + get { + return ResourceManager.GetString("Air_density_kg_m3_", resourceCulture); + } + } + /// /// Looks up a localized string similar to Ambient humidity: . /// @@ -375,6 +384,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Calibration. + /// + internal static string Calibration { + get { + return ResourceManager.GetString("Calibration", resourceCulture); + } + } + /// /// Looks up a localized string similar to Calibration Specialist. /// @@ -690,6 +708,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Date. + /// + internal static string Date { + get { + return ResourceManager.GetString("Date", resourceCulture); + } + } + /// /// Looks up a localized string similar to Date and time: . /// @@ -2355,6 +2382,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Ref. mass density [kg/m3]:. + /// + internal static string Ref_mass_dens_kg_m3_ { + get { + return ResourceManager.GetString("Ref_mass_dens_kg_m3_", resourceCulture); + } + } + /// /// Looks up a localized string similar to Reference. /// @@ -3294,6 +3330,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Valid until. + /// + internal static string Valid_until { + get { + return ResourceManager.GetString("Valid_until", resourceCulture); + } + } + /// /// Looks up a localized string similar to Version. /// diff --git a/TestBenchFramework/Resources/Strings.cs.resx b/TestBenchFramework/Resources/Strings.cs.resx index a7d0360e6..550e65e1e 100644 --- a/TestBenchFramework/Resources/Strings.cs.resx +++ b/TestBenchFramework/Resources/Strings.cs.resx @@ -151,7 +151,7 @@ Okolní tlak: - Teplota okolí: + Okolní teplota: Neošetřená chyba @@ -1161,4 +1161,13 @@ Pokračovat v cyklu po tomto testu? + + Kalibrace + + + Datum + + + Platná do + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx index ca1bcd756..fabc51d62 100644 --- a/TestBenchFramework/Resources/Strings.de.resx +++ b/TestBenchFramework/Resources/Strings.de.resx @@ -1020,4 +1020,31 @@ Kamera + + Luftdichte [kg/m3]: + + + Umgebungsfeuchte: + + + Umgebungsdruck: + + + Umgebungstemperatur: + + + Kalibrierung + + + Datum + + + Datum und Uhrzeit: + + + Referenzmassendichte [kg/m3]: + + + Gültig bis + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx index 469780604..4871d00a5 100644 --- a/TestBenchFramework/Resources/Strings.resx +++ b/TestBenchFramework/Resources/Strings.resx @@ -1249,4 +1249,19 @@ Enter serial numbers at the end + + Air density [kg/m3]: + + + Calibration + + + Date + + + Ref. mass density [kg/m3]: + + + Valid until + \ No newline at end of file diff --git a/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.Designer.cs b/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.Designer.cs index 9338a8206..7a557b415 100644 --- a/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.Designer.cs +++ b/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.Designer.cs @@ -109,7 +109,7 @@ namespace TBF.UiControls this.calibrationGroupBox.Controls.Add(this.calibCertificateNrLabel); this.calibrationGroupBox.Location = new System.Drawing.Point(16, 54); this.calibrationGroupBox.Name = "calibrationGroupBox"; - this.calibrationGroupBox.Size = new System.Drawing.Size(228, 86); + this.calibrationGroupBox.Size = new System.Drawing.Size(208, 86); this.calibrationGroupBox.TabIndex = 6; this.calibrationGroupBox.TabStop = false; this.calibrationGroupBox.Text = "Calibration"; @@ -117,7 +117,7 @@ namespace TBF.UiControls // calibValidDateTextBox // this.calibValidDateTextBox.Enabled = false; - this.calibValidDateTextBox.Location = new System.Drawing.Point(140, 59); + this.calibValidDateTextBox.Location = new System.Drawing.Point(120, 59); this.calibValidDateTextBox.Name = "calibValidDateTextBox"; this.calibValidDateTextBox.Size = new System.Drawing.Size(82, 20); this.calibValidDateTextBox.TabIndex = 15; @@ -134,7 +134,7 @@ namespace TBF.UiControls // calibDateTextBox // this.calibDateTextBox.Enabled = false; - this.calibDateTextBox.Location = new System.Drawing.Point(140, 37); + this.calibDateTextBox.Location = new System.Drawing.Point(120, 37); this.calibDateTextBox.Name = "calibDateTextBox"; this.calibDateTextBox.Size = new System.Drawing.Size(82, 20); this.calibDateTextBox.TabIndex = 13; @@ -151,7 +151,7 @@ namespace TBF.UiControls // calibCertificateNrTextBox // this.calibCertificateNrTextBox.Enabled = false; - this.calibCertificateNrTextBox.Location = new System.Drawing.Point(140, 15); + this.calibCertificateNrTextBox.Location = new System.Drawing.Point(120, 15); this.calibCertificateNrTextBox.Name = "calibCertificateNrTextBox"; this.calibCertificateNrTextBox.Size = new System.Drawing.Size(82, 20); this.calibCertificateNrTextBox.TabIndex = 11; @@ -161,9 +161,9 @@ namespace TBF.UiControls this.calibCertificateNrLabel.AutoSize = true; this.calibCertificateNrLabel.Location = new System.Drawing.Point(17, 18); this.calibCertificateNrLabel.Name = "calibCertificateNrLabel"; - this.calibCertificateNrLabel.Size = new System.Drawing.Size(69, 13); + this.calibCertificateNrLabel.Size = new System.Drawing.Size(54, 13); this.calibCertificateNrLabel.TabIndex = 10; - this.calibCertificateNrLabel.Text = "Certificate nr."; + this.calibCertificateNrLabel.Text = "Certificate"; // // buoancyGroupBox // @@ -177,9 +177,9 @@ namespace TBF.UiControls this.buoancyGroupBox.Controls.Add(this.buoyancyHumiLabel); this.buoancyGroupBox.Controls.Add(this.buoyancyPressLabel); this.buoancyGroupBox.Controls.Add(this.buoyancyTempLabel); - this.buoancyGroupBox.Location = new System.Drawing.Point(255, 10); + this.buoancyGroupBox.Location = new System.Drawing.Point(233, 10); this.buoancyGroupBox.Name = "buoancyGroupBox"; - this.buoancyGroupBox.Size = new System.Drawing.Size(228, 130); + this.buoancyGroupBox.Size = new System.Drawing.Size(248, 130); this.buoancyGroupBox.TabIndex = 5; this.buoancyGroupBox.TabStop = false; this.buoancyGroupBox.Text = "Buoyancy"; @@ -187,7 +187,7 @@ namespace TBF.UiControls // weightStandardDensityTextBox // this.weightStandardDensityTextBox.Enabled = false; - this.weightStandardDensityTextBox.Location = new System.Drawing.Point(140, 103); + this.weightStandardDensityTextBox.Location = new System.Drawing.Point(160, 103); this.weightStandardDensityTextBox.Name = "weightStandardDensityTextBox"; this.weightStandardDensityTextBox.Size = new System.Drawing.Size(82, 20); this.weightStandardDensityTextBox.TabIndex = 9; @@ -197,14 +197,14 @@ namespace TBF.UiControls this.weightStandardDensityLabel.AutoSize = true; this.weightStandardDensityLabel.Location = new System.Drawing.Point(17, 106); this.weightStandardDensityLabel.Name = "weightStandardDensityLabel"; - this.weightStandardDensityLabel.Size = new System.Drawing.Size(119, 13); + this.weightStandardDensityLabel.Size = new System.Drawing.Size(133, 13); this.weightStandardDensityLabel.TabIndex = 8; - this.weightStandardDensityLabel.Text = "Standard dens. [kg/m3]"; + this.weightStandardDensityLabel.Text = "Ref. mass density [kg/m3]:"; // // airDensityTextBox // this.airDensityTextBox.Enabled = false; - this.airDensityTextBox.Location = new System.Drawing.Point(140, 81); + this.airDensityTextBox.Location = new System.Drawing.Point(160, 81); this.airDensityTextBox.Name = "airDensityTextBox"; this.airDensityTextBox.Size = new System.Drawing.Size(82, 20); this.airDensityTextBox.TabIndex = 7; @@ -221,7 +221,7 @@ namespace TBF.UiControls // buoyancyHumiTextBox // this.buoyancyHumiTextBox.Enabled = false; - this.buoyancyHumiTextBox.Location = new System.Drawing.Point(140, 59); + this.buoyancyHumiTextBox.Location = new System.Drawing.Point(160, 59); this.buoyancyHumiTextBox.Name = "buoyancyHumiTextBox"; this.buoyancyHumiTextBox.Size = new System.Drawing.Size(82, 20); this.buoyancyHumiTextBox.TabIndex = 5; @@ -229,7 +229,7 @@ namespace TBF.UiControls // buoyancyPressTextBox // this.buoyancyPressTextBox.Enabled = false; - this.buoyancyPressTextBox.Location = new System.Drawing.Point(140, 37); + this.buoyancyPressTextBox.Location = new System.Drawing.Point(160, 37); this.buoyancyPressTextBox.Name = "buoyancyPressTextBox"; this.buoyancyPressTextBox.Size = new System.Drawing.Size(82, 20); this.buoyancyPressTextBox.TabIndex = 4; @@ -237,7 +237,7 @@ namespace TBF.UiControls // buoyancyTempTextBox // this.buoyancyTempTextBox.Enabled = false; - this.buoyancyTempTextBox.Location = new System.Drawing.Point(140, 15); + this.buoyancyTempTextBox.Location = new System.Drawing.Point(160, 15); this.buoyancyTempTextBox.Name = "buoyancyTempTextBox"; this.buoyancyTempTextBox.Size = new System.Drawing.Size(82, 20); this.buoyancyTempTextBox.TabIndex = 3; @@ -274,7 +274,7 @@ namespace TBF.UiControls this.nameGroupBox.Controls.Add(this.cmpntNameLabel); this.nameGroupBox.Location = new System.Drawing.Point(16, 10); this.nameGroupBox.Name = "nameGroupBox"; - this.nameGroupBox.Size = new System.Drawing.Size(228, 40); + this.nameGroupBox.Size = new System.Drawing.Size(208, 40); this.nameGroupBox.TabIndex = 4; this.nameGroupBox.TabStop = false; this.nameGroupBox.Text = "Component"; diff --git a/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.cs b/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.cs index 1e8449bd7..b1ca4b7be 100644 --- a/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.cs +++ b/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.cs @@ -84,13 +84,19 @@ namespace TBF.UiControls void Localize() { + nameGroupBox.Text = Strings.Component; + + calibrationGroupBox.Text = Strings.Calibration; + calibCertificateNrLabel.Text = Strings.Certificate; + calibDateLabel.Text = Strings.Date; + calibValidDateLabel.Text = Strings.Valid_until; + buoyancyTempLabel.Text = Strings.Ambient_temperature_; buoyancyPressLabel.Text = Strings.Ambient_pressure_; buoyancyHumiLabel.Text = Strings.Ambient_humidity_; - /// airDensityLabel.Text = - /// weightStandardDensityLabel = + airDensityLabel.Text = Strings.Air_density_kg_m3_; + weightStandardDensityLabel.Text = Strings.Ref_mass_dens_kg_m3_; - nameGroupBox.Text = Strings.Component; testGroupBox.Text = Strings.Test_measured_corrected; measuredLabel.Text = Strings.Measured; correctedLabel.Text = Strings.Corrected; diff --git a/TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.cs b/TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.cs index 91b6eb9dc..8a38361e9 100644 --- a/TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.cs +++ b/TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.cs @@ -88,6 +88,12 @@ namespace TBF.UiControls void Localize() { nameGroupBox.Text = Strings.Component; + + calibrationGroupBox.Text = Strings.Calibration; + calibCertificateNrLabel.Text = Strings.Certificate; + calibDateLabel.Text = Strings.Date; + calibValidDateLabel.Text = Strings.Valid_until; + testGroupBox.Text = Strings.Test_measured_corrected; measuredLabel.Text = Strings.Measured; correctedLabel.Text = Strings.Corrected;