From 3fb487b67b723bd60c312110a8021e2f6bcf6e35 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 21 Sep 2017 14:04:31 +0200 Subject: [PATCH] (1) E9,E10,E15,E16 implemented, (2)Zapiska: Each WM is in one table row, (3) TableRowNr,TableColumnNr,WMRemark added to RsltItems --- Results/Entities/TestRslt.cs | 4 +- Results/ItemID.cs | 4 + .../Printers/Zapiska/ZapiskaPrintDocument.cs | 154 ++- .../Printers/Zapiska/ZapiskaPrinterCfg.cs | 2 +- Results/WMeterRsltItemSpec.cs | 8 + .../GenericDevices/IErrorFlags.cs | 9 +- .../Output/Printers/Zapiska/Printer.cs | 2 +- .../Zapiska/PrinterCfgCtrl.Designer.cs | 928 +++++++++--------- .../TestMethods/Adjustment/AdjustmentSeq.cs | 4 +- .../CombinedWithDetectionSeq.cs | 11 +- .../TestMethods/Endurance/EnduranceSeq.cs | 3 +- .../FixedStartAdvancedSeq.cs | 5 +- .../FixedStartMassCollectionSeq.cs | 5 +- .../TestMethods/FlyingStart/FlyingStartSeq.cs | 4 +- .../FlyingStartMassCollectionSeq.cs | 11 +- .../ReferenceFlowmeterCalibrationSeq.cs | 11 +- .../BenchControl/Various/ErrorFlags/Errors.cs | 124 ++- .../Various/ErrorFlags/ErrorsCfg.cs | 3 + .../Various/ErrorFlags/ErrorsCfgCtrl.cs | 26 +- .../ErrorFlags/ErrorsCfgCtrl.designer.cs | 209 ++-- 20 files changed, 874 insertions(+), 653 deletions(-) diff --git a/Results/Entities/TestRslt.cs b/Results/Entities/TestRslt.cs index 99ee9a1a6..eb1be2171 100644 --- a/Results/Entities/TestRslt.cs +++ b/Results/Entities/TestRslt.cs @@ -119,7 +119,9 @@ namespace Results.Entities public virtual double ErrLimLo() { return TestData.ErrLimLo; } public virtual double ErrLimHi() { return TestData.ErrLimHi; } public virtual double Uncertainty() { return TestData.Uncertainty; } - public virtual bool Evaluate() { return TestData.Evaluate; } + public virtual float TempLimLo() { return TestData.TempLimLo; } + public virtual float TempLimHi() { return TestData.TempLimHi; } + public virtual bool Evaluate() { return TestData.Evaluate; } public virtual Config.Entities.Publish Publish() { return (Config.Entities.Publish)TestData.Publish; } diff --git a/Results/ItemID.cs b/Results/ItemID.cs index f3c745eb2..95c2df652 100644 --- a/Results/ItemID.cs +++ b/Results/ItemID.cs @@ -167,6 +167,10 @@ namespace Results E15, /// 149 E16, /// 150 + TableRowNr, /// 151 + TableColumnNr, /// 152 + WMRemark, + Count, } } diff --git a/Results/Output/Printers/Zapiska/ZapiskaPrintDocument.cs b/Results/Output/Printers/Zapiska/ZapiskaPrintDocument.cs index 94dc4ea3d..4998d0eb4 100644 --- a/Results/Output/Printers/Zapiska/ZapiskaPrintDocument.cs +++ b/Results/Output/Printers/Zapiska/ZapiskaPrintDocument.cs @@ -7,12 +7,15 @@ using System.Drawing; using System.Drawing.Printing; using System.IO; using Config.Entities; +using Results; using Results.Resources; namespace Results.Output.Printers.Zapiska { public class ZapiskaPrintDocument : PrintDocument { + const int GapBetweenCommonColumns = 10; + /// Size of the printed area without margins, after taking into account 'pageOrientation' readonly int printHeight; readonly int printWidth; @@ -22,8 +25,6 @@ namespace Results.Output.Printers.Zapiska readonly int leftMargin; readonly int leftMargin2; readonly int leftMargin3; - readonly int TitleX; - readonly int TitleY; /// Depends on the size of the header readonly int SpacingOne; readonly int SpacingOneAndHalf; @@ -57,15 +58,14 @@ namespace Results.Output.Printers.Zapiska IList commonItems1; IList commonItems2; IList commonItems3; - IList testItems; + IList selectedItems; string footer; /// /// Layout and status /// - int nrWMsOnFirstPage; - int nrWMsOnNextPage; - int nextWMNr; /// nr. of watermeter to be printed as the first one on the next page + int tablesOnFirstPage; + int tablesOnNextPage; int nrPages; int pageNr; /// Page number to be printed at the bottom of the page @@ -87,7 +87,7 @@ namespace Results.Output.Printers.Zapiska commonItems1 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems1); commonItems2 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems2); commonItems3 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems3); - testItems = Results.WMeterRsltItemSpec.FromStrArray(cfg.TestItems); /// TestID info will be overwritten later on + selectedItems = Results.WMeterRsltItemSpec.FromStrArray(cfg.SelectedItems); footer = string.IsNullOrEmpty(cfg.Footer) ? string.Empty : cfg.Footer.Replace("~", Environment.NewLine); /// Initialize fonts @@ -117,37 +117,32 @@ namespace Results.Output.Printers.Zapiska SpacingOne4Header = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", headerFont).Height; SpacingOneAndHalf4Header = (3 * SpacingOne4Header) / 2; - /// Calculate the tests count - int testsCount = 0; - if (batch.WaterMeters.Count > 0) - { - foreach (var mtr in batch.WaterMeters[0].MeterTestRslts) - { - if (mtr.Publish() == Config.Entities.Publish.Always && mtr.IsPilotRslt()) testsCount++; - } - } + /// Calculate the table rows count + int tableRowsCount = batch.WaterMeters.Count; /// Prepare document outline - TitleX = cfg.LeftMargin; - TitleY = cfg.TopMargin; - titleHeight = System.Windows.Forms.TextRenderer.MeasureText(header, titleFont).Height; - CommonTop = TitleY + titleHeight + SpacingOne4Header; + CommonTop = cfg.TopMargin + titleHeight + SpacingOne4Header; int commonCount = Math.Max(commonItems1.Count, Math.Max(commonItems2.Count, commonItems3.Count)); commonHeight = commonCount * SpacingOne; BodyTop = CommonTop + commonHeight + SpacingOne4Header; - int wmSectionHeight = (testsCount + 1) * SpacingOne + 3 * SpacingOne4Header; + int wmSectionHeight = (tableRowsCount + 1) * SpacingOne + 3 * SpacingOne4Header; - nrWMsOnFirstPage = (printHeight - BodyTop + TitleY - 2 * SpacingOne) / wmSectionHeight; - nrWMsOnNextPage = (printHeight - 2 * SpacingOne) / wmSectionHeight; - nrWMsOnNextPage = Math.Max(nrWMsOnNextPage, 1); /// Prevent division by zero if there are too many WM tests + tablesOnFirstPage = (printHeight - BodyTop + cfg.TopMargin - 2 * SpacingOne) / wmSectionHeight; + tablesOnNextPage = Math.Max((printHeight - 2 * SpacingOne) / wmSectionHeight, 1); /// Min. 1, prevent division by zero - nrPages = 1 + (batch.WaterMeters.Count - nrWMsOnFirstPage + nrWMsOnNextPage - 1) / nrWMsOnNextPage; + if (tablesOnFirstPage >= 1) + { + nrPages = 1; + } + else + { + nrPages = 2; + } pageNr = 1; - nextWMNr = 0; } /// @@ -184,7 +179,9 @@ namespace Results.Output.Printers.Zapiska ///---------- /// Title ///---------- - RectangleF printArea = new RectangleF(TitleX, TitleY, printWidth, titleHeight); + int titleWid = (int)(e.Graphics.MeasureString(header, titleFont).Width + 1); + RectangleF printArea = new RectangleF(cfg.LeftMargin + Math.Max(0, (printWidth - titleWid)) / 2, cfg.TopMargin, + titleWid, titleHeight); e.Graphics.DrawString(header, titleFont, Brushes.Black, printArea); ///---------------- @@ -227,7 +224,7 @@ namespace Results.Output.Printers.Zapiska for (int i = 0; i < Math.Min(leftColumn.Length, rightColumn.Length); i++) { PrintAt(e, lMargin, CommonTop + SpacingOne * i, leftColumn[i]); - PrintAt(e, lMargin + leftColWidth + 30, CommonTop + SpacingOne * i, rightColumn[i]); + PrintAt(e, lMargin + leftColWidth + GapBetweenCommonColumns, CommonTop + SpacingOne * i, rightColumn[i]); } } } @@ -238,18 +235,14 @@ namespace Results.Output.Printers.Zapiska /// This variable represents the top coordinate of the area where WM results are printed /// and it is updated (increased by) the value returned by PrintXyzWM() - the section size. - int nextWmTop = (pageNr == 1) ? BodyTop : TitleY; + int nextWmTop = (pageNr == 1) ? BodyTop : cfg.TopMargin; - int nrWMsOnPage = (pageNr == 1) ? nrWMsOnFirstPage : nrWMsOnNextPage; + if (tablesOnFirstPage > 0 || pageNr == 2) + { + PrintWMs(e, batch.WaterMeters, nextWmTop); + } - for (int wmNr = nextWMNr; wmNr < Math.Min(nextWMNr + nrWMsOnPage, batch.WaterMeters.Count); wmNr++) /// wmNr is 0-based - { - int wmPosition = true ? batch.WaterMeters[wmNr].WMPosition : (wmNr + 1); - nextWmTop += PrintWM(e, batch.WaterMeters[wmNr], wmPosition, nextWmTop); - } - - nextWMNr += nrWMsOnPage; - e.HasMorePages = (nextWMNr < batch.WaterMeters.Count); + e.HasMorePages = (nrPages > 1) && (pageNr == 1); ///---------- /// Footer @@ -270,85 +263,76 @@ namespace Results.Output.Printers.Zapiska /// Number of the water meter printed /// Top coordinate of watermeter data /// The height of the printed section - int PrintWM(System.Drawing.Printing.PrintPageEventArgs e, - Results.Entities.WaterMeter wm, int printedWMNr, int top) + int PrintWMs(System.Drawing.Printing.PrintPageEventArgs e, + IList wms, int top) { - /// Determin column widths - float[] columnPos = new float[testItems.Count + 1]; + /// Determine column widths + WMeterRsltItemSpec.TableRowNr = 99; + WMeterRsltItemSpec.TableColumnNr = 99; + float[] columnPos = new float[selectedItems.Count + 1]; columnPos[0] = (float)leftMargin; - for (int i = 0; i < testItems.Count; i++) + for (int i = 0; i < selectedItems.Count; i++) { - float columnWidth = e.Graphics.MeasureString(testItems[i].Caption, headerFont).Width; - foreach (var mtr in wm.MeterTestRslts) + float columnWidth = e.Graphics.MeasureString(selectedItems[i].Caption, headerFont).Width; + foreach (var wm in wms) { - if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always) - { - string itemText = testItems[i].Print(wm, mtr.Name()); + string itemText = selectedItems[i].Print(wm); - /// Strip color information - string[] texts = itemText.Split(new char[] { '|' }); - if (texts.Length == 2) { itemText = texts[0]; } + /// Strip color information + string[] texts = itemText.Split(new char[] { '|' }); + if (texts.Length == 2) { itemText = texts[0]; } - float width = e.Graphics.MeasureString(itemText, font).Width; - if (width > columnWidth) columnWidth = width; - } + float width = e.Graphics.MeasureString(itemText, font).Width; + if (width > columnWidth) columnWidth = width; } columnPos[i + 1] = columnPos[i] + columnWidth + 20.0f; } int tableLeftX = (int)columnPos[0]; - int tableRightX = (int)columnPos[testItems.Count] - 20; - - string wmText = string.Format("{0} {1}", Strings.Water_Meter, printedWMNr); - PrintHeaderAt(e, leftMargin, top, wmText); - if (!string.IsNullOrEmpty(wm.SerialNr)) - { - PrintHeaderAt(e, leftMargin + (int)e.Graphics.MeasureString(wmText, headerFont).Width, top, - string.Format(" {0} = {1}", Strings.sn, wm.SerialNr)); - } + int tableRightX = (int)columnPos[selectedItems.Count] - 20; /// Horizontal line int horY = top + SpacingOneAndHalf4Header; e.Graphics.DrawLine(new Pen(Color.Black, 2), new Point(tableLeftX, horY), new Point(tableRightX, horY)); - for (int i = 0; i < testItems.Count; i++) + for (int i = 0; i < selectedItems.Count; i++) { - PrintHeaderAt(e, (int)columnPos[i], top + (int)(1.6 * SpacingOne4Header), testItems[i].Caption); + PrintHeaderAt(e, (int)columnPos[i], top + (int)(1.6 * SpacingOne4Header), selectedItems[i].Caption); } /// Horizontal line horY = top + (int)(2.8 * SpacingOne4Header); e.Graphics.DrawLine(new Pen(Color.Black, 2), new Point(tableLeftX, horY), new Point(tableRightX, horY)); - int testsCount = 0; - foreach (var mtr in wm.MeterTestRslts) - { - if ((mtr != null) && (mtr.Publish() == Config.Entities.Publish.Always)) + int rowsCount = 0; + foreach (var wm in wms) + { + WMeterRsltItemSpec.TableRowNr = ++rowsCount; + + for (int i = 0; i < selectedItems.Count; i++) { - testsCount++; - for (int i = 0; i < testItems.Count; i++) + WMeterRsltItemSpec.TableColumnNr = i + 1; + + string itemText = selectedItems[i].Print(wm); + + /// Strip color information + string[] texts = itemText.Split(new char[] { '|' }); + if (texts.Length == 2) { - string itemText = testItems[i].Print(wm, mtr.Name()); - - /// Strip color information - string[] texts = itemText.Split(new char[] { '|' }); - if (texts.Length == 2) - { - itemText = texts[0]; - Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White); - /// TODO: How to print colors? - } - - PrintAt(e, (int)columnPos[i], top + 2 * SpacingOne4Header + SpacingOne * testsCount, itemText); + itemText = texts[0]; + Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White); + /// TODO: How to print colors? } + + PrintAt(e, (int)columnPos[i], top + 2 * SpacingOne4Header + SpacingOne * rowsCount, itemText); } } /// Horizontal line - horY = top + 2 * SpacingOneAndHalf4Header + SpacingOne * testsCount; + horY = top + 2 * SpacingOneAndHalf4Header + SpacingOne * rowsCount; e.Graphics.DrawLine(new Pen(Color.Black, 2), new Point(tableLeftX, horY), new Point(tableRightX, horY)); - return (testsCount + 1) * SpacingOne + 3 * SpacingOne4Header; + return (rowsCount + 1) * SpacingOne + 3 * SpacingOne4Header; } diff --git a/Results/Output/Printers/Zapiska/ZapiskaPrinterCfg.cs b/Results/Output/Printers/Zapiska/ZapiskaPrinterCfg.cs index edd5f5646..7612ff978 100644 --- a/Results/Output/Printers/Zapiska/ZapiskaPrinterCfg.cs +++ b/Results/Output/Printers/Zapiska/ZapiskaPrinterCfg.cs @@ -30,7 +30,7 @@ namespace Results.Output.Printers.Zapiska public string[] CommonItems1; public string[] CommonItems2; public string[] CommonItems3; - public string[] TestItems; + public string[] SelectedItems; public string Header; /// =Title public string Footer; } diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs index dbbc28a0a..19693e16e 100644 --- a/Results/WMeterRsltItemSpec.cs +++ b/Results/WMeterRsltItemSpec.cs @@ -363,8 +363,16 @@ namespace Results AllItems.Add(new WMeterRsltItemSpec(ItemID.E14, "E14 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x2000) != 0) ? Strings.Yes : Strings.No)); AllItems.Add(new WMeterRsltItemSpec(ItemID.E15, "E15 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x4000) != 0) ? Strings.Yes : Strings.No)); AllItems.Add(new WMeterRsltItemSpec(ItemID.E16, "E16 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x8000) != 0) ? Strings.Yes : Strings.No)); + + AllItems.Add(new WMeterRsltItemSpec(ItemID.TableRowNr, "Table row #", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? TableRowNr.ToString() : string.Format(f, TableRowNr))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.TableColumnNr, "Table column #", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? TableColumnNr.ToString() : string.Format(f, TableColumnNr))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.WMRemark, string.Format("{0} {1}", Strings.Water_Meter, Strings.Remark), Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => w.Remark)); } + /// To be updated by Output.FileWriter or Output.Printer + public static int TableRowNr; + public static int TableColumnNr; + /// /// Converts a list of 'Output item specifications' to a string array /// diff --git a/TestBenchFramework/BenchControl/GenericDevices/IErrorFlags.cs b/TestBenchFramework/BenchControl/GenericDevices/IErrorFlags.cs index 859f10ce4..a770a9138 100644 --- a/TestBenchFramework/BenchControl/GenericDevices/IErrorFlags.cs +++ b/TestBenchFramework/BenchControl/GenericDevices/IErrorFlags.cs @@ -1,7 +1,10 @@ /// /// Copyright (c) 2017 Sensus Metering Systems /// +using System; +using System.Collections.Generic; using TBF.BenchControl.Generic; +using Results.Entities; namespace TBF.BenchControl.GenericDevices { @@ -9,6 +12,10 @@ namespace TBF.BenchControl.GenericDevices { Config.Entities.ErrorFlagsMode Mode { get; } - int GetErrorFlags(Config.Entities.Test test, double testTime); + int GetErrorFlags(TestRslt testRslt, bool getE9E10, bool getE11E12, int switchTimeStart, int switchTimeEnd); + + int GetE15(IList meterTestRslts); /// Return value is either 0 (=OK) or 0x4000 (=E15), it should be OR-ed with error flags + + int GetE16(IList meterTestRslts); /// Return value is either 0 (=OK) or 0x8000 (=E16), it should be OR-ed with error flags } } diff --git a/TestBenchFramework/BenchControl/Output/Printers/Zapiska/Printer.cs b/TestBenchFramework/BenchControl/Output/Printers/Zapiska/Printer.cs index 41a9c580e..ff0fc4cfb 100644 --- a/TestBenchFramework/BenchControl/Output/Printers/Zapiska/Printer.cs +++ b/TestBenchFramework/BenchControl/Output/Printers/Zapiska/Printer.cs @@ -188,7 +188,7 @@ namespace TBF.BenchControl.Output.Printers.Zapiska CommonItems1 = printerCfg.CommonItems1, CommonItems2 = printerCfg.CommonItems2, CommonItems3 = printerCfg.CommonItems3, - TestItems = printerCfg.SelectedItems, + SelectedItems = printerCfg.SelectedItems, Footer = printerCfg.Footer, }; diff --git a/TestBenchFramework/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.Designer.cs b/TestBenchFramework/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.Designer.cs index cd94e07cd..8d29c51b8 100644 --- a/TestBenchFramework/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.Designer.cs +++ b/TestBenchFramework/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.Designer.cs @@ -31,470 +31,470 @@ namespace TBF.BenchControl.Output.Printers.Zapiska /// private void InitializeComponent() { - this.nameTextBox = new System.Windows.Forms.TextBox(); - this.nameLabel = new System.Windows.Forms.Label(); - this.classNameLabel = new System.Windows.Forms.Label(); - this.supressPrintingCheckBox = new System.Windows.Forms.CheckBox(); - this.orientationLabel = new System.Windows.Forms.Label(); - this.orientationComboBox = new System.Windows.Forms.ComboBox(); - this.topMarginTextBox = new System.Windows.Forms.TextBox(); - this.topMarginLabel = new System.Windows.Forms.Label(); - this.leftMarginTextBox = new System.Windows.Forms.TextBox(); - this.bottomMarginTextBox = new System.Windows.Forms.TextBox(); - this.cultureComboBox = new System.Windows.Forms.ComboBox(); - this.cultureLabel = new System.Windows.Forms.Label(); - this.commonItems1Button = new System.Windows.Forms.Button(); - this.footerButton = new System.Windows.Forms.Button(); - this.headerButton = new System.Windows.Forms.Button(); - this.testItemsButton = new System.Windows.Forms.Button(); - this.headerFontLabel = new System.Windows.Forms.Label(); - this.titleFontLabel = new System.Windows.Forms.Label(); - this.titleFontFamilyComboBox = new System.Windows.Forms.ComboBox(); - this.headerFontFamilyComboBox = new System.Windows.Forms.ComboBox(); - this.bodyFontFamilyComboBox = new System.Windows.Forms.ComboBox(); - this.bodyFontLabel = new System.Windows.Forms.Label(); - this.titleFontSizeTextBox = new System.Windows.Forms.TextBox(); - this.headerFontSizeTextBox = new System.Windows.Forms.TextBox(); - this.bodyFontSizeTextBox = new System.Windows.Forms.TextBox(); - this.titleBoldCheckBox = new System.Windows.Forms.CheckBox(); - this.titleItalicCheckBox = new System.Windows.Forms.CheckBox(); - this.headerItalicCheckBox = new System.Windows.Forms.CheckBox(); - this.headerBoldCheckBox = new System.Windows.Forms.CheckBox(); - this.bodyItalicCheckBox = new System.Windows.Forms.CheckBox(); - this.bodyBoldCheckBox = new System.Windows.Forms.CheckBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.commonItems2Button = new System.Windows.Forms.Button(); - this.commonItems3Button = new System.Windows.Forms.Button(); - this.colW2TextBox = new System.Windows.Forms.TextBox(); - this.colW1TextBox = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // nameTextBox - // - this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(142, 40); - this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(218, 20); - this.nameTextBox.TabIndex = 2; - // - // nameLabel - // - this.nameLabel.AutoSize = true; - this.nameLabel.Location = new System.Drawing.Point(16, 43); - this.nameLabel.Name = "nameLabel"; - this.nameLabel.Size = new System.Drawing.Size(35, 13); - this.nameLabel.TabIndex = 1; - this.nameLabel.Text = "Name"; - // - // classNameLabel - // - this.classNameLabel.AutoSize = true; - this.classNameLabel.Location = new System.Drawing.Point(139, 16); - this.classNameLabel.Name = "classNameLabel"; - this.classNameLabel.Size = new System.Drawing.Size(83, 13); - this.classNameLabel.TabIndex = 0; - this.classNameLabel.Text = "ComonentName"; - // - // supressPrintingCheckBox - // - this.supressPrintingCheckBox.AutoSize = true; - this.supressPrintingCheckBox.Enabled = false; - this.supressPrintingCheckBox.Location = new System.Drawing.Point(19, 313); - this.supressPrintingCheckBox.Name = "supressPrintingCheckBox"; - this.supressPrintingCheckBox.Size = new System.Drawing.Size(101, 17); - this.supressPrintingCheckBox.TabIndex = 38; - this.supressPrintingCheckBox.Text = "Supress printing"; - this.supressPrintingCheckBox.UseVisualStyleBackColor = true; - // - // orientationLabel - // - this.orientationLabel.AutoSize = true; - this.orientationLabel.Location = new System.Drawing.Point(16, 67); - this.orientationLabel.Name = "orientationLabel"; - this.orientationLabel.Size = new System.Drawing.Size(84, 13); - this.orientationLabel.TabIndex = 3; - this.orientationLabel.Text = "Page orientation"; - // - // orientationComboBox - // - this.orientationComboBox.Enabled = false; - this.orientationComboBox.FormattingEnabled = true; - this.orientationComboBox.Location = new System.Drawing.Point(142, 64); - this.orientationComboBox.Name = "orientationComboBox"; - this.orientationComboBox.Size = new System.Drawing.Size(218, 21); - this.orientationComboBox.TabIndex = 4; - // - // topMarginTextBox - // - this.topMarginTextBox.Enabled = false; - this.topMarginTextBox.Location = new System.Drawing.Point(142, 89); - this.topMarginTextBox.Name = "topMarginTextBox"; - this.topMarginTextBox.Size = new System.Drawing.Size(44, 20); - this.topMarginTextBox.TabIndex = 6; - // - // topMarginLabel - // - this.topMarginLabel.AutoSize = true; - this.topMarginLabel.Location = new System.Drawing.Point(16, 92); - this.topMarginLabel.Name = "topMarginLabel"; - this.topMarginLabel.Size = new System.Drawing.Size(116, 13); - this.topMarginLabel.TabIndex = 5; - this.topMarginLabel.Text = "Top/bottom/left margin"; - // - // leftMarginTextBox - // - this.leftMarginTextBox.Enabled = false; - this.leftMarginTextBox.Location = new System.Drawing.Point(244, 89); - this.leftMarginTextBox.Name = "leftMarginTextBox"; - this.leftMarginTextBox.Size = new System.Drawing.Size(44, 20); - this.leftMarginTextBox.TabIndex = 8; - // - // bottomMarginTextBox - // - this.bottomMarginTextBox.Enabled = false; - this.bottomMarginTextBox.Location = new System.Drawing.Point(193, 89); - this.bottomMarginTextBox.Name = "bottomMarginTextBox"; - this.bottomMarginTextBox.Size = new System.Drawing.Size(44, 20); - this.bottomMarginTextBox.TabIndex = 7; - // - // cultureComboBox - // - this.cultureComboBox.Enabled = false; - this.cultureComboBox.FormattingEnabled = true; - this.cultureComboBox.Location = new System.Drawing.Point(142, 185); - this.cultureComboBox.Name = "cultureComboBox"; - this.cultureComboBox.Size = new System.Drawing.Size(218, 21); - this.cultureComboBox.TabIndex = 26; - // - // cultureLabel - // - this.cultureLabel.AutoSize = true; - this.cultureLabel.Location = new System.Drawing.Point(16, 188); - this.cultureLabel.Name = "cultureLabel"; - this.cultureLabel.Size = new System.Drawing.Size(42, 13); - this.cultureLabel.TabIndex = 25; - this.cultureLabel.Text = "Cullture"; - // - // commonItems1Button - // - this.commonItems1Button.Enabled = false; - this.commonItems1Button.Location = new System.Drawing.Point(142, 259); - this.commonItems1Button.Name = "commonItems1Button"; - this.commonItems1Button.Size = new System.Drawing.Size(70, 23); - this.commonItems1Button.TabIndex = 33; - this.commonItems1Button.Text = "Common 1"; - this.commonItems1Button.UseVisualStyleBackColor = true; - this.commonItems1Button.Click += new System.EventHandler(this.commonItems1Button_Click); - // - // footerButton - // - this.footerButton.Enabled = false; - this.footerButton.Location = new System.Drawing.Point(142, 309); - this.footerButton.Name = "footerButton"; - this.footerButton.Size = new System.Drawing.Size(218, 23); - this.footerButton.TabIndex = 37; - this.footerButton.Text = "Footer"; - this.footerButton.UseVisualStyleBackColor = true; - this.footerButton.Click += new System.EventHandler(this.footerButton_Click); - // - // headerButton - // - this.headerButton.Enabled = false; - this.headerButton.Location = new System.Drawing.Point(142, 209); - this.headerButton.Name = "headerButton"; - this.headerButton.Size = new System.Drawing.Size(218, 23); - this.headerButton.TabIndex = 27; - this.headerButton.Text = "Title"; - this.headerButton.UseVisualStyleBackColor = true; - this.headerButton.Click += new System.EventHandler(this.headerButton_Click); - // - // testItemsButton - // - this.testItemsButton.Enabled = false; - this.testItemsButton.Location = new System.Drawing.Point(142, 284); - this.testItemsButton.Name = "testItemsButton"; - this.testItemsButton.Size = new System.Drawing.Size(218, 23); - this.testItemsButton.TabIndex = 36; - this.testItemsButton.Text = "Test items"; - this.testItemsButton.UseVisualStyleBackColor = true; - this.testItemsButton.Click += new System.EventHandler(this.testItemsButton_Click); - // - // headerFontLabel - // - this.headerFontLabel.AutoSize = true; - this.headerFontLabel.Location = new System.Drawing.Point(16, 140); - this.headerFontLabel.Name = "headerFontLabel"; - this.headerFontLabel.Size = new System.Drawing.Size(112, 13); - this.headerFontLabel.TabIndex = 14; - this.headerFontLabel.Text = "Header font/size/style"; - // - // titleFontLabel - // - this.titleFontLabel.AutoSize = true; - this.titleFontLabel.Location = new System.Drawing.Point(16, 116); - this.titleFontLabel.Name = "titleFontLabel"; - this.titleFontLabel.Size = new System.Drawing.Size(97, 13); - this.titleFontLabel.TabIndex = 9; - this.titleFontLabel.Text = "Title font/size/style"; - // - // titleFontFamilyComboBox - // - this.titleFontFamilyComboBox.Enabled = false; - this.titleFontFamilyComboBox.FormattingEnabled = true; - this.titleFontFamilyComboBox.Location = new System.Drawing.Point(142, 113); - this.titleFontFamilyComboBox.Name = "titleFontFamilyComboBox"; - this.titleFontFamilyComboBox.Size = new System.Drawing.Size(110, 21); - this.titleFontFamilyComboBox.TabIndex = 10; - // - // headerFontFamilyComboBox - // - this.headerFontFamilyComboBox.Enabled = false; - this.headerFontFamilyComboBox.FormattingEnabled = true; - this.headerFontFamilyComboBox.Location = new System.Drawing.Point(142, 137); - this.headerFontFamilyComboBox.Name = "headerFontFamilyComboBox"; - this.headerFontFamilyComboBox.Size = new System.Drawing.Size(110, 21); - this.headerFontFamilyComboBox.TabIndex = 15; - // - // bodyFontFamilyComboBox - // - this.bodyFontFamilyComboBox.Enabled = false; - this.bodyFontFamilyComboBox.FormattingEnabled = true; - this.bodyFontFamilyComboBox.Location = new System.Drawing.Point(142, 161); - this.bodyFontFamilyComboBox.Name = "bodyFontFamilyComboBox"; - this.bodyFontFamilyComboBox.Size = new System.Drawing.Size(110, 21); - this.bodyFontFamilyComboBox.TabIndex = 20; - // - // bodyFontLabel - // - this.bodyFontLabel.AutoSize = true; - this.bodyFontLabel.Location = new System.Drawing.Point(16, 164); - this.bodyFontLabel.Name = "bodyFontLabel"; - this.bodyFontLabel.Size = new System.Drawing.Size(101, 13); - this.bodyFontLabel.TabIndex = 19; - this.bodyFontLabel.Text = "Body font/size/style"; - // - // titleFontSizeTextBox - // - this.titleFontSizeTextBox.Enabled = false; - this.titleFontSizeTextBox.Location = new System.Drawing.Point(258, 113); - this.titleFontSizeTextBox.Name = "titleFontSizeTextBox"; - this.titleFontSizeTextBox.Size = new System.Drawing.Size(30, 20); - this.titleFontSizeTextBox.TabIndex = 11; - // - // headerFontSizeTextBox - // - this.headerFontSizeTextBox.Enabled = false; - this.headerFontSizeTextBox.Location = new System.Drawing.Point(258, 137); - this.headerFontSizeTextBox.Name = "headerFontSizeTextBox"; - this.headerFontSizeTextBox.Size = new System.Drawing.Size(30, 20); - this.headerFontSizeTextBox.TabIndex = 16; - // - // bodyFontSizeTextBox - // - this.bodyFontSizeTextBox.Enabled = false; - this.bodyFontSizeTextBox.Location = new System.Drawing.Point(258, 161); - this.bodyFontSizeTextBox.Name = "bodyFontSizeTextBox"; - this.bodyFontSizeTextBox.Size = new System.Drawing.Size(29, 20); - this.bodyFontSizeTextBox.TabIndex = 21; - // - // titleBoldCheckBox - // - this.titleBoldCheckBox.AutoSize = true; - this.titleBoldCheckBox.Enabled = false; - this.titleBoldCheckBox.Location = new System.Drawing.Point(306, 116); - this.titleBoldCheckBox.Name = "titleBoldCheckBox"; - this.titleBoldCheckBox.Size = new System.Drawing.Size(15, 14); - this.titleBoldCheckBox.TabIndex = 12; - this.titleBoldCheckBox.UseVisualStyleBackColor = true; - // - // titleItalicCheckBox - // - this.titleItalicCheckBox.AutoSize = true; - this.titleItalicCheckBox.Enabled = false; - this.titleItalicCheckBox.Location = new System.Drawing.Point(334, 116); - this.titleItalicCheckBox.Name = "titleItalicCheckBox"; - this.titleItalicCheckBox.Size = new System.Drawing.Size(15, 14); - this.titleItalicCheckBox.TabIndex = 13; - this.titleItalicCheckBox.UseVisualStyleBackColor = true; - // - // headerItalicCheckBox - // - this.headerItalicCheckBox.AutoSize = true; - this.headerItalicCheckBox.Enabled = false; - this.headerItalicCheckBox.Location = new System.Drawing.Point(334, 140); - this.headerItalicCheckBox.Name = "headerItalicCheckBox"; - this.headerItalicCheckBox.Size = new System.Drawing.Size(15, 14); - this.headerItalicCheckBox.TabIndex = 18; - this.headerItalicCheckBox.UseVisualStyleBackColor = true; - // - // headerBoldCheckBox - // - this.headerBoldCheckBox.AutoSize = true; - this.headerBoldCheckBox.Enabled = false; - this.headerBoldCheckBox.Location = new System.Drawing.Point(306, 140); - this.headerBoldCheckBox.Name = "headerBoldCheckBox"; - this.headerBoldCheckBox.Size = new System.Drawing.Size(15, 14); - this.headerBoldCheckBox.TabIndex = 17; - this.headerBoldCheckBox.UseVisualStyleBackColor = true; - // - // bodyItalicCheckBox - // - this.bodyItalicCheckBox.AutoSize = true; - this.bodyItalicCheckBox.Enabled = false; - this.bodyItalicCheckBox.Location = new System.Drawing.Point(334, 164); - this.bodyItalicCheckBox.Name = "bodyItalicCheckBox"; - this.bodyItalicCheckBox.Size = new System.Drawing.Size(15, 14); - this.bodyItalicCheckBox.TabIndex = 23; - this.bodyItalicCheckBox.UseVisualStyleBackColor = true; - // - // bodyBoldCheckBox - // - this.bodyBoldCheckBox.AutoSize = true; - this.bodyBoldCheckBox.Enabled = false; - this.bodyBoldCheckBox.Location = new System.Drawing.Point(306, 164); - this.bodyBoldCheckBox.Name = "bodyBoldCheckBox"; - this.bodyBoldCheckBox.Size = new System.Drawing.Size(15, 14); - this.bodyBoldCheckBox.TabIndex = 22; - this.bodyBoldCheckBox.UseVisualStyleBackColor = true; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.label1.Location = new System.Drawing.Point(296, 100); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(32, 13); - this.label1.TabIndex = 31; - this.label1.Text = "Bold"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.label2.Location = new System.Drawing.Point(330, 100); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(24, 13); - this.label2.TabIndex = 32; - this.label2.Text = "Ital."; - // - // commonItems2Button - // - this.commonItems2Button.Enabled = false; - this.commonItems2Button.Location = new System.Drawing.Point(216, 259); - this.commonItems2Button.Name = "commonItems2Button"; - this.commonItems2Button.Size = new System.Drawing.Size(70, 23); - this.commonItems2Button.TabIndex = 34; - this.commonItems2Button.Text = "Common 2"; - this.commonItems2Button.UseVisualStyleBackColor = true; - this.commonItems2Button.Click += new System.EventHandler(this.commonItems2Button_Click); - // - // commonItems3Button - // - this.commonItems3Button.Enabled = false; - this.commonItems3Button.Location = new System.Drawing.Point(290, 259); - this.commonItems3Button.Name = "commonItems3Button"; - this.commonItems3Button.Size = new System.Drawing.Size(70, 23); - this.commonItems3Button.TabIndex = 35; - this.commonItems3Button.Text = "Common 3"; - this.commonItems3Button.UseVisualStyleBackColor = true; - this.commonItems3Button.Click += new System.EventHandler(this.commonItems3Button_Click); - // - // colW2TextBox - // - this.colW2TextBox.Enabled = false; - this.colW2TextBox.Location = new System.Drawing.Point(216, 236); - this.colW2TextBox.Name = "colW2TextBox"; - this.colW2TextBox.Size = new System.Drawing.Size(44, 20); - this.colW2TextBox.TabIndex = 31; - // - // colW1TextBox - // - this.colW1TextBox.Enabled = false; - this.colW1TextBox.Location = new System.Drawing.Point(142, 236); - this.colW1TextBox.Name = "colW1TextBox"; - this.colW1TextBox.Size = new System.Drawing.Size(44, 20); - this.colW1TextBox.TabIndex = 29; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(186, 239); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(15, 13); - this.label3.TabIndex = 30; - this.label3.Text = "%"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(260, 238); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(15, 13); - this.label4.TabIndex = 32; - this.label4.Text = "%"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(16, 239); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(97, 13); - this.label5.TabIndex = 28; - this.label5.Text = "Column widths in %"; - // - // PrinterCfgCtrl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.label5); - this.Controls.Add(this.label4); - this.Controls.Add(this.label3); - this.Controls.Add(this.colW2TextBox); - this.Controls.Add(this.colW1TextBox); - this.Controls.Add(this.commonItems3Button); - this.Controls.Add(this.commonItems2Button); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.bodyItalicCheckBox); - this.Controls.Add(this.bodyBoldCheckBox); - this.Controls.Add(this.headerItalicCheckBox); - this.Controls.Add(this.headerBoldCheckBox); - this.Controls.Add(this.titleItalicCheckBox); - this.Controls.Add(this.titleBoldCheckBox); - this.Controls.Add(this.bodyFontSizeTextBox); - this.Controls.Add(this.headerFontSizeTextBox); - this.Controls.Add(this.titleFontSizeTextBox); - this.Controls.Add(this.bodyFontFamilyComboBox); - this.Controls.Add(this.bodyFontLabel); - this.Controls.Add(this.headerFontFamilyComboBox); - this.Controls.Add(this.titleFontFamilyComboBox); - this.Controls.Add(this.cultureComboBox); - this.Controls.Add(this.cultureLabel); - this.Controls.Add(this.commonItems1Button); - this.Controls.Add(this.footerButton); - this.Controls.Add(this.headerButton); - this.Controls.Add(this.testItemsButton); - this.Controls.Add(this.bottomMarginTextBox); - this.Controls.Add(this.titleFontLabel); - this.Controls.Add(this.leftMarginTextBox); - this.Controls.Add(this.headerFontLabel); - this.Controls.Add(this.topMarginTextBox); - this.Controls.Add(this.topMarginLabel); - this.Controls.Add(this.orientationComboBox); - this.Controls.Add(this.orientationLabel); - this.Controls.Add(this.supressPrintingCheckBox); - this.Controls.Add(this.nameTextBox); - this.Controls.Add(this.nameLabel); - this.Controls.Add(this.classNameLabel); - this.Name = "PrinterCfgCtrl"; - this.Size = new System.Drawing.Size(400, 350); - this.Load += new System.EventHandler(this.PrinterCfgCtrl_Load); - this.ResumeLayout(false); - this.PerformLayout(); + this.nameTextBox = new System.Windows.Forms.TextBox(); + this.nameLabel = new System.Windows.Forms.Label(); + this.classNameLabel = new System.Windows.Forms.Label(); + this.supressPrintingCheckBox = new System.Windows.Forms.CheckBox(); + this.orientationLabel = new System.Windows.Forms.Label(); + this.orientationComboBox = new System.Windows.Forms.ComboBox(); + this.topMarginTextBox = new System.Windows.Forms.TextBox(); + this.topMarginLabel = new System.Windows.Forms.Label(); + this.leftMarginTextBox = new System.Windows.Forms.TextBox(); + this.bottomMarginTextBox = new System.Windows.Forms.TextBox(); + this.cultureComboBox = new System.Windows.Forms.ComboBox(); + this.cultureLabel = new System.Windows.Forms.Label(); + this.commonItems1Button = new System.Windows.Forms.Button(); + this.footerButton = new System.Windows.Forms.Button(); + this.headerButton = new System.Windows.Forms.Button(); + this.testItemsButton = new System.Windows.Forms.Button(); + this.headerFontLabel = new System.Windows.Forms.Label(); + this.titleFontLabel = new System.Windows.Forms.Label(); + this.titleFontFamilyComboBox = new System.Windows.Forms.ComboBox(); + this.headerFontFamilyComboBox = new System.Windows.Forms.ComboBox(); + this.bodyFontFamilyComboBox = new System.Windows.Forms.ComboBox(); + this.bodyFontLabel = new System.Windows.Forms.Label(); + this.titleFontSizeTextBox = new System.Windows.Forms.TextBox(); + this.headerFontSizeTextBox = new System.Windows.Forms.TextBox(); + this.bodyFontSizeTextBox = new System.Windows.Forms.TextBox(); + this.titleBoldCheckBox = new System.Windows.Forms.CheckBox(); + this.titleItalicCheckBox = new System.Windows.Forms.CheckBox(); + this.headerItalicCheckBox = new System.Windows.Forms.CheckBox(); + this.headerBoldCheckBox = new System.Windows.Forms.CheckBox(); + this.bodyItalicCheckBox = new System.Windows.Forms.CheckBox(); + this.bodyBoldCheckBox = new System.Windows.Forms.CheckBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.commonItems2Button = new System.Windows.Forms.Button(); + this.commonItems3Button = new System.Windows.Forms.Button(); + this.colW2TextBox = new System.Windows.Forms.TextBox(); + this.colW1TextBox = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // nameTextBox + // + this.nameTextBox.Enabled = false; + this.nameTextBox.Location = new System.Drawing.Point(142, 40); + this.nameTextBox.Name = "nameTextBox"; + this.nameTextBox.Size = new System.Drawing.Size(218, 20); + this.nameTextBox.TabIndex = 2; + // + // nameLabel + // + this.nameLabel.AutoSize = true; + this.nameLabel.Location = new System.Drawing.Point(16, 43); + this.nameLabel.Name = "nameLabel"; + this.nameLabel.Size = new System.Drawing.Size(35, 13); + this.nameLabel.TabIndex = 1; + this.nameLabel.Text = "Name"; + // + // classNameLabel + // + this.classNameLabel.AutoSize = true; + this.classNameLabel.Location = new System.Drawing.Point(139, 16); + this.classNameLabel.Name = "classNameLabel"; + this.classNameLabel.Size = new System.Drawing.Size(83, 13); + this.classNameLabel.TabIndex = 0; + this.classNameLabel.Text = "ComonentName"; + // + // supressPrintingCheckBox + // + this.supressPrintingCheckBox.AutoSize = true; + this.supressPrintingCheckBox.Enabled = false; + this.supressPrintingCheckBox.Location = new System.Drawing.Point(19, 313); + this.supressPrintingCheckBox.Name = "supressPrintingCheckBox"; + this.supressPrintingCheckBox.Size = new System.Drawing.Size(101, 17); + this.supressPrintingCheckBox.TabIndex = 38; + this.supressPrintingCheckBox.Text = "Supress printing"; + this.supressPrintingCheckBox.UseVisualStyleBackColor = true; + // + // orientationLabel + // + this.orientationLabel.AutoSize = true; + this.orientationLabel.Location = new System.Drawing.Point(16, 67); + this.orientationLabel.Name = "orientationLabel"; + this.orientationLabel.Size = new System.Drawing.Size(84, 13); + this.orientationLabel.TabIndex = 3; + this.orientationLabel.Text = "Page orientation"; + // + // orientationComboBox + // + this.orientationComboBox.Enabled = false; + this.orientationComboBox.FormattingEnabled = true; + this.orientationComboBox.Location = new System.Drawing.Point(142, 64); + this.orientationComboBox.Name = "orientationComboBox"; + this.orientationComboBox.Size = new System.Drawing.Size(218, 21); + this.orientationComboBox.TabIndex = 4; + // + // topMarginTextBox + // + this.topMarginTextBox.Enabled = false; + this.topMarginTextBox.Location = new System.Drawing.Point(142, 89); + this.topMarginTextBox.Name = "topMarginTextBox"; + this.topMarginTextBox.Size = new System.Drawing.Size(44, 20); + this.topMarginTextBox.TabIndex = 6; + // + // topMarginLabel + // + this.topMarginLabel.AutoSize = true; + this.topMarginLabel.Location = new System.Drawing.Point(16, 92); + this.topMarginLabel.Name = "topMarginLabel"; + this.topMarginLabel.Size = new System.Drawing.Size(116, 13); + this.topMarginLabel.TabIndex = 5; + this.topMarginLabel.Text = "Top/bottom/left margin"; + // + // leftMarginTextBox + // + this.leftMarginTextBox.Enabled = false; + this.leftMarginTextBox.Location = new System.Drawing.Point(244, 89); + this.leftMarginTextBox.Name = "leftMarginTextBox"; + this.leftMarginTextBox.Size = new System.Drawing.Size(44, 20); + this.leftMarginTextBox.TabIndex = 8; + // + // bottomMarginTextBox + // + this.bottomMarginTextBox.Enabled = false; + this.bottomMarginTextBox.Location = new System.Drawing.Point(193, 89); + this.bottomMarginTextBox.Name = "bottomMarginTextBox"; + this.bottomMarginTextBox.Size = new System.Drawing.Size(44, 20); + this.bottomMarginTextBox.TabIndex = 7; + // + // cultureComboBox + // + this.cultureComboBox.Enabled = false; + this.cultureComboBox.FormattingEnabled = true; + this.cultureComboBox.Location = new System.Drawing.Point(142, 185); + this.cultureComboBox.Name = "cultureComboBox"; + this.cultureComboBox.Size = new System.Drawing.Size(218, 21); + this.cultureComboBox.TabIndex = 26; + // + // cultureLabel + // + this.cultureLabel.AutoSize = true; + this.cultureLabel.Location = new System.Drawing.Point(16, 188); + this.cultureLabel.Name = "cultureLabel"; + this.cultureLabel.Size = new System.Drawing.Size(42, 13); + this.cultureLabel.TabIndex = 25; + this.cultureLabel.Text = "Cullture"; + // + // commonItems1Button + // + this.commonItems1Button.Enabled = false; + this.commonItems1Button.Location = new System.Drawing.Point(142, 259); + this.commonItems1Button.Name = "commonItems1Button"; + this.commonItems1Button.Size = new System.Drawing.Size(70, 23); + this.commonItems1Button.TabIndex = 33; + this.commonItems1Button.Text = "Common 1"; + this.commonItems1Button.UseVisualStyleBackColor = true; + this.commonItems1Button.Click += new System.EventHandler(this.commonItems1Button_Click); + // + // footerButton + // + this.footerButton.Enabled = false; + this.footerButton.Location = new System.Drawing.Point(142, 309); + this.footerButton.Name = "footerButton"; + this.footerButton.Size = new System.Drawing.Size(218, 23); + this.footerButton.TabIndex = 37; + this.footerButton.Text = "Footer"; + this.footerButton.UseVisualStyleBackColor = true; + this.footerButton.Click += new System.EventHandler(this.footerButton_Click); + // + // headerButton + // + this.headerButton.Enabled = false; + this.headerButton.Location = new System.Drawing.Point(142, 209); + this.headerButton.Name = "headerButton"; + this.headerButton.Size = new System.Drawing.Size(218, 23); + this.headerButton.TabIndex = 27; + this.headerButton.Text = "Title"; + this.headerButton.UseVisualStyleBackColor = true; + this.headerButton.Click += new System.EventHandler(this.headerButton_Click); + // + // testItemsButton + // + this.testItemsButton.Enabled = false; + this.testItemsButton.Location = new System.Drawing.Point(142, 284); + this.testItemsButton.Name = "testItemsButton"; + this.testItemsButton.Size = new System.Drawing.Size(218, 23); + this.testItemsButton.TabIndex = 36; + this.testItemsButton.Text = "Water meter items"; + this.testItemsButton.UseVisualStyleBackColor = true; + this.testItemsButton.Click += new System.EventHandler(this.testItemsButton_Click); + // + // headerFontLabel + // + this.headerFontLabel.AutoSize = true; + this.headerFontLabel.Location = new System.Drawing.Point(16, 140); + this.headerFontLabel.Name = "headerFontLabel"; + this.headerFontLabel.Size = new System.Drawing.Size(112, 13); + this.headerFontLabel.TabIndex = 14; + this.headerFontLabel.Text = "Header font/size/style"; + // + // titleFontLabel + // + this.titleFontLabel.AutoSize = true; + this.titleFontLabel.Location = new System.Drawing.Point(16, 116); + this.titleFontLabel.Name = "titleFontLabel"; + this.titleFontLabel.Size = new System.Drawing.Size(97, 13); + this.titleFontLabel.TabIndex = 9; + this.titleFontLabel.Text = "Title font/size/style"; + // + // titleFontFamilyComboBox + // + this.titleFontFamilyComboBox.Enabled = false; + this.titleFontFamilyComboBox.FormattingEnabled = true; + this.titleFontFamilyComboBox.Location = new System.Drawing.Point(142, 113); + this.titleFontFamilyComboBox.Name = "titleFontFamilyComboBox"; + this.titleFontFamilyComboBox.Size = new System.Drawing.Size(110, 21); + this.titleFontFamilyComboBox.TabIndex = 10; + // + // headerFontFamilyComboBox + // + this.headerFontFamilyComboBox.Enabled = false; + this.headerFontFamilyComboBox.FormattingEnabled = true; + this.headerFontFamilyComboBox.Location = new System.Drawing.Point(142, 137); + this.headerFontFamilyComboBox.Name = "headerFontFamilyComboBox"; + this.headerFontFamilyComboBox.Size = new System.Drawing.Size(110, 21); + this.headerFontFamilyComboBox.TabIndex = 15; + // + // bodyFontFamilyComboBox + // + this.bodyFontFamilyComboBox.Enabled = false; + this.bodyFontFamilyComboBox.FormattingEnabled = true; + this.bodyFontFamilyComboBox.Location = new System.Drawing.Point(142, 161); + this.bodyFontFamilyComboBox.Name = "bodyFontFamilyComboBox"; + this.bodyFontFamilyComboBox.Size = new System.Drawing.Size(110, 21); + this.bodyFontFamilyComboBox.TabIndex = 20; + // + // bodyFontLabel + // + this.bodyFontLabel.AutoSize = true; + this.bodyFontLabel.Location = new System.Drawing.Point(16, 164); + this.bodyFontLabel.Name = "bodyFontLabel"; + this.bodyFontLabel.Size = new System.Drawing.Size(101, 13); + this.bodyFontLabel.TabIndex = 19; + this.bodyFontLabel.Text = "Body font/size/style"; + // + // titleFontSizeTextBox + // + this.titleFontSizeTextBox.Enabled = false; + this.titleFontSizeTextBox.Location = new System.Drawing.Point(258, 113); + this.titleFontSizeTextBox.Name = "titleFontSizeTextBox"; + this.titleFontSizeTextBox.Size = new System.Drawing.Size(30, 20); + this.titleFontSizeTextBox.TabIndex = 11; + // + // headerFontSizeTextBox + // + this.headerFontSizeTextBox.Enabled = false; + this.headerFontSizeTextBox.Location = new System.Drawing.Point(258, 137); + this.headerFontSizeTextBox.Name = "headerFontSizeTextBox"; + this.headerFontSizeTextBox.Size = new System.Drawing.Size(30, 20); + this.headerFontSizeTextBox.TabIndex = 16; + // + // bodyFontSizeTextBox + // + this.bodyFontSizeTextBox.Enabled = false; + this.bodyFontSizeTextBox.Location = new System.Drawing.Point(258, 161); + this.bodyFontSizeTextBox.Name = "bodyFontSizeTextBox"; + this.bodyFontSizeTextBox.Size = new System.Drawing.Size(29, 20); + this.bodyFontSizeTextBox.TabIndex = 21; + // + // titleBoldCheckBox + // + this.titleBoldCheckBox.AutoSize = true; + this.titleBoldCheckBox.Enabled = false; + this.titleBoldCheckBox.Location = new System.Drawing.Point(306, 116); + this.titleBoldCheckBox.Name = "titleBoldCheckBox"; + this.titleBoldCheckBox.Size = new System.Drawing.Size(15, 14); + this.titleBoldCheckBox.TabIndex = 12; + this.titleBoldCheckBox.UseVisualStyleBackColor = true; + // + // titleItalicCheckBox + // + this.titleItalicCheckBox.AutoSize = true; + this.titleItalicCheckBox.Enabled = false; + this.titleItalicCheckBox.Location = new System.Drawing.Point(334, 116); + this.titleItalicCheckBox.Name = "titleItalicCheckBox"; + this.titleItalicCheckBox.Size = new System.Drawing.Size(15, 14); + this.titleItalicCheckBox.TabIndex = 13; + this.titleItalicCheckBox.UseVisualStyleBackColor = true; + // + // headerItalicCheckBox + // + this.headerItalicCheckBox.AutoSize = true; + this.headerItalicCheckBox.Enabled = false; + this.headerItalicCheckBox.Location = new System.Drawing.Point(334, 140); + this.headerItalicCheckBox.Name = "headerItalicCheckBox"; + this.headerItalicCheckBox.Size = new System.Drawing.Size(15, 14); + this.headerItalicCheckBox.TabIndex = 18; + this.headerItalicCheckBox.UseVisualStyleBackColor = true; + // + // headerBoldCheckBox + // + this.headerBoldCheckBox.AutoSize = true; + this.headerBoldCheckBox.Enabled = false; + this.headerBoldCheckBox.Location = new System.Drawing.Point(306, 140); + this.headerBoldCheckBox.Name = "headerBoldCheckBox"; + this.headerBoldCheckBox.Size = new System.Drawing.Size(15, 14); + this.headerBoldCheckBox.TabIndex = 17; + this.headerBoldCheckBox.UseVisualStyleBackColor = true; + // + // bodyItalicCheckBox + // + this.bodyItalicCheckBox.AutoSize = true; + this.bodyItalicCheckBox.Enabled = false; + this.bodyItalicCheckBox.Location = new System.Drawing.Point(334, 164); + this.bodyItalicCheckBox.Name = "bodyItalicCheckBox"; + this.bodyItalicCheckBox.Size = new System.Drawing.Size(15, 14); + this.bodyItalicCheckBox.TabIndex = 23; + this.bodyItalicCheckBox.UseVisualStyleBackColor = true; + // + // bodyBoldCheckBox + // + this.bodyBoldCheckBox.AutoSize = true; + this.bodyBoldCheckBox.Enabled = false; + this.bodyBoldCheckBox.Location = new System.Drawing.Point(306, 164); + this.bodyBoldCheckBox.Name = "bodyBoldCheckBox"; + this.bodyBoldCheckBox.Size = new System.Drawing.Size(15, 14); + this.bodyBoldCheckBox.TabIndex = 22; + this.bodyBoldCheckBox.UseVisualStyleBackColor = true; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label1.Location = new System.Drawing.Point(296, 100); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(32, 13); + this.label1.TabIndex = 31; + this.label1.Text = "Bold"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label2.Location = new System.Drawing.Point(330, 100); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(24, 13); + this.label2.TabIndex = 32; + this.label2.Text = "Ital."; + // + // commonItems2Button + // + this.commonItems2Button.Enabled = false; + this.commonItems2Button.Location = new System.Drawing.Point(216, 259); + this.commonItems2Button.Name = "commonItems2Button"; + this.commonItems2Button.Size = new System.Drawing.Size(70, 23); + this.commonItems2Button.TabIndex = 34; + this.commonItems2Button.Text = "Common 2"; + this.commonItems2Button.UseVisualStyleBackColor = true; + this.commonItems2Button.Click += new System.EventHandler(this.commonItems2Button_Click); + // + // commonItems3Button + // + this.commonItems3Button.Enabled = false; + this.commonItems3Button.Location = new System.Drawing.Point(290, 259); + this.commonItems3Button.Name = "commonItems3Button"; + this.commonItems3Button.Size = new System.Drawing.Size(70, 23); + this.commonItems3Button.TabIndex = 35; + this.commonItems3Button.Text = "Common 3"; + this.commonItems3Button.UseVisualStyleBackColor = true; + this.commonItems3Button.Click += new System.EventHandler(this.commonItems3Button_Click); + // + // colW2TextBox + // + this.colW2TextBox.Enabled = false; + this.colW2TextBox.Location = new System.Drawing.Point(216, 236); + this.colW2TextBox.Name = "colW2TextBox"; + this.colW2TextBox.Size = new System.Drawing.Size(44, 20); + this.colW2TextBox.TabIndex = 31; + // + // colW1TextBox + // + this.colW1TextBox.Enabled = false; + this.colW1TextBox.Location = new System.Drawing.Point(142, 236); + this.colW1TextBox.Name = "colW1TextBox"; + this.colW1TextBox.Size = new System.Drawing.Size(44, 20); + this.colW1TextBox.TabIndex = 29; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(186, 239); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(15, 13); + this.label3.TabIndex = 30; + this.label3.Text = "%"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(260, 238); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(15, 13); + this.label4.TabIndex = 32; + this.label4.Text = "%"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(16, 239); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(97, 13); + this.label5.TabIndex = 28; + this.label5.Text = "Column widths in %"; + // + // PrinterCfgCtrl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label5); + this.Controls.Add(this.label4); + this.Controls.Add(this.label3); + this.Controls.Add(this.colW2TextBox); + this.Controls.Add(this.colW1TextBox); + this.Controls.Add(this.commonItems3Button); + this.Controls.Add(this.commonItems2Button); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.bodyItalicCheckBox); + this.Controls.Add(this.bodyBoldCheckBox); + this.Controls.Add(this.headerItalicCheckBox); + this.Controls.Add(this.headerBoldCheckBox); + this.Controls.Add(this.titleItalicCheckBox); + this.Controls.Add(this.titleBoldCheckBox); + this.Controls.Add(this.bodyFontSizeTextBox); + this.Controls.Add(this.headerFontSizeTextBox); + this.Controls.Add(this.titleFontSizeTextBox); + this.Controls.Add(this.bodyFontFamilyComboBox); + this.Controls.Add(this.bodyFontLabel); + this.Controls.Add(this.headerFontFamilyComboBox); + this.Controls.Add(this.titleFontFamilyComboBox); + this.Controls.Add(this.cultureComboBox); + this.Controls.Add(this.cultureLabel); + this.Controls.Add(this.commonItems1Button); + this.Controls.Add(this.footerButton); + this.Controls.Add(this.headerButton); + this.Controls.Add(this.testItemsButton); + this.Controls.Add(this.bottomMarginTextBox); + this.Controls.Add(this.titleFontLabel); + this.Controls.Add(this.leftMarginTextBox); + this.Controls.Add(this.headerFontLabel); + this.Controls.Add(this.topMarginTextBox); + this.Controls.Add(this.topMarginLabel); + this.Controls.Add(this.orientationComboBox); + this.Controls.Add(this.orientationLabel); + this.Controls.Add(this.supressPrintingCheckBox); + this.Controls.Add(this.nameTextBox); + this.Controls.Add(this.nameLabel); + this.Controls.Add(this.classNameLabel); + this.Name = "PrinterCfgCtrl"; + this.Size = new System.Drawing.Size(400, 350); + this.Load += new System.EventHandler(this.PrinterCfgCtrl_Load); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs index 16bc68a8f..88d0bc22f 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs @@ -44,7 +44,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment } /// - /// Flying start mass collection method sequence + /// Adjustment method sequence /// /// Test entity /// @@ -344,7 +344,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment tstRslt.FlowMax = (float)RefFlowStat.Max; tstRslt.ErrorFlagsMd = (ErrorFlagsComp != null) ? (sbyte)ErrorFlagsComp.Mode : (sbyte)0; - tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(test, tstRslt.TestTime) : 0; + tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(tstRslt, false, false, 0, 0) : 0; for (int i = 0; i < BatchRslts.WMPositionsCount; i++) { diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index e653b986d..fda89f2b4 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -25,6 +25,9 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection IList e = new List(); /// Events from currently running operations checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state + int switchTimeStart = 1; + int switchTimeEnd = 1; + if (test.Part < 1 || test.Part > Config.Data.CompoundWMsCount) { UiBridge.Bridge.OnError(this, string.Format("Test 'Part' should be 1 .. {0}", Config.Data.CompoundWMsCount)); @@ -505,6 +508,9 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection ClearAllStatistics(StateMachine.Time); int estimtdEndTime = StateMachine.Time + (int)test.TstTime; + /// Read the diverter switch time + switchTimeStart = (int)cBrd.DivTime; + /// Measurement loop - begin while (true) { @@ -564,6 +570,9 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection /// TestEndTime = DateTime.Now; + /// Read the diverter switch time + switchTimeEnd = (int)cBrd.DivTime; + //------------------------------------------------ Bridge.OnActivity(this, Strings.Test_completed); //------------------------------------------------ @@ -630,7 +639,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection tstRslt.FlowMax = (float)RefFlowStat.Max; tstRslt.ErrorFlagsMd = (ErrorFlagsComp != null) ? (sbyte)ErrorFlagsComp.Mode : (sbyte)0; - tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(test, tstRslt.TestTime) : 0; + tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(tstRslt, true, false, switchTimeStart, switchTimeEnd) : 0; for (int i = 0; i < BatchRslts.WMPositionsCount; i++) { diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs index f17aeca08..7670547b4 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs @@ -33,7 +33,6 @@ namespace TBF.BenchControl.TestMethods.Endurance IList e = new List(); /// Events from currently running operations Event retVal = Event.Done; checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state - /// Elde.ControlBoardDev cBrd = StateMachine.ControlBoard; processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false); @@ -362,7 +361,7 @@ namespace TBF.BenchControl.TestMethods.Endurance tstRslt.FlowMax = (float)RefFlowStat.Max; tstRslt.ErrorFlagsMd = (ErrorFlagsComp != null) ? (sbyte)ErrorFlagsComp.Mode : (sbyte)0; - tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(test, tstRslt.TestTime) : 0; + tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(tstRslt, false, false, 0, 0) : 0; /// /// Single meters diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs index 1cfd6436d..94417085e 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs @@ -34,6 +34,9 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced Event retVal = Event.Done; checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state + int switchTimeStart = 1; + int switchTimeEnd = 1; + LtrPerRefPulse = outPath.FlowMeter.LtrPerPulse; /// [ltr/pulse], nominal flow in [m3/h] /// Notes: @@ -531,7 +534,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced tstRslt.FlowMax = (float)RefFlowStat.Max; tstRslt.ErrorFlagsMd = (ErrorFlagsComp != null) ? (sbyte)ErrorFlagsComp.Mode : (sbyte)0; - tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(test, tstRslt.TestTime) : 0; + tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(tstRslt, false, true, switchTimeStart, switchTimeEnd) : 0; for (int i = 0; i < BatchRslts.WMPositionsCount; i++) { diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 23de8fc9f..b228bd549 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -38,6 +38,9 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection Event retVal = Event.Done; checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state + int switchTimeStart = 1; + int switchTimeEnd = 1; + LtrPerRefPulse = outPath.FlowMeter.LtrPerPulse; /// [ltr/pulse], nominal flow in [m3/h] /// Notes: @@ -884,7 +887,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection tstRslt.FlowMax = (float)RefFlowStat.Max; tstRslt.ErrorFlagsMd = (ErrorFlagsComp != null) ? (sbyte)ErrorFlagsComp.Mode : (sbyte)0; - tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(test, tstRslt.TestTime) : 0; + tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(tstRslt, false, true, switchTimeStart, switchTimeEnd) : 0; if (compound) { diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index f4ce69809..89a90c522 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -34,7 +34,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart IList e = new List(); /// Events from currently running operations Event retVal = Event.Done; checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state - /// + if (debugLevel == Config.Entities.DebugMode.Simulate) { /// @@ -469,7 +469,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart tstRslt.FlowMax = (float)RefFlowStat.Max; tstRslt.ErrorFlagsMd = (ErrorFlagsComp != null) ? (sbyte)ErrorFlagsComp.Mode : (sbyte)0; - tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(test, tstRslt.TestTime) : 0; + tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(tstRslt, false, false, 0, 0) : 0; if (compoundTestParams != null) { diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 57450045c..3f692c930 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -35,6 +35,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection Event retVal = Event.Done; checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state + int switchTimeStart = 1; + int switchTimeEnd = 1; + if (debugLevel == Config.Entities.DebugMode.Simulate) { /// @@ -593,6 +596,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection int estimtdEndTime = StateMachine.Time + (int)test.TstTime; ClearAllStatistics(StateMachine.Time); + /// Read the diverter switch time + switchTimeStart = (int)cBrd.DivTime; + /// Measurement loop - begin State.Create(string.Format("{0}({1}) : Reading watermeters", test.Method, test.Name)) .AddOperation(checkUiOp) @@ -716,6 +722,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection if (heatMetersPath == null) LogProcessDataHeader(processDataLogger, "End mass"); else LogProcessDataHeaderHeatMeters(processDataLogger, "End mass"); + /// Read the diverter switch time + switchTimeEnd = (int)cBrd.DivTime; + State.Create(string.Format("{0}({1}) : Measuring the end mass", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp)) @@ -789,7 +798,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection tstRslt.FlowMax = (float)RefFlowStat.Max; tstRslt.ErrorFlagsMd = (ErrorFlagsComp != null) ? (sbyte)ErrorFlagsComp.Mode : (sbyte)0; - tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(test, tstRslt.TestTime) : 0; + tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(tstRslt, true, false, switchTimeStart, switchTimeEnd) : 0; if (compoundTestParams != null) { diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs index 75132c719..5b36d57c7 100644 --- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs @@ -34,6 +34,9 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration Event retVal = Event.Done; checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state + int switchTimeStart = 1; + int switchTimeEnd = 1; + LtrPerRefPulse = outPath.FlowMeter.LtrPerPulse; /// [ltr/pulse], nominal flow in [m3/h] /// Notes: @@ -219,6 +222,9 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration ClearAllStatistics(StateMachine.Time); + /// Read the diverter switch time + switchTimeStart = (int)cBrd.DivTime; + /// Measurement loop - begin while (true) { @@ -264,6 +270,9 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration } while (!e.Contains(Event.TimerExpired)); + /// Read the diverter switch time + switchTimeEnd = (int)cBrd.DivTime; + //------------------------------------------------ Bridge.OnActivity(this, Strings.Measuring_the_weight); //------------------------------------------------ @@ -332,7 +341,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration tstRslt.FlowMax = (float)RefFlowStat.Max; tstRslt.ErrorFlagsMd = (ErrorFlagsComp != null) ? (sbyte)ErrorFlagsComp.Mode : (sbyte)0; - tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(test, tstRslt.TestTime) : 0; + tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(tstRslt, true, false, switchTimeStart, switchTimeEnd) : 0; /// Update flowmeter constant with the measured one if (outPath.FlowMeter.Idx1 > 0 && outPath.FlowMeter.Idx1 <= ReferenceFlowmetersCount) diff --git a/TestBenchFramework/BenchControl/Various/ErrorFlags/Errors.cs b/TestBenchFramework/BenchControl/Various/ErrorFlags/Errors.cs index 3d65e773e..0862e39da 100644 --- a/TestBenchFramework/BenchControl/Various/ErrorFlags/Errors.cs +++ b/TestBenchFramework/BenchControl/Various/ErrorFlags/Errors.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Text; using log4net; -using Config.Entities; +using Results.Entities; using TBF.BenchControl.Sequences; namespace TBF.BenchControl.Various.ErrorFlags @@ -24,24 +24,27 @@ namespace TBF.BenchControl.Various.ErrorFlags /// Cfg /// readonly ErrorsCfg errorsCfg; - public ErrorFlagsMode Mode { get { return errorsCfg.TestParams.Mode; } } + public Config.Entities.ErrorFlagsMode Mode { get { return errorsCfg.TestParams.Mode; } } - public int GetErrorFlags(Test test, double testTime) + public int GetErrorFlags(TestRslt testRslt, bool getE9E10, bool getE11E12, int switchTimeStart, int switchTimeEnd) { - /// Any E# is 'true' on error, 'false' when OK + if (Mode == Config.Entities.ErrorFlagsMode.Off) + { + return 0; /// return 0 when Mode == ErrorFlagsMode.Off + } - if (Mode != ErrorFlagsMode.Info && Mode != ErrorFlagsMode.On) return 0; /// return 0 when Mode == ErrorFlagsMode.Off + /// Any E# is 'true' on error, 'false' when OK /// Max. and min. flow - bool E1 = ProcessData.RefFlowStat.Min < test.Qfrom - || ProcessData.RefFlowStat.Max > test.Qto; + bool E1 = ProcessData.RefFlowStat.Min < testRslt.Qfrom() + || ProcessData.RefFlowStat.Max > testRslt.Qto(); /// Max. and min. up and down water temperature - bool E2 = ProcessData.TempUpStat.Min < test.TempLimLo - || ProcessData.TempUpStat.Max > test.TempLimHi - || ProcessData.TempDownStat.Min < test.TempLimLo - || ProcessData.TempDownStat.Max > test.TempLimHi; + bool E2 = ProcessData.TempUpStat.Min < testRslt.TempLimLo() + || ProcessData.TempUpStat.Max > testRslt.TempLimHi() + || ProcessData.TempDownStat.Min < testRslt.TempLimLo() + || ProcessData.TempDownStat.Max > testRslt.TempLimHi(); /// Max. flow deviation bool E3 = ProcessData.RefFlowStat.Min < ProcessData.RefFlowStat.Average * (1.0f - errorsCfg.TestParams.Delta_Q_pct / 100.0f) @@ -59,15 +62,26 @@ namespace TBF.BenchControl.Various.ErrorFlags bool E6 = false; /// Test time (min) - bool E7 = testTime < errorsCfg.TestParams.TestTime_min; + bool E7 = testRslt.TestTime < errorsCfg.TestParams.TestTime_min; /// Test time (max) - bool E8 = testTime > errorsCfg.TestParams.TestTime_max; + bool E8 = testRslt.TestTime > errorsCfg.TestParams.TestTime_max; bool E9 = false; bool E10 = false; + if (getE9E10) + { + E9 = ((double)Math.Abs(switchTimeStart - switchTimeEnd) > errorsCfg.TestParams.Coef_E9 * (switchTimeStart + switchTimeEnd)); + E10 = ((double)(switchTimeStart + switchTimeEnd) > errorsCfg.TestParams.Coef_E10 * 1000.0 * testRslt.TestTime); + } + bool E11 = false; bool E12 = false; + if (getE11E12) + { + E11 = ((double)(switchTimeStart + switchTimeEnd) > errorsCfg.TestParams.Coef_E11 * 1000.0 * testRslt.TestTime); + E12 = ((double)Math.Abs(switchTimeStart - switchTimeEnd) > errorsCfg.TestParams.Coef_E12 * (switchTimeStart + switchTimeEnd)); + } /// Ambient temperature bool E13 = ProcessData.AmbTempStat.Min < errorsCfg.TestParams.AmbTemp_min @@ -75,7 +89,9 @@ namespace TBF.BenchControl.Various.ErrorFlags /// Water pressure bool E14 = ProcessData.PressUpStat.Min < errorsCfg.TestParams.Pressure_min - || ProcessData.PressUpStat.Max > errorsCfg.TestParams.Pressure_max; + || ProcessData.PressUpStat.Max > errorsCfg.TestParams.Pressure_max + || ProcessData.PressDownStat.Min < errorsCfg.TestParams.Pressure_min + || ProcessData.PressDownStat.Max > errorsCfg.TestParams.Pressure_max; bool E15 = false; bool E16 = false; @@ -100,6 +116,66 @@ namespace TBF.BenchControl.Various.ErrorFlags return ErrorFlags; } + public int GetE15(IList meterTestRslts) + { + if (Mode == Config.Entities.ErrorFlagsMode.Off || !errorsCfg.TestParams.E15) + { + return 0; + } + + MeterTestRslt mtrQ3 = GetMtrTstRsltFromNames(meterTestRslts, errorsCfg.Q3Names); + MeterTestRslt mtrQ2 = GetMtrTstRsltFromNames(meterTestRslts, errorsCfg.Q2Names); + MeterTestRslt mtrQ1 = GetMtrTstRsltFromNames(meterTestRslts, errorsCfg.Q1Names); + + if (mtrQ3 != null && mtrQ3.TestDone && (mtrQ3.Error > mtrQ3.ErrLimHi() / 2) && + mtrQ2 != null && mtrQ2.TestDone && (mtrQ2.Error > mtrQ2.ErrLimHi() / 2) && + mtrQ1 != null && mtrQ1.TestDone && (mtrQ1.Error > mtrQ1.ErrLimHi() / 2)) + { + return 0x4000; + } + else + { + return 0; + } + } + + public int GetE16(IList meterTestRslts) + { + if (Mode == Config.Entities.ErrorFlagsMode.Off || !errorsCfg.TestParams.E16) + { + return 0; + } + + MeterTestRslt mtrQ3 = GetMtrTstRsltFromNames(meterTestRslts, errorsCfg.Q3Names); + MeterTestRslt mtrQ2 = GetMtrTstRsltFromNames(meterTestRslts, errorsCfg.Q2Names); + MeterTestRslt mtrQ1 = GetMtrTstRsltFromNames(meterTestRslts, errorsCfg.Q1Names); + + if (mtrQ3 != null && mtrQ3.TestDone && (mtrQ3.Error < mtrQ3.ErrLimLo() / 2) && + mtrQ2 != null && mtrQ2.TestDone && (mtrQ2.Error < mtrQ2.ErrLimLo() / 2) && + mtrQ1 != null && mtrQ1.TestDone && (mtrQ1.Error < mtrQ1.ErrLimLo() / 2)) + { + return 0x8000; + } + else + { + return 0; + } + } + + MeterTestRslt GetMtrTstRsltFromNames(IList meterTestRslts, string testNames) + { + if (string.IsNullOrEmpty(testNames)) return null; + + string[] names = testNames.Split(new char[] {';'}); + + foreach (var nm in names) + { + foreach (var mtr in meterTestRslts) if (mtr.Name() == nm) return mtr; + } + + return null; /// No matching MeterTestRslt found + } + public Errors() { @@ -129,18 +205,18 @@ namespace TBF.BenchControl.Various.ErrorFlags public override void StartChangeHandler() { CfgChangeHandler += delegate(object sender, CfgChangeArgs args) - { - ErrorsCfg tmpcfg = args.Cfg as ErrorsCfg; - if (tmpcfg != null && tmpcfg.Name.Equals(Name)) { - if (args.Command == CfgChangeCmd.CfgChange) + ErrorsCfg tmpcfg = args.Cfg as ErrorsCfg; + if (tmpcfg != null && tmpcfg.Name.Equals(Name)) { - //errorsCfg.BlackAndWhite = tmpcfg.BlackAndWhite; - //errorsCfg.LowResolution = tmpcfg.LowResolution; - //errorsCfg.ImageRotation = tmpcfg.ImageRotation; - } - } - }; + if (args.Command == CfgChangeCmd.CfgChange) + { + errorsCfg.Q3Names = tmpcfg.Q3Names; + errorsCfg.Q2Names = tmpcfg.Q2Names; + errorsCfg.Q1Names = tmpcfg.Q1Names; + } + } + }; } #endregion Configuration Change Handling diff --git a/TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfg.cs b/TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfg.cs index 627f021ac..09211f023 100644 --- a/TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfg.cs +++ b/TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfg.cs @@ -17,6 +17,9 @@ namespace TBF.BenchControl.Various.ErrorFlags /// /// Serialized parameters /// + public string Q3Names; + public string Q2Names; + public string Q1Names; /// Test parameters [XmlIgnore] diff --git a/TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.cs b/TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.cs index 27e21d27d..4e0c5783a 100644 --- a/TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.cs +++ b/TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.cs @@ -52,11 +52,17 @@ namespace TBF.BenchControl.Various.ErrorFlags classNameLabel.Text = config.Factory.ClassName; nameTextBox.Text = config.Name; - } + q3NamesTextBox.Text = config.Q3Names; + q2NamesTextBox.Text = config.Q2Names; + q1NamesTextBox.Text = config.Q1Names; + } public void Unlock() { nameTextBox.Enabled = true; + q3NamesTextBox.Enabled = true; + q2NamesTextBox.Enabled = true; + q1NamesTextBox.Enabled = true; } public CfgUpdateFlags VerifyCfg(ref string message) @@ -78,6 +84,24 @@ namespace TBF.BenchControl.Various.ErrorFlags flags |= (CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange); } + if (config.Q3Names != q3NamesTextBox.Text) + { + config.Q3Names = q3NamesTextBox.Text; + flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + } + + if (config.Q2Names != q2NamesTextBox.Text) + { + config.Q2Names = q2NamesTextBox.Text; + flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + } + + if (config.Q1Names != q1NamesTextBox.Text) + { + config.Q1Names = q1NamesTextBox.Text; + flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + } + if ((flags & CfgUpdateFlags.InvokeCfgChange) != 0) { Errors.OnCfgChange(this, new CfgChangeArgs(CfgChangeCmd.CfgChange, Config)); diff --git a/TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.designer.cs b/TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.designer.cs index 588bba6ee..b0688d3be 100644 --- a/TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.designer.cs +++ b/TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.designer.cs @@ -31,70 +31,144 @@ namespace TBF.BenchControl.Various.ErrorFlags /// private void InitializeComponent() { - this.nameTextBox = new System.Windows.Forms.TextBox(); - this.nameLabel = new System.Windows.Forms.Label(); - this.classNameLabel = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.SuspendLayout(); - // - // nameTextBox - // - this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(115, 49); - this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(174, 20); - this.nameTextBox.TabIndex = 2; - // - // nameLabel - // - this.nameLabel.AutoSize = true; - this.nameLabel.Location = new System.Drawing.Point(20, 52); - this.nameLabel.Name = "nameLabel"; - this.nameLabel.Size = new System.Drawing.Size(35, 13); - this.nameLabel.TabIndex = 1; - this.nameLabel.Text = "Name"; - // - // classNameLabel - // - this.classNameLabel.AutoSize = true; - this.classNameLabel.Location = new System.Drawing.Point(112, 26); - this.classNameLabel.Name = "classNameLabel"; - this.classNameLabel.Size = new System.Drawing.Size(114, 13); - this.classNameLabel.TabIndex = 0; - this.classNameLabel.Text = "ComponentClassName"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(-211, -147); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(57, 13); - this.label1.TabIndex = 5; - this.label1.Text = "Arguments"; - // - // textBox1 - // - this.textBox1.Enabled = false; - this.textBox1.Location = new System.Drawing.Point(-125, -150); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(372, 20); - this.textBox1.TabIndex = 6; - // - // ErrorsCfgCtrl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.textBox1); - this.Controls.Add(this.label1); - this.Controls.Add(this.nameTextBox); - this.Controls.Add(this.nameLabel); - this.Controls.Add(this.classNameLabel); - this.Name = "ErrorsCfgCtrl"; - this.Size = new System.Drawing.Size(500, 300); - this.Load += new System.EventHandler(this.PumpCfgCtrl_Load); - this.ResumeLayout(false); - this.PerformLayout(); + this.nameTextBox = new System.Windows.Forms.TextBox(); + this.nameLabel = new System.Windows.Forms.Label(); + this.classNameLabel = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.q3NamesTextBox = new System.Windows.Forms.TextBox(); + this.q2NamesTextBox = new System.Windows.Forms.TextBox(); + this.q1NamesTextBox = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // nameTextBox + // + this.nameTextBox.Enabled = false; + this.nameTextBox.Location = new System.Drawing.Point(130, 49); + this.nameTextBox.Name = "nameTextBox"; + this.nameTextBox.Size = new System.Drawing.Size(174, 20); + this.nameTextBox.TabIndex = 2; + // + // nameLabel + // + this.nameLabel.AutoSize = true; + this.nameLabel.Location = new System.Drawing.Point(20, 52); + this.nameLabel.Name = "nameLabel"; + this.nameLabel.Size = new System.Drawing.Size(35, 13); + this.nameLabel.TabIndex = 1; + this.nameLabel.Text = "Name"; + // + // classNameLabel + // + this.classNameLabel.AutoSize = true; + this.classNameLabel.Location = new System.Drawing.Point(127, 26); + this.classNameLabel.Name = "classNameLabel"; + this.classNameLabel.Size = new System.Drawing.Size(114, 13); + this.classNameLabel.TabIndex = 0; + this.classNameLabel.Text = "ComponentClassName"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(-211, -147); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(57, 13); + this.label1.TabIndex = 5; + this.label1.Text = "Arguments"; + // + // textBox1 + // + this.textBox1.Enabled = false; + this.textBox1.Location = new System.Drawing.Point(-125, -150); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(372, 20); + this.textBox1.TabIndex = 6; + // + // q3NamesTextBox + // + this.q3NamesTextBox.Enabled = false; + this.q3NamesTextBox.Location = new System.Drawing.Point(130, 103); + this.q3NamesTextBox.Name = "q3NamesTextBox"; + this.q3NamesTextBox.Size = new System.Drawing.Size(174, 20); + this.q3NamesTextBox.TabIndex = 7; + // + // q2NamesTextBox + // + this.q2NamesTextBox.Enabled = false; + this.q2NamesTextBox.Location = new System.Drawing.Point(130, 129); + this.q2NamesTextBox.Name = "q2NamesTextBox"; + this.q2NamesTextBox.Size = new System.Drawing.Size(174, 20); + this.q2NamesTextBox.TabIndex = 8; + // + // q1NamesTextBox + // + this.q1NamesTextBox.Enabled = false; + this.q1NamesTextBox.Location = new System.Drawing.Point(130, 155); + this.q1NamesTextBox.Name = "q1NamesTextBox"; + this.q1NamesTextBox.Size = new System.Drawing.Size(174, 20); + this.q1NamesTextBox.TabIndex = 9; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(20, 106); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(93, 13); + this.label2.TabIndex = 10; + this.label2.Text = "1st test name (Q3)"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(20, 132); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(97, 13); + this.label3.TabIndex = 11; + this.label3.Text = "2nd test name (Q2)"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(20, 158); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(94, 13); + this.label4.TabIndex = 12; + this.label4.Text = "3rd test name (Q1)"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(127, 82); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(250, 13); + this.label5.TabIndex = 13; + this.label5.Text = "Test names for E15, E16 evaluation separated by \';\'"; + // + // ErrorsCfgCtrl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label5); + this.Controls.Add(this.label4); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.q1NamesTextBox); + this.Controls.Add(this.q2NamesTextBox); + this.Controls.Add(this.q3NamesTextBox); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.label1); + this.Controls.Add(this.nameTextBox); + this.Controls.Add(this.nameLabel); + this.Controls.Add(this.classNameLabel); + this.Name = "ErrorsCfgCtrl"; + this.Size = new System.Drawing.Size(500, 300); + this.Load += new System.EventHandler(this.PumpCfgCtrl_Load); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -105,5 +179,12 @@ namespace TBF.BenchControl.Various.ErrorFlags private System.Windows.Forms.Label classNameLabel; private System.Windows.Forms.Label label1; private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox q3NamesTextBox; + private System.Windows.Forms.TextBox q2NamesTextBox; + private System.Windows.Forms.TextBox q1NamesTextBox; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label5; } }