From 3f9973f8b8d9ac25b17fcfad1e4521d5e26c2033 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 2 Mar 2021 14:19:51 +0100 Subject: [PATCH] (1) Results.Entities.Batch.ProtocolTitle removed, (2) Munich related stuff removed --- Results/BatchResults.cs | 1 - Results/Entities/Batch.cs | 10 +- Results/Mappings/BatchMap.cs | 1 - .../Printers/Munich/MunichPrintDocument.cs | 630 ----------- Results/Results.csproj | 3 - Results/WMeterRsltItemSpec.cs | 1 - ResultsBrowser/Filters/Factory.cs | 4 - ResultsBrowser/Filters/ProtocolFilter.cs | 69 -- .../Filters/ProtocolFilterUI.Designer.cs | 72 -- ResultsBrowser/Filters/ProtocolFilterUI.cs | 39 - ResultsBrowser/Filters/ProtocolFilterUI.resx | 120 --- ResultsBrowser/ResultsBrowser.csproj | 10 - ResultsBrowser/ResultsBrowserWnd.cs | 7 +- .../Munich/CycleBeginningForm.Designer.cs | 254 ----- .../DataEntry/Munich/CycleBeginningForm.cs | 111 -- .../DataEntry/Munich/CycleBeginningForm.resx | 201 ---- .../DataEntry/Munich/CycleEndForm.Designer.cs | 526 ---------- .../DataEntry/Munich/CycleEndForm.cs | 206 ---- .../DataEntry/Munich/CycleEndForm.resx | 120 --- .../DataEntry/Munich/EntryForm.cs | 200 ---- .../DataEntry/Munich/EntryFormCfg.cs | 52 - .../DataEntry/Munich/EntryFormCfgCtrl.cs | 81 -- .../Munich/EntryFormCfgCtrl.designer.cs | 178 ---- .../DataEntry/Munich/EntryFormCfgCtrl.resx | 120 --- .../DataEntry/Munich/EntryFormFactory.cs | 27 - .../Munich3/CycleBeginningForm.Designer.cs | 299 ------ .../DataEntry/Munich3/CycleBeginningForm.cs | 119 --- .../Munich3/CycleBeginningForm.pl.resx | 162 --- .../DataEntry/Munich3/CycleBeginningForm.resx | 987 ------------------ .../Munich3/CycleBeginningForm.ru.resx | 162 --- .../Munich3/CycleEndForm.Designer.cs | 514 --------- .../DataEntry/Munich3/CycleEndForm.cs | 194 ---- .../DataEntry/Munich3/CycleEndForm.resx | 120 --- .../DataEntry/Munich3/EntryForm.cs | 263 ----- .../DataEntry/Munich3/EntryFormCfg.cs | 52 - .../DataEntry/Munich3/EntryFormCfgCtrl.cs | 81 -- .../Munich3/EntryFormCfgCtrl.designer.cs | 178 ---- .../DataEntry/Munich3/EntryFormCfgCtrl.resx | 120 --- .../DataEntry/Munich3/EntryFormFactory.cs | 27 - .../DataEntry/Munich3/TestStartEndForm.cs | 405 ------- .../Munich3/TestStartEndForm.designer.cs | 512 --------- .../DataEntry/Munich3/TestStartEndForm.resx | 120 --- .../StandardCamera/CycleEndFormMunich.cs | 194 ---- .../CycleEndFormMunich.designer.cs | 514 --------- .../StandardCamera/CycleEndFormMunich.resx | 120 --- .../DataEntry/StandardCamera/EntryForm.cs | 34 +- .../DataEntry/StandardCamera/EntryFormCfg.cs | 8 - .../StandardCamera/EntryFormCfgCtrl.cs | 14 +- .../EntryFormCfgCtrl.designer.cs | 282 ++--- .../Output/Printers/Munich/Printer.cs | 73 -- .../Output/Printers/Munich/PrinterCfg.cs | 50 - .../Output/Printers/Munich/PrinterCfgCtrl.cs | 98 -- .../Munich/PrinterCfgCtrl.designer.cs | 147 --- .../Printers/Munich/PrinterCfgCtrl.resx | 120 --- .../Output/Printers/Munich/PrinterFactory.cs | 27 - TBF/BenchControl/TbfComponents.cs | 4 - .../WaterMeters/Munich/ProcParams.cs | 206 ---- .../WaterMeters/Munich/WaterMeter.cs | 115 -- .../WaterMeters/Munich/WaterMeterCfg.cs | 46 - .../WaterMeters/Munich/WaterMeterCfgCtrl.cs | 71 -- .../Munich/WaterMeterCfgCtrl.designer.cs | 86 -- .../WaterMeters/Munich/WaterMeterCfgCtrl.resx | 120 --- .../WaterMeters/Munich/WaterMeterFactory.cs | 27 - TBF/TBF.csproj | 109 -- TBF/UI/ResultsMI/PreviousResultsDlg.cs | 14 - 65 files changed, 101 insertions(+), 9736 deletions(-) delete mode 100644 Results/Output/Printers/Munich/MunichPrintDocument.cs delete mode 100644 ResultsBrowser/Filters/ProtocolFilter.cs delete mode 100644 ResultsBrowser/Filters/ProtocolFilterUI.Designer.cs delete mode 100644 ResultsBrowser/Filters/ProtocolFilterUI.cs delete mode 100644 ResultsBrowser/Filters/ProtocolFilterUI.resx delete mode 100644 TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.resx delete mode 100644 TBF/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich/CycleEndForm.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich/CycleEndForm.resx delete mode 100644 TBF/BenchControl/DataEntry/Munich/EntryForm.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich/EntryFormCfg.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.designer.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.resx delete mode 100644 TBF/BenchControl/DataEntry/Munich/EntryFormFactory.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.pl.resx delete mode 100644 TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx delete mode 100644 TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.ru.resx delete mode 100644 TBF/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich3/CycleEndForm.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich3/CycleEndForm.resx delete mode 100644 TBF/BenchControl/DataEntry/Munich3/EntryForm.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich3/EntryFormCfg.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.designer.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.resx delete mode 100644 TBF/BenchControl/DataEntry/Munich3/EntryFormFactory.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.designer.cs delete mode 100644 TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.resx delete mode 100644 TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.cs delete mode 100644 TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.designer.cs delete mode 100644 TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.resx delete mode 100644 TBF/BenchControl/Output/Printers/Munich/Printer.cs delete mode 100644 TBF/BenchControl/Output/Printers/Munich/PrinterCfg.cs delete mode 100644 TBF/BenchControl/Output/Printers/Munich/PrinterCfgCtrl.cs delete mode 100644 TBF/BenchControl/Output/Printers/Munich/PrinterCfgCtrl.designer.cs delete mode 100644 TBF/BenchControl/Output/Printers/Munich/PrinterCfgCtrl.resx delete mode 100644 TBF/BenchControl/Output/Printers/Munich/PrinterFactory.cs delete mode 100644 TBF/BenchControl/WaterMeters/Munich/ProcParams.cs delete mode 100644 TBF/BenchControl/WaterMeters/Munich/WaterMeter.cs delete mode 100644 TBF/BenchControl/WaterMeters/Munich/WaterMeterCfg.cs delete mode 100644 TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.cs delete mode 100644 TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.designer.cs delete mode 100644 TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.resx delete mode 100644 TBF/BenchControl/WaterMeters/Munich/WaterMeterFactory.cs diff --git a/Results/BatchResults.cs b/Results/BatchResults.cs index bf76d0a9e..ee1372102 100644 --- a/Results/BatchResults.cs +++ b/Results/BatchResults.cs @@ -66,7 +66,6 @@ namespace Results ProcedureDescription = procedure.Description, WatermetersStr = procedure.Watermeters, ProcedureRevision = procedure.Revision, - ProtocolTitle = string.Empty, StartTime = DateTime.Now, SampleDensity = realDensity, SampleTemp = atTemperature, diff --git a/Results/Entities/Batch.cs b/Results/Entities/Batch.cs index 67dcebb88..e238392b9 100644 --- a/Results/Entities/Batch.cs +++ b/Results/Entities/Batch.cs @@ -26,7 +26,6 @@ namespace Results.Entities public virtual string ProcedureDescription { get; set; } /// CEVAK, not mapped to DB public virtual int ProcedureRevision { get; set; } public virtual string WatermetersStr { get; set; } /// CEVAK, not mapped to DB - public virtual string ProtocolTitle { get; set; } public virtual string Remark { get; set; } public virtual double SampleDensity { get; set; } /// Sample denisty in [kg/m3] public virtual double SampleTemp { get; set; } /// Sample temperature when density measured [°C] @@ -114,8 +113,6 @@ namespace Results.Entities IsRemoteProcedure = false; ProcedureDescription = string.Empty; WatermetersStr = string.Empty; - ProtocolTitle = string.Empty; - ProtocolTitle = string.Empty; Remark = string.Empty; SampleDensity = Config.Data.SampleDensity; SampleTemp = Config.Data.SampleTemp; @@ -282,11 +279,10 @@ namespace Results.Entities public virtual string ToString(int i) { - return string.Format("Batch: BatchNr={0} ProgramVersion={1} TestBenchId={2} UserName={3} UserNumber={4} ProcedureName={5}{6} ProcRev={7} ProtocolTitle={8} Remark={9} RealDensity={10} AtTemperature={11} Buoyancy={12} StartTime={13} EndTime={14} Dirty={15} RsltsSent={16} RsltsPrinted={17}", + return string.Format("Batch: BatchNr={0} ProgramVersion={1} TestBenchId={2} UserName={3} UserNumber={4} ProcedureName={5}{6} ProcRev={7} Remark={8} RealDensity={9} AtTemperature={10} Buoyancy={11} StartTime={12} EndTime={13} Dirty={14} RsltsSent={15} RsltsPrinted={16}", BatchNr, ProgramVersion, TestBenchId, UserName, UserNumber, ProcedureName, (IsRemoteProcedure ? "(R)" : ""), ProcedureRevision, - ProtocolTitle, Remark, SampleDensity, SampleTemp, Buoyancy, - StartTime, EndTime, Dirty, RsltsSent, RsltsPrinted); + Remark, SampleDensity, SampleTemp, Buoyancy, StartTime, EndTime, Dirty, RsltsSent, RsltsPrinted); } public virtual void WriteBinary(BinaryWriter writer) @@ -308,7 +304,6 @@ namespace Results.Entities writer.Write((ProcedureDescription != null) ? ProcedureDescription : string.Empty); writer.Write(ProcedureRevision); writer.Write((WatermetersStr != null) ? WatermetersStr : string.Empty); - writer.Write((ProtocolTitle != null) ? ProtocolTitle : string.Empty); writer.Write((Remark != null) ? Remark : string.Empty); writer.Write(SampleDensity); writer.Write(SampleTemp); @@ -375,7 +370,6 @@ namespace Results.Entities ProcedureDescription = reader.ReadString(); ProcedureRevision = reader.ReadInt32(); WatermetersStr = reader.ReadString(); - ProtocolTitle = reader.ReadString(); Remark = reader.ReadString(); SampleDensity = reader.ReadDouble(); SampleTemp = reader.ReadDouble(); diff --git a/Results/Mappings/BatchMap.cs b/Results/Mappings/BatchMap.cs index cd976f85f..19a1d29e0 100644 --- a/Results/Mappings/BatchMap.cs +++ b/Results/Mappings/BatchMap.cs @@ -18,7 +18,6 @@ namespace Results.Mappings Map(x => x.UserNumber); Map(x => x.ProcedureName); Map(x => x.ProcedureRevision); - Map(x => x.ProtocolTitle); Map(x => x.Remark) .CustomType("StringClob") .CustomSqlType("varchar(2000)"); diff --git a/Results/Output/Printers/Munich/MunichPrintDocument.cs b/Results/Output/Printers/Munich/MunichPrintDocument.cs deleted file mode 100644 index eeb422750..000000000 --- a/Results/Output/Printers/Munich/MunichPrintDocument.cs +++ /dev/null @@ -1,630 +0,0 @@ -/// -/// Copyright (c) 2016-2018 Sensus Slovensko a.s. -/// -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Drawing.Printing; -using Config.Entities; -using System.IO; -using Results.Resources; - -namespace Results.Output.Printers.Munich -{ - public class MunichPrintDocument : PrintDocument - { - const string FontFamilyName = "Arial"; ///"Times New Roman"; - - const int SpacingOne = 18; - const int SpacingOneAndHalf = 24; /// was 27 before - const int TitleX = 240; - const int TitleY = 180; /// Depends on the size of the header - const int FirstLineNr = 14; /// Depends on the size of the header - const int Tab1 = 80; /// Positions of columns above the table - const int Tab2 = 240; - const int Tab3 = 430; - const int Tab4 = 590; - const int BorderW = 1; /// Table border line width - const int MarginTop = 7; /// Margins of the text from table lines - const int MarginLeft = 4; /// Margins of the text from table lines - - /// - /// Data to print - /// - readonly string docVersion; - readonly Results.Entities.WaterMeter wm; - string zaehlertyp; - string pruefvorlage; - - readonly IList results; - readonly int resultsCount; - readonly bool compound; /// true when MetersKind is MetersKind.Combined - - - int pageNr; /// Current page number - int nrPages; /// Total number of pages - float tableTop; /// Top coordinate of the table - - int[] firstTblRowsOnPage; - int[] secondTblRowsOnPage; - - - PageOrientation pageOrientation; - - /// - /// Property variable for the Font the user wishes to use - /// - Font font; - Font boldFont; - Font fontTitle; - - /// - /// Table style - /// - static TableStyle tableStyle = new TableStyle - { - Font = new Font(FontFamilyName, 10, FontStyle.Regular), - HeaderFont = new Font(FontFamilyName, 10, FontStyle.Regular), - MarginX = 7, - MarginY = 5, - LineWidth = 1, - TopHeadersCount = 1, - HorizLines = TableLines.FirstSecondAndLast, - VertLines = TableLines.All, - ColumnWidths = new float[] { 150, 70, 75, 75, 70, 75, 75 }, - }; - static Alignment[] horizontalAlignment = new Alignment[] /// Horizontal alignment of items of one row - { - Alignment.Left, Alignment.Left, Alignment.Left, - Alignment.Left, Alignment.Left, Alignment.Left, Alignment.Left - }; - static VertAlignment[] verticalAlignment = new VertAlignment[] /// Vertical alignment of items of one row - { - VertAlignment.Middle, VertAlignment.Middle, VertAlignment.Middle, - VertAlignment.Middle, VertAlignment.Middle, VertAlignment.Middle, VertAlignment.Middle - }; - - - /// - /// Constructor - /// - /// Text to be printed - public MunichPrintDocument(string docVersion, - Results.Entities.WaterMeter wm, - PageOrientation pageOrientation) - { - this.docVersion = docVersion; - this.wm = wm; - this.compound = wm.Compound(); - this.pageOrientation = pageOrientation; - - string[] info = wm.ProductName().Split(new char[] { ';' }); - if (info.Length >= 2) - { - pruefvorlage = info[0]; - zaehlertyp = info[1]; - } - else if (info.Length == 1) - { - pruefvorlage = info[0]; - zaehlertyp = compound ? "Verbundzähler" : "Einzelzähler"; - } - else - { - pruefvorlage = wm.ProcedureName(); - zaehlertyp = compound ? "Verbundzähler" : "Einzelzähler"; - } - - results = wm.RegularMeterTestRslts(); - - resultsCount = 0; - foreach (var mtr in wm.RegularMeterTestRslts()) - { - if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always) resultsCount++; - } - - pageNr = 1; - if (compound) - { - /// Compound meter results - const int MaxOnFirstPage = 23; - const int MaxOnPage = 45; - if (resultsCount <= 7) - { - nrPages = 1; - firstTblRowsOnPage = new int[] { resultsCount }; - secondTblRowsOnPage = new int[] { resultsCount }; - } - else if (resultsCount <= MaxOnFirstPage) - { - nrPages = 2; - firstTblRowsOnPage = new int[] { resultsCount, 0 }; - secondTblRowsOnPage = new int[] { 0, int.MaxValue }; - } - else if (resultsCount <= MaxOnPage) - { - nrPages = 3; - firstTblRowsOnPage = new int[] { MaxOnFirstPage, (resultsCount - MaxOnFirstPage), 0 }; - int secondTblRowsOn2ndPage = Math.Max(0, MaxOnFirstPage + MaxOnPage - 2 - resultsCount); - secondTblRowsOnPage = new int[] { 0, secondTblRowsOn2ndPage, resultsCount - secondTblRowsOn2ndPage }; - } - else if (resultsCount <= MaxOnFirstPage + MaxOnPage) - { - nrPages = 4; - firstTblRowsOnPage = new int[] { MaxOnFirstPage, MaxOnPage, 0, 0 }; - secondTblRowsOnPage = new int[] { 0, 0, MaxOnPage, MaxOnFirstPage }; - } - else - { - nrPages = 5; - firstTblRowsOnPage = new int[] { MaxOnFirstPage, MaxOnPage, (resultsCount - MaxOnFirstPage - MaxOnPage), 0 }; - secondTblRowsOnPage = new int[] { 0, 0, Math.Max(0, MaxOnFirstPage + 2 * MaxOnPage - 2 - resultsCount), MaxOnPage, MaxOnFirstPage }; - } - } - else - { - /// Regular (single) meter results - const int MaxOnFirstPage = 27; - const int MaxOnPage = 45; - if (resultsCount <= 9) - { - nrPages = 1; - firstTblRowsOnPage = new int[] { resultsCount }; - secondTblRowsOnPage = new int[] { resultsCount }; - } - else if (resultsCount <= MaxOnFirstPage) - { - nrPages = 2; - firstTblRowsOnPage = new int[] { resultsCount, 0 }; - secondTblRowsOnPage = new int[] { 0, int.MaxValue }; - } - else if (resultsCount <= MaxOnPage) - { - nrPages = 3; - firstTblRowsOnPage = new int[] { MaxOnFirstPage, (resultsCount - MaxOnFirstPage), 0 }; - int secondTblRowsOn2ndPage = Math.Max(0, MaxOnFirstPage + MaxOnPage - 2 - resultsCount); - secondTblRowsOnPage = new int[] { 0, secondTblRowsOn2ndPage, resultsCount - secondTblRowsOn2ndPage }; - } - else if (resultsCount <= MaxOnFirstPage + MaxOnPage) - { - nrPages = 4; - firstTblRowsOnPage = new int[] { MaxOnFirstPage, MaxOnPage, 0, 0 }; - secondTblRowsOnPage = new int[] { 0, 0, MaxOnPage, MaxOnFirstPage }; - } - else - { - nrPages = 5; - firstTblRowsOnPage = new int[] { MaxOnFirstPage, MaxOnPage, (resultsCount - MaxOnFirstPage - MaxOnPage), 0 }; - secondTblRowsOnPage = new int[] { 0, 0, Math.Max(0, MaxOnFirstPage + 2 * MaxOnPage - 2 - resultsCount), MaxOnPage, MaxOnFirstPage }; - } - } - - DefaultPageSettings.Landscape = (pageOrientation == PageOrientation.Landscape); - } - - /// - /// Override the default onbeginPrint method of the PrintDocument Object. - /// - /// - /// - protected override void OnBeginPrint(System.Drawing.Printing.PrintEventArgs e) - { - base.OnBeginPrint(e); - - if (font == null) { font = new Font(FontFamilyName, 10, FontStyle.Regular); } - if (boldFont == null) { boldFont = new Font(FontFamilyName, 10, FontStyle.Bold); } - if (fontTitle == null) { fontTitle = new Font(FontFamilyName, 24, FontStyle.Bold); } - } - - /// - /// Override the default OnPrintPage method of the PrintDocument. - /// - /// - /// This provides the print logic for our document - protected override void OnPrintPage(System.Drawing.Printing.PrintPageEventArgs e) - { - /// Run base code - base.OnPrintPage(e); - - if (pageOrientation == PageOrientation.Portrait) - { - string[] templatePaths = new string[] { "C:\\TBF\\Templates\\MunichP.jpg", "C:\\TBF\\Templates\\MunichP.png", "C:\\TBF\\Templates\\MunichP.tif" }; - foreach (var t in templatePaths) - { - if (File.Exists(t)) - { - e.Graphics.DrawImage(new Bitmap(Image.FromFile(t), 827, 1169), new Rectangle(0, 0, 827, 1169)); - break; - } - } - } - else - { - string[] templatePaths = new string[] { "C:\\TBF\\Templates\\MunichL.jpg", "C:\\TBF\\Templates\\MunichL.png", "C:\\TBF\\Templates\\MunichL.tif" }; - foreach (var t in templatePaths) - { - if (File.Exists(t)) - { - e.Graphics.DrawImage(new Bitmap(Image.FromFile(t), 1169, 827), new Rectangle(0, 0, 1169, 827)); - break; - } - } - } - - /// Set print area size and margins (in dots using 80 dpi) - int printHeight = base.DefaultPageSettings.PaperSize.Height - base.DefaultPageSettings.Margins.Top - base.DefaultPageSettings.Margins.Bottom; - int printWidth = base.DefaultPageSettings.PaperSize.Width - base.DefaultPageSettings.Margins.Left - base.DefaultPageSettings.Margins.Right; - int leftMargin = base.DefaultPageSettings.Margins.Left; /// X - int topMargin = base.DefaultPageSettings.Margins.Top; /// Y - - /// Check if the user selected to print in Landscape mode - /// if they did then we need to swap height/width parameters - if (base.DefaultPageSettings.Landscape) - { - int tmp = printHeight; - printHeight = printWidth; - printWidth = tmp; - } - - int x = leftMargin; - int y = topMargin; - - /// Use the StringFormat class for the text layout of our document - StringFormat format = new StringFormat(StringFormatFlags.LineLimit); - - int lineNr = FirstLineNr; - - if (pageNr == 1) - { - /// This is the first page, drad the title, common part and the 1st table - - RectangleF printArea = new RectangleF(TitleX, TitleY, 667, 50); - e.Graphics.DrawString(wm.Batch.ProtocolTitle, this.fontTitle, Brushes.Black, printArea); - - DrawCommonTop(e, ref lineNr, wm, pruefvorlage, docVersion); - - lineNr += 2; - tableTop = SpacingOne * lineNr; - } - else - { - /// This appears on the top of the 2nd and every subsequent page. - /// 2nd table starts from the top of the page. - lineNr -= 3; - - if (compound) - { - PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Hauptzahler"); - PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Nebenzahler"); - lineNr++; - } - - PrintAt(e, Tab1, lineNr * SpacingOne, "Hersteller :"); - PrintAt(e, Tab2, lineNr * SpacingOne, wm.Producer()); - if (compound) - { - PrintAt(e, Tab3, lineNr * SpacingOne, "Hersteller :"); - PrintAt(e, Tab4, lineNr * SpacingOne, wm.ProducerAux()); - } - lineNr++; - - PrintAt(e, Tab1, lineNr * SpacingOne, "Seriennummer :"); - PrintAt(e, Tab2, lineNr * SpacingOne, wm.SerialNr); - if (compound) - { - PrintAt(e, Tab3, lineNr * SpacingOne, "Seriennummer :"); - PrintAt(e, Tab4, lineNr * SpacingOne, wm.SerialNrAux); - } - lineNr += ((resultsCount + 2) * SpacingOneAndHalf) / SpacingOne + 2; - - tableTop = TitleY + (compound ? 5 : 4) * SpacingOne; - } - - if (firstTblRowsOnPage[pageNr - 1] > 0) - { - int from = 0; - for (int pN = 0; pN < pageNr - 1; pN++) from += firstTblRowsOnPage[pN]; - Table table1 = PrepareTableOne(from, from + firstTblRowsOnPage[pageNr - 1] - 1); - tableTop = table1.Draw(e, Tab1, tableTop) + SpacingOneAndHalf; - } - - - if (secondTblRowsOnPage[pageNr - 1] > 0) - { - int from = 0; - for (int pN = 0; pN < pageNr - 1; pN++) from += secondTblRowsOnPage[pN]; - Table table2 = PrepareTableTwo(from, from + secondTblRowsOnPage[pageNr - 1] - 1); - tableTop = table2.Draw(e, Tab1, tableTop) + SpacingOneAndHalf; - } - - if (pageNr == nrPages) - { - int top = topMargin + printHeight - 8 * SpacingOne; - DrawCommonBottom(e, top, wm); - } - else - { - e.HasMorePages = true; - } - - /// - /// Draw a footer and increment the page number - /// - string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr++, nrPages); - int pageNrWidth = (int)e.Graphics.MeasureString(pageNrText, font).Width; - PrintAt(e, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - SpacingOne, pageNrText); - } - - /// - /// Prepares content and style of the first table. - /// - /// 0-based index fo the first result to print - /// 0-based index fo the last result to print - /// Prepared table - Table PrepareTableOne(int from = 0, int to = int.MaxValue) - { - Table table = new Table(7); - table.Style = tableStyle; - - string[] tableHeader = new string[] - { - "Prüflauf", - "Q [l/h]", - "Prüf-Vol.[l]", - compound ? "HZ-Vol.[l]" : "Z-Vol.[l]", - compound ? "NZ-Vol.[l]" : "-", - "Fehler [%]", - "Ergebnis", - }; - table.AddRow(tableHeader, horizontalAlignment, verticalAlignment); - - int rowCount = 0; - foreach (var mtr in wm.RegularMeterTestRslts()) - { - if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always) - { - if (from <= rowCount && rowCount <= to) - { - double flow_ctv = (mtr.TestRslt.TestTime != 0) ? (3.6 * mtr.TestRslt.VolumeCTV / mtr.TestRslt.TestTime) : 0; - - if (compound) - { - Results.Entities.MeterTestRslt mainMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain); - Results.Entities.MeterTestRslt auxMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundAux); - - table.AddRow(new string[] { mtr.Name(), - Config.Units.ConvertTo(Config.Unit.lph, flow_ctv).ToString("F1"), - mtr.TestRslt.VolumeCTV.ToString("F2"), - mainMtr.VolumeMeter.ToString("F2"), - auxMtr.VolumeMeter.ToString("F2"), - mtr.Error.ToString("F2"), - mtr.Passed ? "iO" : "NiO" }, - horizontalAlignment, - verticalAlignment); - } - else - { - table.AddRow(new string[] { mtr.Name(), - Config.Units.ConvertTo(Config.Unit.lph, flow_ctv).ToString("F1"), - mtr.TestRslt.VolumeCTV.ToString("F2"), - mtr.VolumeMeter.ToString("F2"), - "-", - mtr.Error.ToString("F2"), - mtr.Passed ? "iO" : "NiO" }, - - horizontalAlignment, - verticalAlignment); - } - } - rowCount++; - } - } - - return table; - } - - /// - /// Prepares content and style of the second table. - /// - /// 0-based index fo the first result to print - /// 0-based index fo the last result to print - /// Prepared table - Table PrepareTableTwo(int from = 0, int to = int.MaxValue) - { - Table table = new Table(7); - table.Style = tableStyle; - - string[] tableHeader = new string[] - { - "", - "Q [l/h]", - "Temperatur", - "Dichte", - "Prüfzeit", - "Druck Eing.", - "Druck Ausg.", - }; - table.AddRow(tableHeader, horizontalAlignment, verticalAlignment); - - int rowCount = 0; - foreach (var mtr in wm.RegularMeterTestRslts()) - { - if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always) - { - if (from <= rowCount && rowCount <= to) - { - double flow_ctv = (mtr.TestRslt.TestTime != 0) ? (3.6 * mtr.TestRslt.VolumeCTV / mtr.TestRslt.TestTime) : 0; - - table.AddRow(new string[] { mtr.Name(), - Config.Units.ConvertTo(Config.Unit.lph, flow_ctv).ToString("F1"), - mtr.TestRslt.TempDownMean.ToString("F2"), - mtr.TestRslt.DensityDiv.ToString("F2"), - mtr.TestTime.ToString("F1"), - Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressUpMean).ToString("F3"), - Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressDownMean).ToString("F3") }, - horizontalAlignment, - verticalAlignment); - } - rowCount++; - } - } - - return table; - } - - /// - /// Prints text on the top of the first page (title, common information). - /// - /// - /// - /// - /// - /// - void DrawCommonTop(PrintPageEventArgs e, ref int lineNr, Entities.WaterMeter wm, string pruefvorlage, string docVersion) - { - /// - /// - /// - PrintAt(e, Tab1, lineNr * SpacingOne, docVersion); - lineNr++; - PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Prüfstand Nr :"); - PrintBoldAt(e, Tab2, lineNr * SpacingOne, wm.BenchId().ToString()); - PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Datum :"); - PrintBoldAt(e, Tab4, lineNr * SpacingOne, wm.Batch.EndTime.Date.ToString("d")); - lineNr++; - PrintAt(e, Tab1, lineNr * SpacingOne, "Zählertyp :"); - PrintAt(e, Tab2, lineNr * SpacingOne, zaehlertyp); - PrintAt(e, Tab3, lineNr * SpacingOne, "Eichjahr :"); - PrintAt(e, Tab4, lineNr * SpacingOne, wm.YearOfProduction.ToString()); - lineNr++; - PrintAt(e, Tab1, lineNr * SpacingOne, "Prüfvorlage :"); - PrintAt(e, Tab2, lineNr * SpacingOne, pruefvorlage); - lineNr += 2; - - if (compound) - { - PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Hauptzahler"); - PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Nebenzahler"); - lineNr++; - } - - PrintAt(e, Tab1, lineNr * SpacingOne, "Hersteller :"); - PrintAt(e, Tab2, lineNr * SpacingOne, wm.Producer()); - if (compound) - { - PrintAt(e, Tab3, lineNr * SpacingOne, "Hersteller :"); - PrintAt(e, Tab4, lineNr * SpacingOne, wm.ProducerAux()); - } - lineNr++; - - PrintAt(e, Tab1, lineNr * SpacingOne, "Seriennummer :"); - PrintAt(e, Tab2, lineNr * SpacingOne, wm.SerialNr); - if (compound) - { - PrintAt(e, Tab3, lineNr * SpacingOne, "Seriennummer :"); - PrintAt(e, Tab4, lineNr * SpacingOne, wm.SerialNrAux); - } - lineNr++; - - PrintAt(e, Tab1, lineNr * SpacingOne, wm.NewQnames() ? "Q3 :" : "Qn :"); - PrintAt(e, Tab2, lineNr * SpacingOne, wm.Q3_Qn().ToString()); - if (compound) - { - PrintAt(e, Tab3, lineNr * SpacingOne, wm.NewQnames() ? "Q3 :" : "Qn :"); - PrintAt(e, Tab4, lineNr * SpacingOne, wm.Q3_Qn_Aux().ToString()); - } - lineNr++; - - PrintAt(e, Tab1, lineNr * SpacingOne, "Zulassungszeichen :"); - PrintAt(e, Tab2, lineNr * SpacingOne, wm.ApprovalInfo()); - if (compound) - { - PrintAt(e, Tab3, lineNr * SpacingOne, "Zulassungszeichen :"); - PrintAt(e, Tab4, lineNr * SpacingOne, wm.ApprovalInfoAux()); - } - lineNr++; - - PrintAt(e, Tab1, lineNr * SpacingOne, "Metr. klasse :"); - PrintAt(e, Tab2, lineNr * SpacingOne, wm.MetrologicalClass()); - if (compound) - { - PrintAt(e, Tab3, lineNr * SpacingOne, "Metr. klasse :"); - PrintAt(e, Tab4, lineNr * SpacingOne, wm.MetrologicalClassAux()); - } - lineNr++; - - PrintAt(e, Tab1, lineNr * SpacingOne, "Stand :"); - PrintAt(e, Tab2, lineNr * SpacingOne, wm.EndState); - if (compound) - { - PrintAt(e, Tab3, lineNr * SpacingOne, "Stand :"); - PrintAt(e, Tab4, lineNr * SpacingOne, wm.EndStateAux); - - lineNr += 2; - PrintAt(e, Tab1, lineNr * SpacingOne, "Umschaltpunkte :"); - lineNr++; - PrintAt(e, Tab1, lineNr * SpacingOne, "Qsteig"); - PrintAt(e, Tab2, lineNr * SpacingOne, (1000.0 * wm.QRise).ToString("F1") + " l/h"); - lineNr++; - PrintAt(e, Tab1, lineNr * SpacingOne, "Qfall"); - PrintAt(e, Tab2, lineNr * SpacingOne, (1000.0 * wm.QFall).ToString("F1") + " l/h"); - } - } - - /// - /// Prints text at the bottom of the last page (footer). - /// - /// - /// - /// - void DrawCommonBottom(PrintPageEventArgs e, float top, Entities.WaterMeter wm) - { - int iTop = (int)top; - - PrintAt(e, Tab1, iTop, "Temperatur"); - PrintAt(e, Tab2, iTop, wm.Batch.AmbTempMean().ToString("F1") + " \x00b0C"); - - iTop += SpacingOne; - - PrintAt(e, Tab1, iTop, "Feuchtigkeit"); - PrintAt(e, Tab2, iTop, wm.Batch.AmbHumiMean().ToString("F0") + " %"); - - iTop += SpacingOne; - - PrintAt(e, Tab1, iTop, "Luftdruck"); - PrintAt(e, Tab2, iTop, Config.Units.ConvertTo(Config.Unit.mbar, wm.Batch.AmbPressMean()).ToString("F0") + " mbar"); - - iTop += SpacingOne; - - PrintAt(e, Tab3, iTop, wm.Batch.EndTime.Date.ToString("d")); - - iTop += SpacingOne; - - PrintAt(e, Tab3, iTop, "Datum"); - PrintAt(e, Tab4, iTop, "Unterschrift"); - } - - - void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, Point p, string text) - { - PrintAt(e, p.X, p.Y, text); - } - - void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, int x, int y, string text) - { - RectangleF printArea = new RectangleF(x, y, 667, SpacingOne); - e.Graphics.DrawString(text, this.font, Brushes.Black, printArea); - } - - void PrintBoldAt(System.Drawing.Printing.PrintPageEventArgs e, Point p, string text) - { - PrintBoldAt(e, p.X, p.Y, text); - } - - void PrintBoldAt(System.Drawing.Printing.PrintPageEventArgs e, int x, int y, string text) - { - RectangleF printArea = new RectangleF(x, y, 667, SpacingOne); - e.Graphics.DrawString(text, this.boldFont, Brushes.Black, printArea); - } - } -} diff --git a/Results/Results.csproj b/Results/Results.csproj index e0fec7b5b..b95b0532b 100644 --- a/Results/Results.csproj +++ b/Results/Results.csproj @@ -166,9 +166,6 @@ Component - - Component - Component diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs index 4d0649d77..81438110e 100644 --- a/Results/WMeterRsltItemSpec.cs +++ b/Results/WMeterRsltItemSpec.cs @@ -405,7 +405,6 @@ namespace Results AllItems.Add(new WMeterRsltItemSpec(ItemID.User_description, Strings.User_description, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, Users.Entities.User.EncodedStrToFullName(w.Batch.UserName)))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Legalizator, Strings.Legalizator, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, Users.Entities.User.EncodedStrToLegalizator(w.Batch.UserName)))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Watermeters, Strings.WMs, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.Batch.WatermetersStr))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Protocol_title, Strings.Protocol, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.Batch.ProtocolTitle))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_start_time, Strings.Start, Quantity.DateTime, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.Batch.StartTime.ToString() : string.Format(f, w.Batch.StartTime))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_end_time, Strings.End, Quantity.DateTime, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.Batch.EndTime.ToString() : string.Format(f, w.Batch.EndTime))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Lite_per_pulse_Read, "1 / PlsPerLtr_Read", Quantity.PulsePerLtr, ItemCategory.Other, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", (w.WaterMeterData.PulsesPerLtr != 0) ? 1/w.WaterMeterData.PulsesPerLtr : 0))); diff --git a/ResultsBrowser/Filters/Factory.cs b/ResultsBrowser/Filters/Factory.cs index 8ea910bd7..32972e7e9 100644 --- a/ResultsBrowser/Filters/Factory.cs +++ b/ResultsBrowser/Filters/Factory.cs @@ -20,7 +20,6 @@ namespace ResultsBrowser.Filters DateFilter.GetFilterID(), BatchNrFilter.GetFilterID(), ProcedureFilter.GetFilterID(), - ProtocolFilter.GetFilterID(), QnFilter.GetFilterID(), SerialNrFilter.GetFilterID(), WMPositionFilter.GetFilterID(), @@ -31,7 +30,6 @@ namespace ResultsBrowser.Filters DateFilter.GetFilterName(), BatchNrFilter.GetFilterName(), ProcedureFilter.GetFilterName(), - ProtocolFilter.GetFilterName(), QnFilter.GetFilterName(), SerialNrFilter.GetFilterName(), WMPositionFilter.GetFilterName(), @@ -46,7 +44,6 @@ namespace ResultsBrowser.Filters if (filterID == DateFilter.GetFilterID()) return new DateFilter(); else if (filterID == BatchNrFilter.GetFilterID()) return new BatchNrFilter(); else if (filterID == ProcedureFilter.GetFilterID()) return new ProcedureFilter(); - else if (filterID == ProtocolFilter.GetFilterID()) return new ProtocolFilter(); else if (filterID == QnFilter.GetFilterID()) return new QnFilter(); else if (filterID == SerialNrFilter.GetFilterID()) return new SerialNrFilter(); else if (filterID == WMPositionFilter.GetFilterID()) return new WMPositionFilter(); @@ -62,7 +59,6 @@ namespace ResultsBrowser.Filters if (filterID == DateFilter.GetFilterID()) type = typeof(DateFilter); else if (filterID == BatchNrFilter.GetFilterID()) type = typeof(BatchNrFilter); else if (filterID == ProcedureFilter.GetFilterID()) type = typeof(ProcedureFilter); - else if (filterID == ProtocolFilter.GetFilterID()) type = typeof(ProtocolFilter); else if (filterID == QnFilter.GetFilterID()) type = typeof(QnFilter); else if (filterID == SerialNrFilter.GetFilterID()) type = typeof(SerialNrFilter); else if (filterID == WMPositionFilter.GetFilterID()) type = typeof(WMPositionFilter); diff --git a/ResultsBrowser/Filters/ProtocolFilter.cs b/ResultsBrowser/Filters/ProtocolFilter.cs deleted file mode 100644 index 2750f5bf1..000000000 --- a/ResultsBrowser/Filters/ProtocolFilter.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using System.Windows.Forms; -using System.Xml.Serialization; -using NHibernate; -using Results.Entities; -using ResultsBrowser.Resources; - -namespace ResultsBrowser.Filters -{ - public class ProtocolFilter : IFilter - { - public static string GetFilterID() { return "Protocol"; } - public static string GetFilterName() { return Strings.Protocol; } - - /// - /// Obligatory wrappers - /// - public string GetThisFilterID() { return GetFilterID(); } - public void Save(StringBuilder sb) { (new XmlSerializer(this.GetType())).Serialize(new StringWriter(sb), this); } - public void Data2UI() { userIface.Data2UI(); } - public void UI2Data() { userIface.UI2Data(); } - public UserControl GetFilterUI() { return userIface as UserControl; } - - /// - /// Serialized filter data - /// - public string Protocol; - - - private ProtocolFilterUI userIface; - - public ProtocolFilter() - { - userIface = new ProtocolFilterUI(this); - } - - public IList ExecuteQuery(ISession[] sessions, IList waterMeters) - { - IList filteredWaterMeters = new List(); - - if (waterMeters == null) - { - foreach (var se in sessions) - { - IList batches = se.QueryOver() - .Where(x => (x.ProtocolTitle == Protocol)) - .List(); - - foreach (var b in batches) - { - foreach (var wm in b.WaterMeters) filteredWaterMeters.Add(wm); - } - } - } - else - { - foreach (var wm in waterMeters) - { - if (wm.Batch.ProtocolTitle == Protocol) filteredWaterMeters.Add(wm); - } - } - - return filteredWaterMeters; - } - } -} diff --git a/ResultsBrowser/Filters/ProtocolFilterUI.Designer.cs b/ResultsBrowser/Filters/ProtocolFilterUI.Designer.cs deleted file mode 100644 index 7217e8957..000000000 --- a/ResultsBrowser/Filters/ProtocolFilterUI.Designer.cs +++ /dev/null @@ -1,72 +0,0 @@ -namespace ResultsBrowser.Filters -{ - partial class ProtocolFilterUI - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.protocolTextBox = new System.Windows.Forms.TextBox(); - this.groupBox1.SuspendLayout(); - this.SuspendLayout(); - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.protocolTextBox); - this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox1.Location = new System.Drawing.Point(0, 0); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(835, 40); - this.groupBox1.TabIndex = 0; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Procedure"; - // - // procedureTextBox - // - this.protocolTextBox.Location = new System.Drawing.Point(132, 13); - this.protocolTextBox.Name = "procedureTextBox"; - this.protocolTextBox.Size = new System.Drawing.Size(138, 20); - this.protocolTextBox.TabIndex = 0; - // - // ProcedureFilter - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.groupBox1); - this.Name = "ProcedureFilter"; - this.Size = new System.Drawing.Size(835, 40); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.TextBox protocolTextBox; - } -} diff --git a/ResultsBrowser/Filters/ProtocolFilterUI.cs b/ResultsBrowser/Filters/ProtocolFilterUI.cs deleted file mode 100644 index 4a974862c..000000000 --- a/ResultsBrowser/Filters/ProtocolFilterUI.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Windows.Forms; - -namespace ResultsBrowser.Filters -{ - public partial class ProtocolFilterUI : UserControl - { - ProtocolFilter data; - - /// Used only by Designer - public ProtocolFilterUI() - { - InitializeComponent(); - Localize(); - } - - /// Used to create the control aby a filter - public ProtocolFilterUI(ProtocolFilter data) - { - this.data = data; - InitializeComponent(); - Localize(); - } - - void Localize() - { - groupBox1.Text = ProtocolFilter.GetFilterName(); - } - - public void Data2UI() - { - protocolTextBox.Text = (data.Protocol != null) ? data.Protocol : string.Empty; - } - - public void UI2Data() - { - data.Protocol = protocolTextBox.Text; - } - } -} diff --git a/ResultsBrowser/Filters/ProtocolFilterUI.resx b/ResultsBrowser/Filters/ProtocolFilterUI.resx deleted file mode 100644 index 1af7de150..000000000 --- a/ResultsBrowser/Filters/ProtocolFilterUI.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/ResultsBrowser/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj index df877a50b..4dc81a83a 100644 --- a/ResultsBrowser/ResultsBrowser.csproj +++ b/ResultsBrowser/ResultsBrowser.csproj @@ -96,13 +96,6 @@ ProcedureFilterUI.cs - - - UserControl - - - ProtocolFilterUI.cs - UserControl @@ -219,9 +212,6 @@ ProcedureFilterUI.cs - - ProtocolFilterUI.cs - QnFilterUI.cs diff --git a/ResultsBrowser/ResultsBrowserWnd.cs b/ResultsBrowser/ResultsBrowserWnd.cs index 7c61613a0..baf9c1b38 100644 --- a/ResultsBrowser/ResultsBrowserWnd.cs +++ b/ResultsBrowser/ResultsBrowserWnd.cs @@ -409,12 +409,7 @@ namespace ResultsBrowser { if (waterMeters == null || waterMeters.Count == 0) return; -#if MUNICH - foreach (var wm in waterMeters) - { - new Results.Output.Printers.Munich.MunichPrintDocument(string.Format("4/13 - {0}", BenchName()), wm, Config.Entities.PageOrientation.Portrait).Print(); - } -#elif CEVAK_40 +#if CEVAK_40 IList batches = new List(); foreach (var wm in waterMeters) { diff --git a/TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs b/TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs deleted file mode 100644 index 0b5605884..000000000 --- a/TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs +++ /dev/null @@ -1,254 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -namespace TBF.BenchControl.DataEntry.Munich -{ - partial class CycleBeginningForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.okButton = new System.Windows.Forms.Button(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.auxSN1TextBox = new System.Windows.Forms.TextBox(); - this.auxSN1Label = new System.Windows.Forms.Label(); - this.mainSN1TextBox = new System.Windows.Forms.TextBox(); - this.mainSN1Label = new System.Windows.Forms.Label(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.auxSN2TextBox = new System.Windows.Forms.TextBox(); - this.auxSN2Label = new System.Windows.Forms.Label(); - this.mainSN2TextBox = new System.Windows.Forms.TextBox(); - this.mainSN2Label = new System.Windows.Forms.Label(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.auxSN3TextBox = new System.Windows.Forms.TextBox(); - this.auxSN3Label = new System.Windows.Forms.Label(); - this.mainSN3TextBox = new System.Windows.Forms.TextBox(); - this.mainSN3Label = new System.Windows.Forms.Label(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.SuspendLayout(); - // - // okButton - // - this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.okButton.ForeColor = System.Drawing.Color.Black; - this.okButton.Location = new System.Drawing.Point(557, 43); - this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(98, 63); - this.okButton.TabIndex = 0; - this.okButton.Text = "OK"; - this.okButton.UseVisualStyleBackColor = true; - this.okButton.Click += new System.EventHandler(this.okButton_Click); - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.auxSN1TextBox); - this.groupBox1.Controls.Add(this.auxSN1Label); - this.groupBox1.Controls.Add(this.mainSN1TextBox); - this.groupBox1.Controls.Add(this.mainSN1Label); - this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox1.ForeColor = System.Drawing.Color.Black; - this.groupBox1.Location = new System.Drawing.Point(28, 18); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(494, 137); - this.groupBox1.TabIndex = 1; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Water Meter 1"; - // - // auxSN1TextBox - // - this.auxSN1TextBox.Location = new System.Drawing.Point(300, 83); - this.auxSN1TextBox.Name = "auxSN1TextBox"; - this.auxSN1TextBox.Size = new System.Drawing.Size(163, 31); - this.auxSN1TextBox.TabIndex = 3; - // - // auxSN1Label - // - this.auxSN1Label.AutoSize = true; - this.auxSN1Label.Location = new System.Drawing.Point(21, 86); - this.auxSN1Label.Name = "auxSN1Label"; - this.auxSN1Label.Size = new System.Drawing.Size(193, 23); - this.auxSN1Label.TabIndex = 2; - this.auxSN1Label.Text = "Aux. WM Serial Nr."; - // - // mainSN1TextBox - // - this.mainSN1TextBox.Location = new System.Drawing.Point(300, 37); - this.mainSN1TextBox.Name = "mainSN1TextBox"; - this.mainSN1TextBox.Size = new System.Drawing.Size(163, 31); - this.mainSN1TextBox.TabIndex = 1; - // - // mainSN1Label - // - this.mainSN1Label.AutoSize = true; - this.mainSN1Label.Location = new System.Drawing.Point(21, 40); - this.mainSN1Label.Name = "mainSN1Label"; - this.mainSN1Label.Size = new System.Drawing.Size(195, 23); - this.mainSN1Label.TabIndex = 0; - this.mainSN1Label.Text = "Main WM Serial Nr."; - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.auxSN2TextBox); - this.groupBox2.Controls.Add(this.auxSN2Label); - this.groupBox2.Controls.Add(this.mainSN2TextBox); - this.groupBox2.Controls.Add(this.mainSN2Label); - this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox2.ForeColor = System.Drawing.Color.Black; - this.groupBox2.Location = new System.Drawing.Point(28, 175); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(494, 137); - this.groupBox2.TabIndex = 2; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Water Meter 2"; - // - // auxSN2TextBox - // - this.auxSN2TextBox.Location = new System.Drawing.Point(300, 83); - this.auxSN2TextBox.Name = "auxSN2TextBox"; - this.auxSN2TextBox.Size = new System.Drawing.Size(163, 31); - this.auxSN2TextBox.TabIndex = 3; - // - // auxSN2Label - // - this.auxSN2Label.AutoSize = true; - this.auxSN2Label.Location = new System.Drawing.Point(21, 86); - this.auxSN2Label.Name = "auxSN2Label"; - this.auxSN2Label.Size = new System.Drawing.Size(193, 23); - this.auxSN2Label.TabIndex = 2; - this.auxSN2Label.Text = "Aux. WM Serial Nr."; - // - // mainSN2TextBox - // - this.mainSN2TextBox.Location = new System.Drawing.Point(300, 37); - this.mainSN2TextBox.Name = "mainSN2TextBox"; - this.mainSN2TextBox.Size = new System.Drawing.Size(163, 31); - this.mainSN2TextBox.TabIndex = 1; - // - // mainSN2Label - // - this.mainSN2Label.AutoSize = true; - this.mainSN2Label.Location = new System.Drawing.Point(21, 40); - this.mainSN2Label.Name = "mainSN2Label"; - this.mainSN2Label.Size = new System.Drawing.Size(195, 23); - this.mainSN2Label.TabIndex = 0; - this.mainSN2Label.Text = "Main WM Serial Nr."; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.auxSN3TextBox); - this.groupBox3.Controls.Add(this.auxSN3Label); - this.groupBox3.Controls.Add(this.mainSN3TextBox); - this.groupBox3.Controls.Add(this.mainSN3Label); - this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox3.ForeColor = System.Drawing.Color.Black; - this.groupBox3.Location = new System.Drawing.Point(28, 330); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(494, 137); - this.groupBox3.TabIndex = 3; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "Water Meter 3"; - // - // auxSN3TextBox - // - this.auxSN3TextBox.Location = new System.Drawing.Point(300, 83); - this.auxSN3TextBox.Name = "auxSN3TextBox"; - this.auxSN3TextBox.Size = new System.Drawing.Size(163, 31); - this.auxSN3TextBox.TabIndex = 3; - // - // auxSN3Label - // - this.auxSN3Label.AutoSize = true; - this.auxSN3Label.Location = new System.Drawing.Point(21, 86); - this.auxSN3Label.Name = "auxSN3Label"; - this.auxSN3Label.Size = new System.Drawing.Size(193, 23); - this.auxSN3Label.TabIndex = 2; - this.auxSN3Label.Text = "Aux. WM Serial Nr."; - // - // mainSN3TextBox - // - this.mainSN3TextBox.Location = new System.Drawing.Point(300, 37); - this.mainSN3TextBox.Name = "mainSN3TextBox"; - this.mainSN3TextBox.Size = new System.Drawing.Size(163, 31); - this.mainSN3TextBox.TabIndex = 1; - // - // mainSN3Label - // - this.mainSN3Label.AutoSize = true; - this.mainSN3Label.Location = new System.Drawing.Point(21, 40); - this.mainSN3Label.Name = "mainSN3Label"; - this.mainSN3Label.Size = new System.Drawing.Size(195, 23); - this.mainSN3Label.TabIndex = 0; - this.mainSN3Label.Text = "Main WM Serial Nr."; - // - // CycleBeginningForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSize = true; - this.BackColor = System.Drawing.Color.DarkGoldenrod; - this.ClientSize = new System.Drawing.Size(687, 492); - this.Controls.Add(this.groupBox3); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.okButton); - this.ForeColor = System.Drawing.Color.Black; - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Name = "CycleBeginningForm"; - this.Text = "Daten"; - this.TopMost = true; - this.Load += new System.EventHandler(this.CycleBeginningForm_Load); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.Button okButton; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label mainSN1Label; - private System.Windows.Forms.TextBox mainSN1TextBox; - private System.Windows.Forms.TextBox auxSN1TextBox; - private System.Windows.Forms.Label auxSN1Label; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.TextBox auxSN2TextBox; - private System.Windows.Forms.Label auxSN2Label; - private System.Windows.Forms.TextBox mainSN2TextBox; - private System.Windows.Forms.Label mainSN2Label; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.TextBox auxSN3TextBox; - private System.Windows.Forms.Label auxSN3Label; - private System.Windows.Forms.TextBox mainSN3TextBox; - private System.Windows.Forms.Label mainSN3Label; - } -} \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.cs deleted file mode 100644 index 1fa2dfb8d..000000000 --- a/TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.cs +++ /dev/null @@ -1,111 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -using System; -using System.Windows.Forms; -using log4net; -using TBF.Resources; - -#pragma warning disable 162 /// Disables 'Unreachable code detected' warning - -namespace TBF.BenchControl.DataEntry.Munich -{ - public partial class CycleBeginningForm : Form, GenericDevices.IHasCompleted - { - private static readonly ILog log = LogManager.GetLogger(typeof(CycleBeginningForm)); - - // To be retrieved after the form closes - public string[] MainSNText; - public string[] AuxSNText; - - // Set to 'true' when the form closes - public bool Completed { get { return completed; } } - bool completed; - - public CycleBeginningForm() - { - InitializeComponent(); - ControlBox = false; - - MainSNText = new string[Config.Data.CompoundWMsCount]; - AuxSNText = new string[Config.Data.CompoundWMsCount]; - completed = false; - - StartForceCloseHandler(); - } - - private void CycleBeginningForm_Load(object sender, EventArgs e) - { - Localize(); - - if (Config.Data.CompoundWMsCount < 2) - { - groupBox2.Visible = groupBox3.Visible = false; - Height = 200; - } - else if (Config.Data.CompoundWMsCount < 3) - { - groupBox3.Visible = false; - Height = 355; - } - } - - void Localize() - { - Text = Strings.Data; - okButton.Text = Strings.OkBtnText; - - groupBox1.Text = string.Format("{0} {1}", Strings.Water_Meter, 1); - mainSN1Label.Text = Strings.Main_WM_SerialNr; - auxSN1Label.Text = Strings.Aux_WM_SerialNr; - - groupBox2.Text = string.Format("{0} {1}", Strings.Water_Meter, 2); - mainSN2Label.Text = Strings.Main_WM_SerialNr; - auxSN2Label.Text = Strings.Aux_WM_SerialNr; - - groupBox3.Text = string.Format("{0} {1}", Strings.Water_Meter, 3); - mainSN3Label.Text = Strings.Main_WM_SerialNr; - auxSN3Label.Text = Strings.Aux_WM_SerialNr; - } - - private void okButton_Click(object sender, EventArgs e) - { - MainSNText[0] = mainSN1TextBox.Text; - AuxSNText[0] = auxSN1TextBox.Text; - - if (Config.Data.CompoundWMsCount >= 2) - { - MainSNText[1] = mainSN2TextBox.Text; - AuxSNText[1] = auxSN2TextBox.Text; - } - - if (Config.Data.CompoundWMsCount >= 3) - { - MainSNText[2] = mainSN3TextBox.Text; - AuxSNText[2] = auxSN3TextBox.Text; - } - - completed = true; - Close(); - } - - #region Forced close handling - - public void StartForceCloseHandler() - { - UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args) - { - if (InvokeRequired) { Invoke(new EventHandler(OnForceClose), sender, args); } - else OnForceClose(sender, args); - }; - } - - void OnForceClose(object sender, EventArgs args) - { - DialogResult = DialogResult.Cancel; - Close(); - } - - #endregion - } -} diff --git a/TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.resx b/TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.resx deleted file mode 100644 index 04ebfb992..000000000 --- a/TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.resx +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs b/TBF/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs deleted file mode 100644 index 71e0779ef..000000000 --- a/TBF/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs +++ /dev/null @@ -1,526 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -namespace TBF.BenchControl.DataEntry.Munich -{ - partial class CycleEndForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.mainState1TextBox = new System.Windows.Forms.TextBox(); - this.mainState1Label = new System.Windows.Forms.Label(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.yearOfProduction1Label = new System.Windows.Forms.Label(); - this.yearOfProduction1TextBox = new System.Windows.Forms.TextBox(); - this.qFall1Label = new System.Windows.Forms.Label(); - this.qFall1TextBox = new System.Windows.Forms.TextBox(); - this.qRise1Label = new System.Windows.Forms.Label(); - this.qRise1TextBox = new System.Windows.Forms.TextBox(); - this.auxState1TextBox = new System.Windows.Forms.TextBox(); - this.auxState1Label = new System.Windows.Forms.Label(); - this.okButton = new System.Windows.Forms.Button(); - this.protocolGroupBox = new System.Windows.Forms.GroupBox(); - this.radioButton4 = new System.Windows.Forms.RadioButton(); - this.radioButton3 = new System.Windows.Forms.RadioButton(); - this.radioButton2 = new System.Windows.Forms.RadioButton(); - this.radioButton1 = new System.Windows.Forms.RadioButton(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.yearOfProduction2Label = new System.Windows.Forms.Label(); - this.yearOfProduction2TextBox = new System.Windows.Forms.TextBox(); - this.qFall2Label = new System.Windows.Forms.Label(); - this.qFall2TextBox = new System.Windows.Forms.TextBox(); - this.qRise2Label = new System.Windows.Forms.Label(); - this.qRise2TextBox = new System.Windows.Forms.TextBox(); - this.mainState2TextBox = new System.Windows.Forms.TextBox(); - this.mainState2Label = new System.Windows.Forms.Label(); - this.auxState2TextBox = new System.Windows.Forms.TextBox(); - this.auxState2Label = new System.Windows.Forms.Label(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.yearOfProduction3Label = new System.Windows.Forms.Label(); - this.yearOfProduction3TextBox = new System.Windows.Forms.TextBox(); - this.qFall3Label = new System.Windows.Forms.Label(); - this.qFall3TextBox = new System.Windows.Forms.TextBox(); - this.qRise3Label = new System.Windows.Forms.Label(); - this.qRise3TextBox = new System.Windows.Forms.TextBox(); - this.mainState3TextBox = new System.Windows.Forms.TextBox(); - this.mainState3Label = new System.Windows.Forms.Label(); - this.auxState3TextBox = new System.Windows.Forms.TextBox(); - this.auxState3Label = new System.Windows.Forms.Label(); - this.groupBox1.SuspendLayout(); - this.protocolGroupBox.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.SuspendLayout(); - // - // mainState1TextBox - // - this.mainState1TextBox.Location = new System.Drawing.Point(211, 34); - this.mainState1TextBox.Name = "mainState1TextBox"; - this.mainState1TextBox.Size = new System.Drawing.Size(135, 31); - this.mainState1TextBox.TabIndex = 1; - // - // mainState1Label - // - this.mainState1Label.AutoSize = true; - this.mainState1Label.Location = new System.Drawing.Point(18, 37); - this.mainState1Label.Name = "mainState1Label"; - this.mainState1Label.Size = new System.Drawing.Size(153, 23); - this.mainState1Label.TabIndex = 0; - this.mainState1Label.Text = "Main WM State"; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.yearOfProduction1Label); - this.groupBox1.Controls.Add(this.yearOfProduction1TextBox); - this.groupBox1.Controls.Add(this.qFall1Label); - this.groupBox1.Controls.Add(this.qFall1TextBox); - this.groupBox1.Controls.Add(this.qRise1Label); - this.groupBox1.Controls.Add(this.qRise1TextBox); - this.groupBox1.Controls.Add(this.mainState1TextBox); - this.groupBox1.Controls.Add(this.mainState1Label); - this.groupBox1.Controls.Add(this.auxState1TextBox); - this.groupBox1.Controls.Add(this.auxState1Label); - this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox1.ForeColor = System.Drawing.Color.Black; - this.groupBox1.Location = new System.Drawing.Point(25, 23); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(375, 237); - this.groupBox1.TabIndex = 1; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Water Meter 1"; - // - // yearOfProduction1Label - // - this.yearOfProduction1Label.AutoSize = true; - this.yearOfProduction1Label.Location = new System.Drawing.Point(18, 197); - this.yearOfProduction1Label.Name = "yearOfProduction1Label"; - this.yearOfProduction1Label.Size = new System.Drawing.Size(188, 23); - this.yearOfProduction1Label.TabIndex = 8; - this.yearOfProduction1Label.Text = "Year of production"; - // - // yearOfProduction1TextBox - // - this.yearOfProduction1TextBox.Location = new System.Drawing.Point(211, 190); - this.yearOfProduction1TextBox.Name = "yearOfProduction1TextBox"; - this.yearOfProduction1TextBox.Size = new System.Drawing.Size(135, 31); - this.yearOfProduction1TextBox.TabIndex = 9; - // - // qFall1Label - // - this.qFall1Label.AutoSize = true; - this.qFall1Label.Location = new System.Drawing.Point(18, 158); - this.qFall1Label.Name = "qFall1Label"; - this.qFall1Label.Size = new System.Drawing.Size(55, 23); - this.qFall1Label.TabIndex = 6; - this.qFall1Label.Text = "Qfall"; - // - // qFall1TextBox - // - this.qFall1TextBox.Location = new System.Drawing.Point(211, 151); - this.qFall1TextBox.Name = "qFall1TextBox"; - this.qFall1TextBox.Size = new System.Drawing.Size(135, 31); - this.qFall1TextBox.TabIndex = 7; - // - // qRise1Label - // - this.qRise1Label.AutoSize = true; - this.qRise1Label.Location = new System.Drawing.Point(18, 115); - this.qRise1Label.Name = "qRise1Label"; - this.qRise1Label.Size = new System.Drawing.Size(60, 23); - this.qRise1Label.TabIndex = 4; - this.qRise1Label.Text = "Qrise"; - // - // qRise1TextBox - // - this.qRise1TextBox.Location = new System.Drawing.Point(211, 112); - this.qRise1TextBox.Name = "qRise1TextBox"; - this.qRise1TextBox.Size = new System.Drawing.Size(135, 31); - this.qRise1TextBox.TabIndex = 5; - // - // auxState1TextBox - // - this.auxState1TextBox.Location = new System.Drawing.Point(211, 73); - this.auxState1TextBox.Name = "auxState1TextBox"; - this.auxState1TextBox.Size = new System.Drawing.Size(135, 31); - this.auxState1TextBox.TabIndex = 3; - // - // auxState1Label - // - this.auxState1Label.AutoSize = true; - this.auxState1Label.Location = new System.Drawing.Point(18, 76); - this.auxState1Label.Name = "auxState1Label"; - this.auxState1Label.Size = new System.Drawing.Size(151, 23); - this.auxState1Label.TabIndex = 2; - this.auxState1Label.Text = "Aux. WM State"; - // - // okButton - // - this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.okButton.ForeColor = System.Drawing.Color.Black; - this.okButton.Location = new System.Drawing.Point(699, 23); - this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(98, 55); - this.okButton.TabIndex = 0; - this.okButton.Text = "OK"; - this.okButton.UseVisualStyleBackColor = true; - this.okButton.Click += new System.EventHandler(this.okButton_Click); - // - // protocolGroupBox - // - this.protocolGroupBox.Controls.Add(this.radioButton4); - this.protocolGroupBox.Controls.Add(this.radioButton3); - this.protocolGroupBox.Controls.Add(this.radioButton2); - this.protocolGroupBox.Controls.Add(this.radioButton1); - this.protocolGroupBox.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.protocolGroupBox.Location = new System.Drawing.Point(422, 87); - this.protocolGroupBox.Name = "protocolGroupBox"; - this.protocolGroupBox.Size = new System.Drawing.Size(375, 173); - this.protocolGroupBox.TabIndex = 4; - this.protocolGroupBox.TabStop = false; - this.protocolGroupBox.Text = "Protocol"; - // - // radioButton4 - // - this.radioButton4.AutoSize = true; - this.radioButton4.Location = new System.Drawing.Point(34, 133); - this.radioButton4.Name = "radioButton4"; - this.radioButton4.Size = new System.Drawing.Size(152, 27); - this.radioButton4.TabIndex = 3; - this.radioButton4.Text = "radioButton4"; - this.radioButton4.UseVisualStyleBackColor = true; - this.radioButton4.CheckedChanged += new System.EventHandler(this.radioButton4_CheckedChanged); - // - // radioButton3 - // - this.radioButton3.AutoSize = true; - this.radioButton3.Location = new System.Drawing.Point(34, 100); - this.radioButton3.Name = "radioButton3"; - this.radioButton3.Size = new System.Drawing.Size(152, 27); - this.radioButton3.TabIndex = 2; - this.radioButton3.Text = "radioButton3"; - this.radioButton3.UseVisualStyleBackColor = true; - this.radioButton3.CheckedChanged += new System.EventHandler(this.radioButton3_CheckedChanged); - // - // radioButton2 - // - this.radioButton2.AutoSize = true; - this.radioButton2.Location = new System.Drawing.Point(34, 67); - this.radioButton2.Name = "radioButton2"; - this.radioButton2.Size = new System.Drawing.Size(152, 27); - this.radioButton2.TabIndex = 1; - this.radioButton2.Text = "radioButton2"; - this.radioButton2.UseVisualStyleBackColor = true; - this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged); - // - // radioButton1 - // - this.radioButton1.AutoSize = true; - this.radioButton1.Checked = true; - this.radioButton1.Location = new System.Drawing.Point(34, 34); - this.radioButton1.Name = "radioButton1"; - this.radioButton1.Size = new System.Drawing.Size(152, 27); - this.radioButton1.TabIndex = 0; - this.radioButton1.TabStop = true; - this.radioButton1.Text = "radioButton1"; - this.radioButton1.UseVisualStyleBackColor = true; - this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.yearOfProduction2Label); - this.groupBox2.Controls.Add(this.yearOfProduction2TextBox); - this.groupBox2.Controls.Add(this.qFall2Label); - this.groupBox2.Controls.Add(this.qFall2TextBox); - this.groupBox2.Controls.Add(this.qRise2Label); - this.groupBox2.Controls.Add(this.qRise2TextBox); - this.groupBox2.Controls.Add(this.mainState2TextBox); - this.groupBox2.Controls.Add(this.mainState2Label); - this.groupBox2.Controls.Add(this.auxState2TextBox); - this.groupBox2.Controls.Add(this.auxState2Label); - this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox2.ForeColor = System.Drawing.Color.Black; - this.groupBox2.Location = new System.Drawing.Point(25, 282); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(375, 237); - this.groupBox2.TabIndex = 2; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Water Meter 2"; - // - // yearOfProduction2Label - // - this.yearOfProduction2Label.AutoSize = true; - this.yearOfProduction2Label.Location = new System.Drawing.Point(18, 197); - this.yearOfProduction2Label.Name = "yearOfProduction2Label"; - this.yearOfProduction2Label.Size = new System.Drawing.Size(188, 23); - this.yearOfProduction2Label.TabIndex = 8; - this.yearOfProduction2Label.Text = "Year of production"; - // - // yearOfProduction2TextBox - // - this.yearOfProduction2TextBox.Location = new System.Drawing.Point(211, 190); - this.yearOfProduction2TextBox.Name = "yearOfProduction2TextBox"; - this.yearOfProduction2TextBox.Size = new System.Drawing.Size(135, 31); - this.yearOfProduction2TextBox.TabIndex = 9; - // - // qFall2Label - // - this.qFall2Label.AutoSize = true; - this.qFall2Label.Location = new System.Drawing.Point(18, 158); - this.qFall2Label.Name = "qFall2Label"; - this.qFall2Label.Size = new System.Drawing.Size(55, 23); - this.qFall2Label.TabIndex = 6; - this.qFall2Label.Text = "Qfall"; - // - // qFall2TextBox - // - this.qFall2TextBox.Location = new System.Drawing.Point(211, 151); - this.qFall2TextBox.Name = "qFall2TextBox"; - this.qFall2TextBox.Size = new System.Drawing.Size(135, 31); - this.qFall2TextBox.TabIndex = 7; - // - // qRise2Label - // - this.qRise2Label.AutoSize = true; - this.qRise2Label.Location = new System.Drawing.Point(18, 115); - this.qRise2Label.Name = "qRise2Label"; - this.qRise2Label.Size = new System.Drawing.Size(60, 23); - this.qRise2Label.TabIndex = 4; - this.qRise2Label.Text = "Qrise"; - // - // qRise2TextBox - // - this.qRise2TextBox.Location = new System.Drawing.Point(211, 112); - this.qRise2TextBox.Name = "qRise2TextBox"; - this.qRise2TextBox.Size = new System.Drawing.Size(135, 31); - this.qRise2TextBox.TabIndex = 5; - // - // mainState2TextBox - // - this.mainState2TextBox.Location = new System.Drawing.Point(211, 34); - this.mainState2TextBox.Name = "mainState2TextBox"; - this.mainState2TextBox.Size = new System.Drawing.Size(135, 31); - this.mainState2TextBox.TabIndex = 1; - // - // mainState2Label - // - this.mainState2Label.AutoSize = true; - this.mainState2Label.Location = new System.Drawing.Point(17, 37); - this.mainState2Label.Name = "mainState2Label"; - this.mainState2Label.Size = new System.Drawing.Size(153, 23); - this.mainState2Label.TabIndex = 0; - this.mainState2Label.Text = "Main WM State"; - // - // auxState2TextBox - // - this.auxState2TextBox.Location = new System.Drawing.Point(211, 73); - this.auxState2TextBox.Name = "auxState2TextBox"; - this.auxState2TextBox.Size = new System.Drawing.Size(135, 31); - this.auxState2TextBox.TabIndex = 3; - // - // auxState2Label - // - this.auxState2Label.AutoSize = true; - this.auxState2Label.Location = new System.Drawing.Point(18, 76); - this.auxState2Label.Name = "auxState2Label"; - this.auxState2Label.Size = new System.Drawing.Size(151, 23); - this.auxState2Label.TabIndex = 2; - this.auxState2Label.Text = "Aux. WM State"; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.yearOfProduction3Label); - this.groupBox3.Controls.Add(this.yearOfProduction3TextBox); - this.groupBox3.Controls.Add(this.qFall3Label); - this.groupBox3.Controls.Add(this.qFall3TextBox); - this.groupBox3.Controls.Add(this.qRise3Label); - this.groupBox3.Controls.Add(this.qRise3TextBox); - this.groupBox3.Controls.Add(this.mainState3TextBox); - this.groupBox3.Controls.Add(this.mainState3Label); - this.groupBox3.Controls.Add(this.auxState3TextBox); - this.groupBox3.Controls.Add(this.auxState3Label); - this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox3.ForeColor = System.Drawing.Color.Black; - this.groupBox3.Location = new System.Drawing.Point(422, 282); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(375, 237); - this.groupBox3.TabIndex = 3; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "Water Meter 3"; - // - // yearOfProduction3Label - // - this.yearOfProduction3Label.AutoSize = true; - this.yearOfProduction3Label.Location = new System.Drawing.Point(18, 197); - this.yearOfProduction3Label.Name = "yearOfProduction3Label"; - this.yearOfProduction3Label.Size = new System.Drawing.Size(188, 23); - this.yearOfProduction3Label.TabIndex = 8; - this.yearOfProduction3Label.Text = "Year of production"; - // - // yearOfProduction3TextBox - // - this.yearOfProduction3TextBox.Location = new System.Drawing.Point(211, 190); - this.yearOfProduction3TextBox.Name = "yearOfProduction3TextBox"; - this.yearOfProduction3TextBox.Size = new System.Drawing.Size(135, 31); - this.yearOfProduction3TextBox.TabIndex = 9; - // - // qFall3Label - // - this.qFall3Label.AutoSize = true; - this.qFall3Label.Location = new System.Drawing.Point(18, 158); - this.qFall3Label.Name = "qFall3Label"; - this.qFall3Label.Size = new System.Drawing.Size(55, 23); - this.qFall3Label.TabIndex = 6; - this.qFall3Label.Text = "Qfall"; - // - // qFall3TextBox - // - this.qFall3TextBox.Location = new System.Drawing.Point(211, 151); - this.qFall3TextBox.Name = "qFall3TextBox"; - this.qFall3TextBox.Size = new System.Drawing.Size(135, 31); - this.qFall3TextBox.TabIndex = 7; - // - // qRise3Label - // - this.qRise3Label.AutoSize = true; - this.qRise3Label.Location = new System.Drawing.Point(18, 115); - this.qRise3Label.Name = "qRise3Label"; - this.qRise3Label.Size = new System.Drawing.Size(60, 23); - this.qRise3Label.TabIndex = 4; - this.qRise3Label.Text = "Qrise"; - // - // qRise3TextBox - // - this.qRise3TextBox.Location = new System.Drawing.Point(211, 112); - this.qRise3TextBox.Name = "qRise3TextBox"; - this.qRise3TextBox.Size = new System.Drawing.Size(135, 31); - this.qRise3TextBox.TabIndex = 5; - // - // mainState3TextBox - // - this.mainState3TextBox.Location = new System.Drawing.Point(211, 34); - this.mainState3TextBox.Name = "mainState3TextBox"; - this.mainState3TextBox.Size = new System.Drawing.Size(135, 31); - this.mainState3TextBox.TabIndex = 1; - // - // mainState3Label - // - this.mainState3Label.AutoSize = true; - this.mainState3Label.Location = new System.Drawing.Point(18, 37); - this.mainState3Label.Name = "mainState3Label"; - this.mainState3Label.Size = new System.Drawing.Size(153, 23); - this.mainState3Label.TabIndex = 0; - this.mainState3Label.Text = "Main WM State"; - // - // auxState3TextBox - // - this.auxState3TextBox.Location = new System.Drawing.Point(211, 73); - this.auxState3TextBox.Name = "auxState3TextBox"; - this.auxState3TextBox.Size = new System.Drawing.Size(135, 31); - this.auxState3TextBox.TabIndex = 3; - // - // auxState3Label - // - this.auxState3Label.AutoSize = true; - this.auxState3Label.Location = new System.Drawing.Point(18, 76); - this.auxState3Label.Name = "auxState3Label"; - this.auxState3Label.Size = new System.Drawing.Size(151, 23); - this.auxState3Label.TabIndex = 2; - this.auxState3Label.Text = "Aux. WM State"; - // - // CycleEndForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.DarkGoldenrod; - this.ClientSize = new System.Drawing.Size(822, 542); - this.Controls.Add(this.groupBox3); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.protocolGroupBox); - this.Controls.Add(this.okButton); - this.Controls.Add(this.groupBox1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Name = "CycleEndForm"; - this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; - this.Text = "Daten"; - this.TopMost = true; - this.Load += new System.EventHandler(this.CycleEndForm_Load); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.protocolGroupBox.ResumeLayout(false); - this.protocolGroupBox.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.TextBox mainState1TextBox; - private System.Windows.Forms.Label mainState1Label; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.TextBox auxState1TextBox; - private System.Windows.Forms.Label auxState1Label; - private System.Windows.Forms.Button okButton; - private System.Windows.Forms.GroupBox protocolGroupBox; - private System.Windows.Forms.RadioButton radioButton3; - private System.Windows.Forms.RadioButton radioButton2; - private System.Windows.Forms.RadioButton radioButton1; - private System.Windows.Forms.Label qFall1Label; - private System.Windows.Forms.TextBox qFall1TextBox; - private System.Windows.Forms.Label qRise1Label; - private System.Windows.Forms.TextBox qRise1TextBox; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.Label qFall2Label; - private System.Windows.Forms.TextBox qFall2TextBox; - private System.Windows.Forms.Label qRise2Label; - private System.Windows.Forms.TextBox qRise2TextBox; - private System.Windows.Forms.TextBox mainState2TextBox; - private System.Windows.Forms.Label mainState2Label; - private System.Windows.Forms.TextBox auxState2TextBox; - private System.Windows.Forms.Label auxState2Label; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.Label qFall3Label; - private System.Windows.Forms.TextBox qFall3TextBox; - private System.Windows.Forms.Label qRise3Label; - private System.Windows.Forms.TextBox qRise3TextBox; - private System.Windows.Forms.TextBox mainState3TextBox; - private System.Windows.Forms.Label mainState3Label; - private System.Windows.Forms.TextBox auxState3TextBox; - private System.Windows.Forms.Label auxState3Label; - private System.Windows.Forms.RadioButton radioButton4; - private System.Windows.Forms.Label yearOfProduction1Label; - private System.Windows.Forms.TextBox yearOfProduction1TextBox; - private System.Windows.Forms.Label yearOfProduction2Label; - private System.Windows.Forms.TextBox yearOfProduction2TextBox; - private System.Windows.Forms.Label yearOfProduction3Label; - private System.Windows.Forms.TextBox yearOfProduction3TextBox; - - } -} \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/Munich/CycleEndForm.cs b/TBF/BenchControl/DataEntry/Munich/CycleEndForm.cs deleted file mode 100644 index 63c5f7e06..000000000 --- a/TBF/BenchControl/DataEntry/Munich/CycleEndForm.cs +++ /dev/null @@ -1,206 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -using System; -using System.Windows.Forms; -using log4net; -using TBF.Resources; - -#pragma warning disable 162 /// Disables 'Unreachable code detected' warning - -namespace TBF.BenchControl.DataEntry.Munich -{ - public partial class CycleEndForm : Form, GenericDevices.IHasCompleted - { - private static readonly ILog log = LogManager.GetLogger(typeof(CycleEndForm)); - - // To be set before the form opens - public string ProtocolName1; - public string ProtocolName2; - public string ProtocolName3; - public string ProtocolName4; - - // To be retrieved after the form closes - public string ProtocolTitle; - public string[] MainStateText; - public string[] AuxStateText; - public float[] QRise; - public float[] QFall; - public int[] YearOfProduction; - - // Set to 'true' when the form closes - public bool Completed { get { return completed; } } - bool completed; - - public CycleEndForm() - { - InitializeComponent(); - ControlBox = false; - - MainStateText = new string[Config.Data.CompoundWMsCount]; - AuxStateText = new string[Config.Data.CompoundWMsCount]; - QRise = new float[Config.Data.CompoundWMsCount]; - QFall = new float[Config.Data.CompoundWMsCount]; - YearOfProduction = new int[Config.Data.CompoundWMsCount]; - completed = false; - StartForceCloseHandler(); - - Localize(); - } - - void Localize() - { - Text = Strings.Data; - protocolGroupBox.Text = Strings.Protocol; - groupBox1.Text = Strings.Water_Meter + " 1"; - mainState1Label.Text = Strings.Main_Water_Meter_State; - auxState1Label.Text = Strings.Aux_Water_Meter_State; - qRise1Label.Text = Strings.Qrise; - qFall1Label.Text = Strings.Qfall; - yearOfProduction1Label.Text = Strings.Year_of_production; - - groupBox2.Text = Strings.Water_Meter + " 2"; - mainState2Label.Text = Strings.Main_Water_Meter_State; - auxState2Label.Text = Strings.Aux_Water_Meter_State; - qRise2Label.Text = Strings.Qrise; - qFall2Label.Text = Strings.Qfall; - yearOfProduction2Label.Text = Strings.Year_of_production; - - groupBox3.Text = Strings.Water_Meter + " 3"; - mainState3Label.Text = Strings.Main_Water_Meter_State; - auxState3Label.Text = Strings.Aux_Water_Meter_State; - qRise3Label.Text = Strings.Qrise; - qFall3Label.Text = Strings.Qfall; - yearOfProduction3Label.Text = Strings.Year_of_production; - - AnyRadioButtonChanged(); - } - - private void CycleEndForm_Load(object sender, EventArgs e) - { - radioButton1.Text = ProtocolName1; - radioButton2.Text = ProtocolName2; - radioButton3.Text = ProtocolName3; - radioButton4.Text = ProtocolName4; - - if (Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count >= 1 && !Sequences.ProcessData.BatchRslts.Batch.WaterMeters[0].Disabled) - { - qRise1TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.Batch.WaterMeters[0].QRise, 3); - qFall1TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.Batch.WaterMeters[0].QFall, 3); - YearOfProduction[0] = Sequences.ProcessData.BatchRslts.Batch.WaterMeters[0].YearOfProduction; - yearOfProduction1TextBox.Text = YearOfProduction[0].ToString(); - } - - if (Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count >= 2 && !Sequences.ProcessData.BatchRslts.Batch.WaterMeters[1].Disabled) - { - qRise2TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.Batch.WaterMeters[1].QRise, 3); - qFall2TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.Batch.WaterMeters[1].QFall, 3); - YearOfProduction[1] = Sequences.ProcessData.BatchRslts.Batch.WaterMeters[1].YearOfProduction; - yearOfProduction2TextBox.Text = YearOfProduction[1].ToString(); - } - else - { - groupBox2.Visible = false; - Height = 305; - } - - if (Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count >= 3 && !Sequences.ProcessData.BatchRslts.Batch.WaterMeters[2].Disabled) - { - qRise3TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.Batch.WaterMeters[2].QRise, 3); - qFall3TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.Batch.WaterMeters[2].QFall, 3); - YearOfProduction[2] = Sequences.ProcessData.BatchRslts.Batch.WaterMeters[2].YearOfProduction; - yearOfProduction3TextBox.Text = YearOfProduction[2].ToString(); - } - else - { - groupBox3.Visible = false; - } - } - - private void okButton_Click(object sender, EventArgs e) - { - float ftmp; - int year; - bool allOK = true; - - MainStateText[0] = mainState1TextBox.Text; - AuxStateText[0] = auxState1TextBox.Text; - if (Utils.TryParseUFloat(qRise1TextBox.Text, out ftmp)) { QRise[0] = ftmp; } else { allOK = false; } - if (Utils.TryParseUFloat(qFall1TextBox.Text, out ftmp)) { QFall[0] = ftmp; } else { allOK = false; } - if (ShowYear() && int.TryParse(yearOfProduction1TextBox.Text, out year)) - { - YearOfProduction[0] = year; - } - - if (Config.Data.CompoundWMsCount >= 2) - { - MainStateText[1] = mainState2TextBox.Text; - AuxStateText[1] = auxState2TextBox.Text; - if (Utils.TryParseUFloat(qRise2TextBox.Text, out ftmp)) { QRise[1] = ftmp; } else { allOK = false; } - if (Utils.TryParseUFloat(qFall2TextBox.Text, out ftmp)) { QFall[1] = ftmp; } else { allOK = false; } - if (ShowYear() && int.TryParse(yearOfProduction2TextBox.Text, out year)) - { - YearOfProduction[1] = year; - } - } - - if (Config.Data.CompoundWMsCount >= 3) - { - MainStateText[2] = mainState3TextBox.Text; - AuxStateText[2] = auxState3TextBox.Text; - if (Utils.TryParseUFloat(qRise3TextBox.Text, out ftmp)) { QRise[2] = ftmp; } else { allOK = false; } - if (Utils.TryParseUFloat(qFall3TextBox.Text, out ftmp)) { QFall[2] = ftmp; } else { allOK = false; } - if (ShowYear() && int.TryParse(yearOfProduction3TextBox.Text, out year)) - { - YearOfProduction[2] = year; - } - } - - if (radioButton1.Checked) ProtocolTitle = ProtocolName1; - else if (radioButton2.Checked) ProtocolTitle = ProtocolName2; - else if (radioButton3.Checked) ProtocolTitle = ProtocolName3; - else if (radioButton4.Checked) ProtocolTitle = ProtocolName4; - - if (allOK) - { - completed = true; - Close(); - } - } - - #region Forced close handling - - public void StartForceCloseHandler() - { - UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args) - { - if (InvokeRequired) { Invoke(new EventHandler(OnForceClose), sender, args); } - else OnForceClose(sender, args); - }; - } - - void OnForceClose(object sender, EventArgs args) - { - DialogResult = DialogResult.Cancel; - Close(); - } - - #endregion - - private void radioButton1_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } - private void radioButton2_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } - private void radioButton3_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } - private void radioButton4_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } - - bool ShowYear() - { - return radioButton2.Checked || radioButton3.Checked || radioButton4.Checked; - } - - void AnyRadioButtonChanged() - { - yearOfProduction1TextBox.Visible = yearOfProduction2TextBox.Visible = yearOfProduction3TextBox.Visible = - yearOfProduction1Label.Visible = yearOfProduction2Label.Visible = yearOfProduction3Label.Visible = ShowYear(); - } - } -} diff --git a/TBF/BenchControl/DataEntry/Munich/CycleEndForm.resx b/TBF/BenchControl/DataEntry/Munich/CycleEndForm.resx deleted file mode 100644 index 1af7de150..000000000 --- a/TBF/BenchControl/DataEntry/Munich/CycleEndForm.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/Munich/EntryForm.cs b/TBF/BenchControl/DataEntry/Munich/EntryForm.cs deleted file mode 100644 index a96e30cf1..000000000 --- a/TBF/BenchControl/DataEntry/Munich/EntryForm.cs +++ /dev/null @@ -1,200 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -using System; -using System.Collections.Generic; -using log4net; -using Config.Entities; -using TBF.BenchControl; -using TBF.BenchControl.GenericDevices; - -namespace TBF.BenchControl.DataEntry.Munich -{ - public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm - { - private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm)); - public override string ToString() { return string.Format("DataEntry.Munich({0})", Cfg.ToString(1)); } - - public bool UsesCameras() { return false; } - - readonly EntryFormCfg entryFormCfg; - - /// - /// Properties set by the Begin and the End form - /// - string[] serialNr; - public string SerialNr(int wmNr) { return (wmNr >= 0 && wmNr < serialNr.Length) ? serialNr[wmNr] : string.Empty; } - - public bool Disabled(int wmNr) { return false; } /// Not supported in Munich - - string[] wmEndState; - public string WMCycleEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmEndState.Length) ? wmEndState[wmNr] : string.Empty; } - - public float WMState(int wmNr) - { - float retVal; - if (wmNr >= 0 && wmNr < wmEndState.Length && Utils.TryParseUFloat(wmEndState[wmNr], out retVal)) return retVal; - return 0; - } - - - System.Windows.Forms.Form modelessDlg; - public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } } - - bool resultSaved; /// Set in Run() when results are saved - - IList wMeters; /// Reference to ...ProcessData.BatchRslts.Batch.WaterMeters[] - - public enum CurrentOp - { - None, - ShowFormAtCycleBeginning, - ShowFormAtCycleEnd, - } - - CurrentOp currentOp; - - - public EntryForm() - { - } - - public EntryForm(Generic.IComponentCfg cfg) - : base(cfg) - { - entryFormCfg = cfg as EntryFormCfg; - - serialNr = new string[Config.Data.CompoundWMsCount]; - wmEndState = new string[Config.Data.CompoundWMsCount]; - - currentOp = CurrentOp.None; - log.Warn(this.ToString()); - } - - /// Reference to the operation - public IOperation ShowCycleBeginFormOp() - { - if (currentOp != CurrentOp.None) throw new Exception("Sequence error"); - currentOp = CurrentOp.ShowFormAtCycleBeginning; - this.wMeters = TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch.WaterMeters; - return this; - } - - /// Reference to the operation - public IOperation ShowCycleEndFormOp(IList waterMeters) - { - if (currentOp != CurrentOp.None) throw new Exception("Sequence error"); - currentOp = CurrentOp.ShowFormAtCycleEnd; - this.wMeters = waterMeters; - return this; - } - - /// Reference to the operation - public IOperation ShowWMSNsAndStatesFormOp() - { - return null; - } - - delegate void EntryFormDlgt(EntryForm myRef); - /// - void OpenBeginningDlg(EntryForm myRef) - { - myRef.modelessDlg = new CycleBeginningForm(); - modelessDlg.Show(); - } - /// - void OpenEndDlg(EntryForm myRef) - { - CycleEndForm endForm = new CycleEndForm(); - endForm.ProtocolName1 = entryFormCfg.ProtocolTitle1; - endForm.ProtocolName2 = entryFormCfg.ProtocolTitle2; - endForm.ProtocolName3 = entryFormCfg.ProtocolTitle3; - endForm.ProtocolName4 = entryFormCfg.ProtocolTitle4; - myRef.modelessDlg = endForm; - modelessDlg.Show(); - } - - /// Start this operation - public void Start() - { - resultSaved = false; - switch (currentOp) - { - case CurrentOp.ShowFormAtCycleBeginning: - Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this); - break; - case CurrentOp.ShowFormAtCycleEnd: - Program.MainWnd.Invoke(new EntryFormDlgt(OpenEndDlg), this); - break; - } - } - - /// Run this operation - /// Event.ResultsPrinted - public Event Run() - { - if ((modelessDlg is IHasCompleted) && !(modelessDlg as IHasCompleted).Completed) - { - return Event.ModelessFormIsOpen; - } - - if (!resultSaved) /// This is to save the result only once - { - int count = Math.Min(3, Math.Min(wMeters.Count, Config.Data.CompoundWMsCount)); - if (modelessDlg is CycleBeginningForm) - { - if (count >= 1 && wMeters[0] != null) wMeters[0].SerialNr = (modelessDlg as CycleBeginningForm).MainSNText[0]; - if (count >= 1 && wMeters[0] != null) wMeters[0].SerialNrAux = (modelessDlg as CycleBeginningForm).AuxSNText[0]; - if (count >= 2 && wMeters[1] != null) wMeters[1].SerialNr = (modelessDlg as CycleBeginningForm).MainSNText[1]; - if (count >= 2 && wMeters[1] != null) wMeters[1].SerialNrAux = (modelessDlg as CycleBeginningForm).AuxSNText[1]; - if (count >= 3 && wMeters[2] != null) wMeters[2].SerialNr = (modelessDlg as CycleBeginningForm).MainSNText[2]; - if (count >= 3 && wMeters[2] != null) wMeters[2].SerialNrAux = (modelessDlg as CycleBeginningForm).AuxSNText[2]; - } - else if (modelessDlg is CycleEndForm) - { - Sequences.ProcessData.BatchRslts.Batch.ProtocolTitle = (modelessDlg as CycleEndForm).ProtocolTitle; - - if (count >= 1 && wMeters[0] != null) - { - wMeters[0].EndState = (modelessDlg as CycleEndForm).MainStateText[0]; - wMeters[0].EndStateAux = (modelessDlg as CycleEndForm).AuxStateText[0]; - wMeters[0].QRise = (modelessDlg as CycleEndForm).QRise[0]; - wMeters[0].QFall = (modelessDlg as CycleEndForm).QFall[0]; - wMeters[0].YearOfProduction = (modelessDlg as CycleEndForm).YearOfProduction[0]; - } - if (count >= 2 && wMeters[1] != null) - { - wMeters[1].EndState = (modelessDlg as CycleEndForm).MainStateText[1]; - wMeters[1].EndStateAux = (modelessDlg as CycleEndForm).AuxStateText[1]; - wMeters[1].QRise = (modelessDlg as CycleEndForm).QRise[1]; - wMeters[1].QFall = (modelessDlg as CycleEndForm).QFall[1]; - wMeters[1].YearOfProduction = (modelessDlg as CycleEndForm).YearOfProduction[1]; - } - if (count >= 3 && wMeters[2] != null) - { - wMeters[2].EndState = (modelessDlg as CycleEndForm).MainStateText[2]; - wMeters[2].EndStateAux = (modelessDlg as CycleEndForm).AuxStateText[2]; - wMeters[2].QRise = (modelessDlg as CycleEndForm).QRise[2]; - wMeters[2].QFall = (modelessDlg as CycleEndForm).QFall[2]; - wMeters[2].YearOfProduction = (modelessDlg as CycleEndForm).YearOfProduction[2]; - } - } - resultSaved = true; - modelessDlg = null; - } - - return Event.ModelessFormClosed; /// Form closed - } - - /// Stop this operation - public void Stop() - { - if (modelessDlg is IHasCompleted) - { - UiBridge.Bridge.OnCloseModelessForm(this, null); - modelessDlg = null; - } - currentOp = CurrentOp.None; - } - } -} diff --git a/TBF/BenchControl/DataEntry/Munich/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Munich/EntryFormCfg.cs deleted file mode 100644 index 9058af952..000000000 --- a/TBF/BenchControl/DataEntry/Munich/EntryFormCfg.cs +++ /dev/null @@ -1,52 +0,0 @@ -/// -/// Copyright (c) 2013-2016 Sensus Metering Systems -/// -using System.Collections.Generic; -using System.Xml.Serialization; -using TBF.BenchControl.Generic; - -namespace TBF.BenchControl.DataEntry.Munich -{ - public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg - { - public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0]; - public override XmlSerializer GetSerializer() { return Serializer; } - - public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new EntryFormCfgCtrl(); } - - /// - /// Serialized parameters - /// - public string ProtocolTitle1; - public string ProtocolTitle2; - public string ProtocolTitle3; - public string ProtocolTitle4; - - /// Private parameterless constructor invoked by all other (public) constructors - EntryFormCfg() - { - Name = "DataEntryForm-Munich"; - ParentName = string.Empty; - ProtocolTitle1 = "Protokoll 1"; - ProtocolTitle2 = "Protokoll 2"; - ProtocolTitle3 = "Protokoll 3"; - ProtocolTitle4 = "Protokoll 4"; - } - - public EntryFormCfg(IComponentFactory factory) - : this() - { - this.Factory = factory; - } - - public string ToString(int i) - { - return string.Format("Name={0}, P1={1}, P2={2}, P3={3}, P4={4}", - Name, - (string.IsNullOrEmpty(ProtocolTitle1) ? "-" : ProtocolTitle1), - (string.IsNullOrEmpty(ProtocolTitle2) ? "-" : ProtocolTitle2), - (string.IsNullOrEmpty(ProtocolTitle3) ? "-" : ProtocolTitle3), - (string.IsNullOrEmpty(ProtocolTitle4) ? "-" : ProtocolTitle4)); - } - } -} diff --git a/TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs deleted file mode 100644 index 4fcf58cf2..000000000 --- a/TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs +++ /dev/null @@ -1,81 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -using System; -using System.Windows.Forms; -using Config.Entities; -using TBF.BenchControl.Generic; - -namespace TBF.BenchControl.DataEntry.Munich -{ - public partial class EntryFormCfgCtrl : UserControl, IComponentCfgCtrl - { - public bool ShowMore { get { return false; } } - - EntryFormCfg config; - public IComponentCfg Config - { - get { return config as IComponentCfg; } - set - { - config = value as EntryFormCfg; - Redraw(); - } - } - - public EntryFormCfgCtrl() - { - InitializeComponent(); - } - - private void EntryFormCfgCtrl_Load(object sender, EventArgs e) - { - Redraw(); - } - - public void Closing() - { - } - - void Redraw() - { - if (config == null) return; /// Control was not loaded, settings were not changed - classNameLabel.Text = config.Factory.ClassName; - nameTextBox.Text = config.Name; - protocolTitle1TextBox.Text = config.ProtocolTitle1; - protocolTitle2TextBox.Text = config.ProtocolTitle2; - protocolTitle3TextBox.Text = config.ProtocolTitle3; - protocolTitle4TextBox.Text = config.ProtocolTitle4; - } - - public void Unlock() - { - nameTextBox.Enabled = true; - protocolTitle1TextBox.Enabled = true; - protocolTitle2TextBox.Enabled = true; - protocolTitle3TextBox.Enabled = true; - protocolTitle4TextBox.Enabled = true; - } - - public CfgUpdateFlags VerifyCfg(ref string message) - { - CfgUpdateFlags flags = CfgUpdateFlags.None; - return flags; - } - - public CfgUpdateFlags UpdateCfg() - { - CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd; - - if (config == null) return CfgUpdateFlags.Error; /// Control was not loaded, settings were not changed - - config.Name = nameTextBox.Text; - config.ProtocolTitle1 = protocolTitle1TextBox.Text; - config.ProtocolTitle2 = protocolTitle2TextBox.Text; - config.ProtocolTitle3 = protocolTitle3TextBox.Text; - config.ProtocolTitle4 = protocolTitle4TextBox.Text; - - return flags; - } - } -} diff --git a/TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.designer.cs b/TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.designer.cs deleted file mode 100644 index eada7a244..000000000 --- a/TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.designer.cs +++ /dev/null @@ -1,178 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -namespace TBF.BenchControl.DataEntry.Munich -{ - partial class EntryFormCfgCtrl - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - 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.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.protocolTitle1TextBox = new System.Windows.Forms.TextBox(); - this.protocolTitle2TextBox = new System.Windows.Forms.TextBox(); - this.protocolTitle3TextBox = new System.Windows.Forms.TextBox(); - this.protocolTitle4TextBox = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // nameTextBox - // - this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(137, 57); - this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(130, 20); - this.nameTextBox.TabIndex = 5; - // - // nameLabel - // - this.nameLabel.AutoSize = true; - this.nameLabel.Location = new System.Drawing.Point(27, 60); - this.nameLabel.Name = "nameLabel"; - this.nameLabel.Size = new System.Drawing.Size(35, 13); - this.nameLabel.TabIndex = 4; - this.nameLabel.Text = "Name"; - // - // classNameLabel - // - this.classNameLabel.AutoSize = true; - this.classNameLabel.Location = new System.Drawing.Point(134, 33); - this.classNameLabel.Name = "classNameLabel"; - this.classNameLabel.Size = new System.Drawing.Size(83, 13); - this.classNameLabel.TabIndex = 3; - this.classNameLabel.Text = "ComonentName"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(27, 86); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(74, 13); - this.label1.TabIndex = 6; - this.label1.Text = "Protocol title 1"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(27, 112); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(74, 13); - this.label2.TabIndex = 7; - this.label2.Text = "Protocol title 2"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(27, 138); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(74, 13); - this.label3.TabIndex = 8; - this.label3.Text = "Protocol title 3"; - // - // protocolTitle1TextBox - // - this.protocolTitle1TextBox.Enabled = false; - this.protocolTitle1TextBox.Location = new System.Drawing.Point(137, 83); - this.protocolTitle1TextBox.Name = "protocolTitle1TextBox"; - this.protocolTitle1TextBox.Size = new System.Drawing.Size(130, 20); - this.protocolTitle1TextBox.TabIndex = 9; - // - // protocolTitle2TextBox - // - this.protocolTitle2TextBox.Enabled = false; - this.protocolTitle2TextBox.Location = new System.Drawing.Point(137, 109); - this.protocolTitle2TextBox.Name = "protocolTitle2TextBox"; - this.protocolTitle2TextBox.Size = new System.Drawing.Size(130, 20); - this.protocolTitle2TextBox.TabIndex = 10; - // - // protocolTitle3TextBox - // - this.protocolTitle3TextBox.Enabled = false; - this.protocolTitle3TextBox.Location = new System.Drawing.Point(137, 135); - this.protocolTitle3TextBox.Name = "protocolTitle3TextBox"; - this.protocolTitle3TextBox.Size = new System.Drawing.Size(130, 20); - this.protocolTitle3TextBox.TabIndex = 11; - // - // protocolTitle4TextBox - // - this.protocolTitle4TextBox.Enabled = false; - this.protocolTitle4TextBox.Location = new System.Drawing.Point(137, 161); - this.protocolTitle4TextBox.Name = "protocolTitle4TextBox"; - this.protocolTitle4TextBox.Size = new System.Drawing.Size(130, 20); - this.protocolTitle4TextBox.TabIndex = 13; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(27, 164); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(74, 13); - this.label4.TabIndex = 12; - this.label4.Text = "Protocol title 4"; - // - // EntryFormCfgCtrl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.protocolTitle4TextBox); - this.Controls.Add(this.label4); - this.Controls.Add(this.protocolTitle3TextBox); - this.Controls.Add(this.protocolTitle2TextBox); - this.Controls.Add(this.protocolTitle1TextBox); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.nameTextBox); - this.Controls.Add(this.nameLabel); - this.Controls.Add(this.classNameLabel); - this.Name = "EntryFormCfgCtrl"; - this.Size = new System.Drawing.Size(300, 200); - this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.TextBox nameTextBox; - private System.Windows.Forms.Label nameLabel; - private System.Windows.Forms.Label classNameLabel; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.TextBox protocolTitle1TextBox; - private System.Windows.Forms.TextBox protocolTitle2TextBox; - private System.Windows.Forms.TextBox protocolTitle3TextBox; - private System.Windows.Forms.TextBox protocolTitle4TextBox; - private System.Windows.Forms.Label label4; - } -} diff --git a/TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.resx b/TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.resx deleted file mode 100644 index 1af7de150..000000000 --- a/TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/Munich/EntryFormFactory.cs b/TBF/BenchControl/DataEntry/Munich/EntryFormFactory.cs deleted file mode 100644 index 09951977a..000000000 --- a/TBF/BenchControl/DataEntry/Munich/EntryFormFactory.cs +++ /dev/null @@ -1,27 +0,0 @@ -/// -/// Copyright (c) 2013-2016 Sensus Metering Systems -/// -using System.Collections.Generic; -using TBF.BenchControl.Generic; - -namespace TBF.BenchControl.DataEntry.Munich -{ - public class EntryFormFactory : IComponentFactory - { - public string ClassName { get { return "DataEntryForm-Munich"; } } - public override string ToString() { return ClassName; } - - public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); } - - public IComponent DummyComponent() { return new EntryForm(); } - - public IComponent GetComponent(IComponentCfg cfg, IList components) { return new EntryForm(cfg); } - - public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); } - - public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component) - { - return ComponentCfgBase.CreateFromDbEntity(EntryFormCfg.Serializer, component, this); - } - } -} diff --git a/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs b/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs deleted file mode 100644 index 51878fcf9..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs +++ /dev/null @@ -1,299 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -namespace TBF.BenchControl.DataEntry.Munich3 -{ - partial class CycleBeginningForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CycleBeginningForm)); - this.okButton = new System.Windows.Forms.Button(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.label5 = new System.Windows.Forms.Label(); - this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.textBox6 = new System.Windows.Forms.TextBox(); - this.label6 = new System.Windows.Forms.Label(); - this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.checkBox2 = new System.Windows.Forms.CheckBox(); - this.checkBox3 = new System.Windows.Forms.CheckBox(); - this.checkBox4 = new System.Windows.Forms.CheckBox(); - this.checkBox5 = new System.Windows.Forms.CheckBox(); - this.checkBox6 = new System.Windows.Forms.CheckBox(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.groupBox4.SuspendLayout(); - this.groupBox5.SuspendLayout(); - this.groupBox6.SuspendLayout(); - this.SuspendLayout(); - // - // okButton - // - resources.ApplyResources(this.okButton, "okButton"); - this.okButton.ForeColor = System.Drawing.Color.Black; - this.okButton.Name = "okButton"; - this.okButton.UseVisualStyleBackColor = true; - this.okButton.Click += new System.EventHandler(this.okButton_Click); - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.checkBox1); - this.groupBox1.Controls.Add(this.textBox1); - this.groupBox1.Controls.Add(this.label1); - resources.ApplyResources(this.groupBox1, "groupBox1"); - this.groupBox1.ForeColor = System.Drawing.Color.Black; - this.groupBox1.Name = "groupBox1"; - this.groupBox1.TabStop = false; - // - // textBox1 - // - resources.ApplyResources(this.textBox1, "textBox1"); - this.textBox1.Name = "textBox1"; - this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged); - // - // label1 - // - resources.ApplyResources(this.label1, "label1"); - this.label1.Name = "label1"; - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.checkBox2); - this.groupBox2.Controls.Add(this.textBox2); - this.groupBox2.Controls.Add(this.label2); - resources.ApplyResources(this.groupBox2, "groupBox2"); - this.groupBox2.ForeColor = System.Drawing.Color.Black; - this.groupBox2.Name = "groupBox2"; - this.groupBox2.TabStop = false; - // - // textBox2 - // - resources.ApplyResources(this.textBox2, "textBox2"); - this.textBox2.Name = "textBox2"; - this.textBox2.TextChanged += new System.EventHandler(this.textBox2_TextChanged); - // - // label2 - // - resources.ApplyResources(this.label2, "label2"); - this.label2.Name = "label2"; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.checkBox3); - this.groupBox3.Controls.Add(this.textBox3); - this.groupBox3.Controls.Add(this.label3); - resources.ApplyResources(this.groupBox3, "groupBox3"); - this.groupBox3.ForeColor = System.Drawing.Color.Black; - this.groupBox3.Name = "groupBox3"; - this.groupBox3.TabStop = false; - // - // textBox3 - // - resources.ApplyResources(this.textBox3, "textBox3"); - this.textBox3.Name = "textBox3"; - this.textBox3.TextChanged += new System.EventHandler(this.textBox3_TextChanged); - // - // label3 - // - resources.ApplyResources(this.label3, "label3"); - this.label3.Name = "label3"; - // - // groupBox4 - // - this.groupBox4.Controls.Add(this.checkBox4); - this.groupBox4.Controls.Add(this.textBox4); - this.groupBox4.Controls.Add(this.label4); - resources.ApplyResources(this.groupBox4, "groupBox4"); - this.groupBox4.ForeColor = System.Drawing.Color.Black; - this.groupBox4.Name = "groupBox4"; - this.groupBox4.TabStop = false; - // - // textBox4 - // - resources.ApplyResources(this.textBox4, "textBox4"); - this.textBox4.Name = "textBox4"; - this.textBox4.TextChanged += new System.EventHandler(this.textBox4_TextChanged); - // - // label4 - // - resources.ApplyResources(this.label4, "label4"); - this.label4.Name = "label4"; - // - // groupBox5 - // - this.groupBox5.Controls.Add(this.checkBox5); - this.groupBox5.Controls.Add(this.textBox5); - this.groupBox5.Controls.Add(this.label5); - resources.ApplyResources(this.groupBox5, "groupBox5"); - this.groupBox5.ForeColor = System.Drawing.Color.Black; - this.groupBox5.Name = "groupBox5"; - this.groupBox5.TabStop = false; - // - // textBox5 - // - resources.ApplyResources(this.textBox5, "textBox5"); - this.textBox5.Name = "textBox5"; - this.textBox5.TextChanged += new System.EventHandler(this.textBox5_TextChanged); - // - // label5 - // - resources.ApplyResources(this.label5, "label5"); - this.label5.Name = "label5"; - // - // groupBox6 - // - this.groupBox6.Controls.Add(this.checkBox6); - this.groupBox6.Controls.Add(this.textBox6); - this.groupBox6.Controls.Add(this.label6); - resources.ApplyResources(this.groupBox6, "groupBox6"); - this.groupBox6.ForeColor = System.Drawing.Color.Black; - this.groupBox6.Name = "groupBox6"; - this.groupBox6.TabStop = false; - // - // textBox6 - // - resources.ApplyResources(this.textBox6, "textBox6"); - this.textBox6.Name = "textBox6"; - this.textBox6.TextChanged += new System.EventHandler(this.textBox6_TextChanged); - // - // label6 - // - resources.ApplyResources(this.label6, "label6"); - this.label6.Name = "label6"; - // - // checkBox1 - // - resources.ApplyResources(this.checkBox1, "checkBox1"); - this.checkBox1.Name = "checkBox1"; - this.checkBox1.UseVisualStyleBackColor = true; - // - // checkBox2 - // - resources.ApplyResources(this.checkBox2, "checkBox2"); - this.checkBox2.Name = "checkBox2"; - this.checkBox2.UseVisualStyleBackColor = true; - // - // checkBox3 - // - resources.ApplyResources(this.checkBox3, "checkBox3"); - this.checkBox3.Name = "checkBox3"; - this.checkBox3.UseVisualStyleBackColor = true; - // - // checkBox4 - // - resources.ApplyResources(this.checkBox4, "checkBox4"); - this.checkBox4.Name = "checkBox4"; - this.checkBox4.UseVisualStyleBackColor = true; - // - // checkBox5 - // - resources.ApplyResources(this.checkBox5, "checkBox5"); - this.checkBox5.Name = "checkBox5"; - this.checkBox5.UseVisualStyleBackColor = true; - // - // checkBox6 - // - resources.ApplyResources(this.checkBox6, "checkBox6"); - this.checkBox6.Name = "checkBox6"; - this.checkBox6.UseVisualStyleBackColor = true; - // - // CycleBeginningForm - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.DarkGoldenrod; - this.Controls.Add(this.groupBox6); - this.Controls.Add(this.groupBox5); - this.Controls.Add(this.groupBox4); - this.Controls.Add(this.groupBox3); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.okButton); - this.ForeColor = System.Drawing.Color.Black; - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Name = "CycleBeginningForm"; - this.TopMost = true; - this.Load += new System.EventHandler(this.CycleBeginningForm_Load); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.groupBox4.ResumeLayout(false); - this.groupBox4.PerformLayout(); - this.groupBox5.ResumeLayout(false); - this.groupBox5.PerformLayout(); - this.groupBox6.ResumeLayout(false); - this.groupBox6.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.Button okButton; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.TextBox textBox3; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.GroupBox groupBox4; - private System.Windows.Forms.TextBox textBox4; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.GroupBox groupBox5; - private System.Windows.Forms.TextBox textBox5; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.GroupBox groupBox6; - private System.Windows.Forms.TextBox textBox6; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox1; - private System.Windows.Forms.CheckBox checkBox2; - private System.Windows.Forms.CheckBox checkBox3; - private System.Windows.Forms.CheckBox checkBox4; - private System.Windows.Forms.CheckBox checkBox5; - private System.Windows.Forms.CheckBox checkBox6; - } -} \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.cs deleted file mode 100644 index c48dde1c6..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.cs +++ /dev/null @@ -1,119 +0,0 @@ -/// -/// Copyright (c) 2013-2016 Sensus Metering Systems -/// -using System; -using System.Windows.Forms; -using log4net; -using TBF.Resources; - -namespace TBF.BenchControl.DataEntry.Munich3 -{ - public partial class CycleBeginningForm : Form, GenericDevices.IHasCompleted - { - private static readonly ILog log = LogManager.GetLogger(typeof(CycleBeginningForm)); - - /// Number of text boxes for serial numbers - public readonly int WaterMetersCount; - - /// To be retrieved after the form is closed - public string[] SNText; - public bool[] Disabled; - - /// Set to 'true' when the form closes - public bool Completed { get { return completed; } } - bool completed; - - /// - /// Constructor - /// - /// Number of text boxes for serial numbers - public CycleBeginningForm(int waterMetersCount) - { - InitializeComponent(); - ControlBox = false; - - this.WaterMetersCount = waterMetersCount; - SNText = new string[WaterMetersCount]; - Disabled = new bool[WaterMetersCount]; - completed = false; - StartForceCloseHandler(); - } - - /// Parameterless constructor for all watermeters - public CycleBeginningForm() - : this(Config.Data.WMsCount) - { - } - - private void CycleBeginningForm_Load(object sender, EventArgs e) - { - Localize(); - - if (WaterMetersCount < 1) groupBox1.Visible = false; - if (WaterMetersCount < 2) groupBox2.Visible = false; - if (WaterMetersCount < 3) groupBox3.Visible = false; - if (WaterMetersCount < 4) groupBox4.Visible = false; - if (WaterMetersCount < 5) groupBox5.Visible = false; - if (WaterMetersCount < 6) groupBox6.Visible = false; - - Height = 55 + WaterMetersCount * 105; - } - - void Localize() - { - Text = Strings.Data; - groupBox1.Text = Strings.Water_Meter + " 1"; - groupBox2.Text = Strings.Water_Meter + " 2"; - groupBox3.Text = Strings.Water_Meter + " 3"; - groupBox4.Text = Strings.Water_Meter + " 4"; - groupBox5.Text = Strings.Water_Meter + " 5"; - groupBox6.Text = Strings.Water_Meter + " 6"; - label1.Text = Strings.Serial_Number; - label2.Text = Strings.Serial_Number; - label3.Text = Strings.Serial_Number; - label4.Text = Strings.Serial_Number; - label5.Text = Strings.Serial_Number; - label6.Text = Strings.Serial_Number; - okButton.Text = Strings.OkBtnText; - } - - private void textBox1_TextChanged(object sender, EventArgs e) { checkBox1.Checked = true; } - private void textBox2_TextChanged(object sender, EventArgs e) { checkBox2.Checked = true; } - private void textBox3_TextChanged(object sender, EventArgs e) { checkBox3.Checked = true; } - private void textBox4_TextChanged(object sender, EventArgs e) { checkBox4.Checked = true; } - private void textBox5_TextChanged(object sender, EventArgs e) { checkBox5.Checked = true; } - private void textBox6_TextChanged(object sender, EventArgs e) { checkBox6.Checked = true; } - - private void okButton_Click(object sender, EventArgs e) - { - if (WaterMetersCount >= 1) { SNText[0] = textBox1.Text; Disabled[0] = !checkBox1.Checked; } - if (WaterMetersCount >= 2) { SNText[1] = textBox2.Text; Disabled[1] = !checkBox2.Checked; } - if (WaterMetersCount >= 3) { SNText[2] = textBox3.Text; Disabled[2] = !checkBox3.Checked; } - if (WaterMetersCount >= 4) { SNText[3] = textBox4.Text; Disabled[3] = !checkBox4.Checked; } - if (WaterMetersCount >= 5) { SNText[4] = textBox5.Text; Disabled[4] = !checkBox5.Checked; } - if (WaterMetersCount >= 6) { SNText[5] = textBox6.Text; Disabled[5] = !checkBox6.Checked; } - - completed = true; - Close(); - } - - #region Forced close handling - - public void StartForceCloseHandler() - { - UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args) - { - if (InvokeRequired) { Invoke(new EventHandler(OnForceClose), sender, args); } - else OnForceClose(sender, args); - }; - } - - private void OnForceClose(object sender, EventArgs args) - { - DialogResult = DialogResult.Cancel; - Close(); - } - - #endregion - } -} diff --git a/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.pl.resx b/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.pl.resx deleted file mode 100644 index fcb02f81b..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.pl.resx +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - OK - - - Wodomierz 1 - - - Nr seryjny: - - - Wodomierz 2 - - - Nr seryjny: - - - Wodomierz 3 - - - Nr seryjny: - - - Wodomierz 4 - - - Nr seryjny: - - - Wodomierz 5 - - - Nr seryjny: - - - Wodomierz 6 - - - Nr seryjny: - - - Data - - \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx b/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx deleted file mode 100644 index 9c33553f8..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx +++ /dev/null @@ -1,987 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - Top, Right - - - - Verdana, 14.25pt - - - 583, 38 - - - 98, 63 - - - - 0 - - - OK - - - okButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 6 - - - checkBox1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 0 - - - textBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 1 - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 2 - - - Verdana, 14.25pt - - - 28, 18 - - - 485, 92 - - - 1 - - - Wasserzähler 1 - - - groupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - - - 213, 37 - - - 163, 31 - - - 1 - - - textBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 1 - - - True - - - 18, 40 - - - 159, 23 - - - 0 - - - Seriennummer: - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 2 - - - checkBox2 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 0 - - - textBox2 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 1 - - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 2 - - - Verdana, 14.25pt - - - 28, 123 - - - 485, 92 - - - 2 - - - Wasserzähler 2 - - - groupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - - - 213, 37 - - - 163, 31 - - - 1 - - - textBox2 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 1 - - - True - - - 18, 40 - - - 159, 23 - - - 0 - - - Seriennummer: - - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 2 - - - checkBox3 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 0 - - - textBox3 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 1 - - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 2 - - - Verdana, 14.25pt - - - 28, 228 - - - 485, 92 - - - 3 - - - Wasserzähler 3 - - - groupBox3 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - - - 213, 37 - - - 163, 31 - - - 1 - - - textBox3 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 1 - - - True - - - NoControl - - - 18, 40 - - - 159, 23 - - - 0 - - - Seriennummer: - - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 2 - - - checkBox4 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 0 - - - textBox4 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 1 - - - label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 2 - - - Verdana, 14.25pt - - - 28, 333 - - - 485, 92 - - - 4 - - - Wasserzähler 4 - - - groupBox4 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - 213, 37 - - - 163, 31 - - - 1 - - - textBox4 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 1 - - - True - - - 18, 40 - - - 159, 23 - - - 0 - - - Seriennummer: - - - label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 2 - - - checkBox5 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 0 - - - textBox5 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 1 - - - label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 2 - - - Verdana, 14.25pt - - - 28, 438 - - - 485, 92 - - - 5 - - - Wasserzähler 5 - - - groupBox5 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - - - 213, 37 - - - 163, 31 - - - 1 - - - textBox5 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 1 - - - True - - - 18, 40 - - - 159, 23 - - - 0 - - - Seriennummer: - - - label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 2 - - - True - - - Verdana, 27.75pt - - - NoControl - - - 424, 49 - - - 15, 14 - - - 8 - - - checkBox6 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox6 - - - 0 - - - 213, 37 - - - 163, 31 - - - 1 - - - textBox6 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox6 - - - 1 - - - True - - - 18, 40 - - - 159, 23 - - - 0 - - - Seriennummer: - - - label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox6 - - - 2 - - - Verdana, 14.25pt - - - 28, 543 - - - 485, 92 - - - 6 - - - Wasserzähler 6 - - - groupBox6 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - True - - - Verdana, 27.75pt - - - NoControl - - - 424, 49 - - - 15, 14 - - - 3 - - - checkBox1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 0 - - - True - - - Verdana, 27.75pt - - - NoControl - - - 424, 49 - - - 15, 14 - - - 8 - - - checkBox2 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 0 - - - True - - - Verdana, 27.75pt - - - NoControl - - - 424, 49 - - - 15, 14 - - - 8 - - - checkBox3 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 0 - - - True - - - Verdana, 27.75pt - - - NoControl - - - 424, 49 - - - 15, 14 - - - 8 - - - checkBox4 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 0 - - - True - - - Verdana, 27.75pt - - - NoControl - - - 424, 49 - - - 15, 14 - - - 8 - - - checkBox5 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 0 - - - True - - - 6, 13 - - - True - - - 715, 656 - - - Daten - - - CycleBeginningForm - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.ru.resx b/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.ru.resx deleted file mode 100644 index c93c92f5b..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.ru.resx +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - OK - - - Водосчетчик 1 - - - Серийный номер: - - - Водосчетчик 2 - - - Серийный номер: - - - Водосчетчик 3 - - - Серийный номер: - - - Водосчетчик 4 - - - Серийный номер: - - - Водосчетчик 5 - - - Серийный номер: - - - Серийный номер: - - - Водосчетчик 6 - - - Дата - - \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs b/TBF/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs deleted file mode 100644 index 3b50d1796..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs +++ /dev/null @@ -1,514 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -namespace TBF.BenchControl.DataEntry.Munich3 -{ - partial class CycleEndForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.okButton = new System.Windows.Forms.Button(); - this.protocolGroupBox = new System.Windows.Forms.GroupBox(); - this.radioButton3 = new System.Windows.Forms.RadioButton(); - this.radioButton2 = new System.Windows.Forms.RadioButton(); - this.radioButton1 = new System.Windows.Forms.RadioButton(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.label5 = new System.Windows.Forms.Label(); - this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.textBox6 = new System.Windows.Forms.TextBox(); - this.label6 = new System.Windows.Forms.Label(); - this.radioButton4 = new System.Windows.Forms.RadioButton(); - this.yearOfProduction1Label = new System.Windows.Forms.Label(); - this.yearOfProduction2Label = new System.Windows.Forms.Label(); - this.yearOfProduction3Label = new System.Windows.Forms.Label(); - this.yearOfProduction4Label = new System.Windows.Forms.Label(); - this.yearOfProduction5Label = new System.Windows.Forms.Label(); - this.yearOfProduction6Label = new System.Windows.Forms.Label(); - this.yearOfProduction1TextBox = new System.Windows.Forms.TextBox(); - this.yearOfProduction2TextBox = new System.Windows.Forms.TextBox(); - this.yearOfProduction3TextBox = new System.Windows.Forms.TextBox(); - this.yearOfProduction4TextBox = new System.Windows.Forms.TextBox(); - this.yearOfProduction5TextBox = new System.Windows.Forms.TextBox(); - this.yearOfProduction6TextBox = new System.Windows.Forms.TextBox(); - this.groupBox2.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.protocolGroupBox.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.groupBox4.SuspendLayout(); - this.groupBox5.SuspendLayout(); - this.groupBox6.SuspendLayout(); - this.SuspendLayout(); - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.yearOfProduction2TextBox); - this.groupBox2.Controls.Add(this.yearOfProduction2Label); - this.groupBox2.Controls.Add(this.textBox2); - this.groupBox2.Controls.Add(this.label2); - this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox2.ForeColor = System.Drawing.Color.Black; - this.groupBox2.Location = new System.Drawing.Point(25, 284); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(682, 81); - this.groupBox2.TabIndex = 2; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Wasserzähler 2"; - // - // textBox2 - // - this.textBox2.Location = new System.Drawing.Point(160, 31); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(163, 31); - this.textBox2.TabIndex = 1; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(18, 34); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(74, 23); - this.label2.TabIndex = 0; - this.label2.Text = "Stand:"; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.yearOfProduction1TextBox); - this.groupBox1.Controls.Add(this.yearOfProduction1Label); - this.groupBox1.Controls.Add(this.textBox1); - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox1.ForeColor = System.Drawing.Color.Black; - this.groupBox1.Location = new System.Drawing.Point(25, 194); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(682, 81); - this.groupBox1.TabIndex = 1; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Wasserzähler 1"; - // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(160, 31); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(163, 31); - this.textBox1.TabIndex = 1; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(18, 34); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(74, 23); - this.label1.TabIndex = 0; - this.label1.Text = "Stand:"; - // - // okButton - // - this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.okButton.ForeColor = System.Drawing.Color.Black; - this.okButton.Location = new System.Drawing.Point(584, 29); - this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(98, 63); - this.okButton.TabIndex = 7; - this.okButton.Text = "OK"; - this.okButton.UseVisualStyleBackColor = true; - this.okButton.Click += new System.EventHandler(this.okButton_Click); - // - // protocolGroupBox - // - this.protocolGroupBox.Controls.Add(this.radioButton4); - this.protocolGroupBox.Controls.Add(this.radioButton3); - this.protocolGroupBox.Controls.Add(this.radioButton2); - this.protocolGroupBox.Controls.Add(this.radioButton1); - this.protocolGroupBox.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.protocolGroupBox.Location = new System.Drawing.Point(25, 13); - this.protocolGroupBox.Name = "protocolGroupBox"; - this.protocolGroupBox.Size = new System.Drawing.Size(362, 175); - this.protocolGroupBox.TabIndex = 0; - this.protocolGroupBox.TabStop = false; - this.protocolGroupBox.Text = "Protokoll"; - // - // radioButton3 - // - this.radioButton3.AutoSize = true; - this.radioButton3.Location = new System.Drawing.Point(34, 100); - this.radioButton3.Name = "radioButton3"; - this.radioButton3.Size = new System.Drawing.Size(152, 27); - this.radioButton3.TabIndex = 2; - this.radioButton3.TabStop = true; - this.radioButton3.Text = "radioButton3"; - this.radioButton3.UseVisualStyleBackColor = true; - this.radioButton3.CheckedChanged += new System.EventHandler(this.radioButton3_CheckedChanged); - // - // radioButton2 - // - this.radioButton2.AutoSize = true; - this.radioButton2.Location = new System.Drawing.Point(34, 67); - this.radioButton2.Name = "radioButton2"; - this.radioButton2.Size = new System.Drawing.Size(152, 27); - this.radioButton2.TabIndex = 1; - this.radioButton2.TabStop = true; - this.radioButton2.Text = "radioButton2"; - this.radioButton2.UseVisualStyleBackColor = true; - this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged); - // - // radioButton1 - // - this.radioButton1.AutoSize = true; - this.radioButton1.Checked = true; - this.radioButton1.Location = new System.Drawing.Point(34, 34); - this.radioButton1.Name = "radioButton1"; - this.radioButton1.Size = new System.Drawing.Size(152, 27); - this.radioButton1.TabIndex = 0; - this.radioButton1.TabStop = true; - this.radioButton1.Text = "radioButton1"; - this.radioButton1.UseVisualStyleBackColor = true; - this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.yearOfProduction3TextBox); - this.groupBox3.Controls.Add(this.yearOfProduction3Label); - this.groupBox3.Controls.Add(this.textBox3); - this.groupBox3.Controls.Add(this.label3); - this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox3.ForeColor = System.Drawing.Color.Black; - this.groupBox3.Location = new System.Drawing.Point(25, 374); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(682, 81); - this.groupBox3.TabIndex = 3; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "Wasserzähler 3"; - // - // textBox3 - // - this.textBox3.Location = new System.Drawing.Point(160, 31); - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(163, 31); - this.textBox3.TabIndex = 1; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(18, 34); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(74, 23); - this.label3.TabIndex = 0; - this.label3.Text = "Stand:"; - // - // groupBox4 - // - this.groupBox4.Controls.Add(this.yearOfProduction4TextBox); - this.groupBox4.Controls.Add(this.yearOfProduction4Label); - this.groupBox4.Controls.Add(this.textBox4); - this.groupBox4.Controls.Add(this.label4); - this.groupBox4.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox4.ForeColor = System.Drawing.Color.Black; - this.groupBox4.Location = new System.Drawing.Point(25, 464); - this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(682, 81); - this.groupBox4.TabIndex = 4; - this.groupBox4.TabStop = false; - this.groupBox4.Text = "Wasserzähler 4"; - // - // textBox4 - // - this.textBox4.Location = new System.Drawing.Point(160, 31); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(163, 31); - this.textBox4.TabIndex = 1; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(18, 34); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(74, 23); - this.label4.TabIndex = 0; - this.label4.Text = "Stand:"; - // - // groupBox5 - // - this.groupBox5.Controls.Add(this.yearOfProduction5TextBox); - this.groupBox5.Controls.Add(this.yearOfProduction5Label); - this.groupBox5.Controls.Add(this.textBox5); - this.groupBox5.Controls.Add(this.label5); - this.groupBox5.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox5.ForeColor = System.Drawing.Color.Black; - this.groupBox5.Location = new System.Drawing.Point(25, 554); - this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(682, 81); - this.groupBox5.TabIndex = 5; - this.groupBox5.TabStop = false; - this.groupBox5.Text = "Wasserzähler 5"; - // - // textBox5 - // - this.textBox5.Location = new System.Drawing.Point(160, 31); - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(163, 31); - this.textBox5.TabIndex = 1; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(18, 34); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(74, 23); - this.label5.TabIndex = 0; - this.label5.Text = "Stand:"; - // - // groupBox6 - // - this.groupBox6.Controls.Add(this.yearOfProduction6TextBox); - this.groupBox6.Controls.Add(this.yearOfProduction6Label); - this.groupBox6.Controls.Add(this.textBox6); - this.groupBox6.Controls.Add(this.label6); - this.groupBox6.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox6.ForeColor = System.Drawing.Color.Black; - this.groupBox6.Location = new System.Drawing.Point(25, 644); - this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(682, 81); - this.groupBox6.TabIndex = 6; - this.groupBox6.TabStop = false; - this.groupBox6.Text = "Wasserzähler 6"; - // - // textBox6 - // - this.textBox6.Location = new System.Drawing.Point(160, 31); - this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(163, 31); - this.textBox6.TabIndex = 1; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(18, 34); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(74, 23); - this.label6.TabIndex = 0; - this.label6.Text = "Stand:"; - // - // radioButton4 - // - this.radioButton4.AutoSize = true; - this.radioButton4.Location = new System.Drawing.Point(34, 133); - this.radioButton4.Name = "radioButton4"; - this.radioButton4.Size = new System.Drawing.Size(152, 27); - this.radioButton4.TabIndex = 3; - this.radioButton4.TabStop = true; - this.radioButton4.Text = "radioButton4"; - this.radioButton4.UseVisualStyleBackColor = true; - this.radioButton4.CheckedChanged += new System.EventHandler(this.radioButton4_CheckedChanged); - // - // yearOfProduction1Label - // - this.yearOfProduction1Label.AutoSize = true; - this.yearOfProduction1Label.Location = new System.Drawing.Point(351, 34); - this.yearOfProduction1Label.Name = "yearOfProduction1Label"; - this.yearOfProduction1Label.Size = new System.Drawing.Size(188, 23); - this.yearOfProduction1Label.TabIndex = 9; - this.yearOfProduction1Label.Text = "Year of production"; - // - // yearOfProduction2Label - // - this.yearOfProduction2Label.AutoSize = true; - this.yearOfProduction2Label.Location = new System.Drawing.Point(351, 34); - this.yearOfProduction2Label.Name = "yearOfProduction2Label"; - this.yearOfProduction2Label.Size = new System.Drawing.Size(188, 23); - this.yearOfProduction2Label.TabIndex = 10; - this.yearOfProduction2Label.Text = "Year of production"; - // - // yearOfProduction3Label - // - this.yearOfProduction3Label.AutoSize = true; - this.yearOfProduction3Label.Location = new System.Drawing.Point(351, 34); - this.yearOfProduction3Label.Name = "yearOfProduction3Label"; - this.yearOfProduction3Label.Size = new System.Drawing.Size(188, 23); - this.yearOfProduction3Label.TabIndex = 10; - this.yearOfProduction3Label.Text = "Year of production"; - // - // yearOfProduction4Label - // - this.yearOfProduction4Label.AutoSize = true; - this.yearOfProduction4Label.Location = new System.Drawing.Point(351, 34); - this.yearOfProduction4Label.Name = "yearOfProduction4Label"; - this.yearOfProduction4Label.Size = new System.Drawing.Size(188, 23); - this.yearOfProduction4Label.TabIndex = 10; - this.yearOfProduction4Label.Text = "Year of production"; - // - // yearOfProduction5Label - // - this.yearOfProduction5Label.AutoSize = true; - this.yearOfProduction5Label.Location = new System.Drawing.Point(351, 34); - this.yearOfProduction5Label.Name = "yearOfProduction5Label"; - this.yearOfProduction5Label.Size = new System.Drawing.Size(188, 23); - this.yearOfProduction5Label.TabIndex = 10; - this.yearOfProduction5Label.Text = "Year of production"; - // - // yearOfProduction6Label - // - this.yearOfProduction6Label.AutoSize = true; - this.yearOfProduction6Label.Location = new System.Drawing.Point(351, 34); - this.yearOfProduction6Label.Name = "yearOfProduction6Label"; - this.yearOfProduction6Label.Size = new System.Drawing.Size(188, 23); - this.yearOfProduction6Label.TabIndex = 10; - this.yearOfProduction6Label.Text = "Year of production"; - // - // yearOfProduction1TextBox - // - this.yearOfProduction1TextBox.Location = new System.Drawing.Point(559, 31); - this.yearOfProduction1TextBox.Name = "yearOfProduction1TextBox"; - this.yearOfProduction1TextBox.Size = new System.Drawing.Size(98, 31); - this.yearOfProduction1TextBox.TabIndex = 10; - // - // yearOfProduction2TextBox - // - this.yearOfProduction2TextBox.Location = new System.Drawing.Point(559, 31); - this.yearOfProduction2TextBox.Name = "yearOfProduction2TextBox"; - this.yearOfProduction2TextBox.Size = new System.Drawing.Size(98, 31); - this.yearOfProduction2TextBox.TabIndex = 11; - // - // yearOfProduction3TextBox - // - this.yearOfProduction3TextBox.Location = new System.Drawing.Point(559, 31); - this.yearOfProduction3TextBox.Name = "yearOfProduction3TextBox"; - this.yearOfProduction3TextBox.Size = new System.Drawing.Size(98, 31); - this.yearOfProduction3TextBox.TabIndex = 11; - // - // yearOfProduction4TextBox - // - this.yearOfProduction4TextBox.Location = new System.Drawing.Point(559, 31); - this.yearOfProduction4TextBox.Name = "yearOfProduction4TextBox"; - this.yearOfProduction4TextBox.Size = new System.Drawing.Size(98, 31); - this.yearOfProduction4TextBox.TabIndex = 11; - // - // yearOfProduction5TextBox - // - this.yearOfProduction5TextBox.Location = new System.Drawing.Point(559, 31); - this.yearOfProduction5TextBox.Name = "yearOfProduction5TextBox"; - this.yearOfProduction5TextBox.Size = new System.Drawing.Size(98, 31); - this.yearOfProduction5TextBox.TabIndex = 11; - // - // yearOfProduction6TextBox - // - this.yearOfProduction6TextBox.Location = new System.Drawing.Point(559, 31); - this.yearOfProduction6TextBox.Name = "yearOfProduction6TextBox"; - this.yearOfProduction6TextBox.Size = new System.Drawing.Size(98, 31); - this.yearOfProduction6TextBox.TabIndex = 11; - // - // CycleEndForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.DarkGoldenrod; - this.ClientSize = new System.Drawing.Size(719, 746); - this.Controls.Add(this.groupBox6); - this.Controls.Add(this.groupBox5); - this.Controls.Add(this.groupBox4); - this.Controls.Add(this.groupBox3); - this.Controls.Add(this.protocolGroupBox); - this.Controls.Add(this.okButton); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.groupBox1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Name = "CycleEndForm"; - this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; - this.Text = "Daten"; - this.TopMost = true; - this.Load += new System.EventHandler(this.CycleEndForm_Load); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.protocolGroupBox.ResumeLayout(false); - this.protocolGroupBox.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.groupBox4.ResumeLayout(false); - this.groupBox4.PerformLayout(); - this.groupBox5.ResumeLayout(false); - this.groupBox5.PerformLayout(); - this.groupBox6.ResumeLayout(false); - this.groupBox6.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Button okButton; - private System.Windows.Forms.GroupBox protocolGroupBox; - private System.Windows.Forms.RadioButton radioButton3; - private System.Windows.Forms.RadioButton radioButton2; - private System.Windows.Forms.RadioButton radioButton1; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.TextBox textBox3; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.GroupBox groupBox4; - private System.Windows.Forms.TextBox textBox4; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.GroupBox groupBox5; - private System.Windows.Forms.TextBox textBox5; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.GroupBox groupBox6; - private System.Windows.Forms.TextBox textBox6; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.RadioButton radioButton4; - private System.Windows.Forms.Label yearOfProduction1Label; - private System.Windows.Forms.TextBox yearOfProduction2TextBox; - private System.Windows.Forms.Label yearOfProduction2Label; - private System.Windows.Forms.TextBox yearOfProduction1TextBox; - private System.Windows.Forms.TextBox yearOfProduction3TextBox; - private System.Windows.Forms.Label yearOfProduction3Label; - private System.Windows.Forms.TextBox yearOfProduction4TextBox; - private System.Windows.Forms.Label yearOfProduction4Label; - private System.Windows.Forms.TextBox yearOfProduction5TextBox; - private System.Windows.Forms.Label yearOfProduction5Label; - private System.Windows.Forms.TextBox yearOfProduction6TextBox; - private System.Windows.Forms.Label yearOfProduction6Label; - - } -} \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/Munich3/CycleEndForm.cs b/TBF/BenchControl/DataEntry/Munich3/CycleEndForm.cs deleted file mode 100644 index 038a0f003..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/CycleEndForm.cs +++ /dev/null @@ -1,194 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -using System; -using System.Windows.Forms; -using log4net; -using TBF.Resources; - -namespace TBF.BenchControl.DataEntry.Munich3 -{ - public partial class CycleEndForm : Form, GenericDevices.IHasCompleted - { - private static readonly ILog log = LogManager.GetLogger(typeof(CycleEndForm)); - - /// Number of text boxes for serial numbers - public readonly int WaterMetersCount; - - // To be set before the form opens - public string ProtocolName1; - public string ProtocolName2; - public string ProtocolName3; - public string ProtocolName4; - - // To be retrieved after the form closes - public string ProtocolTitle; - public string[] EndStateText; - public int[] YearOfProduction; - - // Set to 'true' when the form closes - public bool Completed { get { return completed; } } - bool completed; - - /// - /// Constructor - /// - /// Number of text boxes for serial numbers - public CycleEndForm(int waterMetersCount) - { - InitializeComponent(); - ControlBox = false; - - this.WaterMetersCount = waterMetersCount; - EndStateText = new string[WaterMetersCount]; - YearOfProduction = new int[WaterMetersCount]; - completed = false; - StartForceCloseHandler(); - } - - /// Parameterless constructor for 3 watermeters - public CycleEndForm() - : this(3) - { - } - - private void CycleEndForm_Load(object sender, EventArgs e) - { - Localize(); - - radioButton1.Text = ProtocolName1; - radioButton2.Text = ProtocolName2; - radioButton3.Text = ProtocolName3; - radioButton4.Text = ProtocolName4; - - if (WaterMetersCount < 1) groupBox1.Visible = false; - if (WaterMetersCount < 2) groupBox2.Visible = false; - if (WaterMetersCount < 3) groupBox3.Visible = false; - if (WaterMetersCount < 4) groupBox4.Visible = false; - if (WaterMetersCount < 5) groupBox5.Visible = false; - if (WaterMetersCount < 6) groupBox6.Visible = false; - - if (Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count >= 1) - { - YearOfProduction[0] = Sequences.ProcessData.BatchRslts.Batch.WaterMeters[0].YearOfProduction; - yearOfProduction1TextBox.Text = YearOfProduction[0].ToString(); - } - if (Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count >= 2) - { - YearOfProduction[1] = Sequences.ProcessData.BatchRslts.Batch.WaterMeters[1].YearOfProduction; - yearOfProduction2TextBox.Text = YearOfProduction[1].ToString(); - } - if (Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count >= 3) - { - YearOfProduction[2] = Sequences.ProcessData.BatchRslts.Batch.WaterMeters[2].YearOfProduction; - yearOfProduction3TextBox.Text = YearOfProduction[2].ToString(); - } - if (Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count >= 4) - { - YearOfProduction[3] = Sequences.ProcessData.BatchRslts.Batch.WaterMeters[3].YearOfProduction; - yearOfProduction4TextBox.Text = YearOfProduction[3].ToString(); - } - if (Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count >= 5) - { - YearOfProduction[4] = Sequences.ProcessData.BatchRslts.Batch.WaterMeters[4].YearOfProduction; - yearOfProduction5TextBox.Text = YearOfProduction[4].ToString(); - } - if (Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count >= 6) - { - YearOfProduction[5] = Sequences.ProcessData.BatchRslts.Batch.WaterMeters[5].YearOfProduction; - yearOfProduction6TextBox.Text = YearOfProduction[5].ToString(); - } - - Height = 228 + 90 * WaterMetersCount; - - AnyRadioButtonChanged(); - } - - void Localize() - { - Text = Strings.Data; - protocolGroupBox.Text = Strings.Protocol; - okButton.Text = Strings.OkBtnText; - - groupBox1.Text = Strings.Water_Meter + " 1"; - groupBox2.Text = Strings.Water_Meter + " 2"; - groupBox3.Text = Strings.Water_Meter + " 3"; - groupBox4.Text = Strings.Water_Meter + " 4"; - groupBox5.Text = Strings.Water_Meter + " 5"; - groupBox6.Text = Strings.Water_Meter + " 6"; - - label1.Text = label2.Text = label3.Text = label4.Text - = label5.Text = label6.Text = Strings.State; - - yearOfProduction1Label.Text = yearOfProduction2Label.Text - = yearOfProduction3Label.Text = yearOfProduction4Label.Text - = yearOfProduction5Label.Text = yearOfProduction6Label.Text = Strings.Year_of_production; - } - - private void okButton_Click(object sender, EventArgs e) - { - if (radioButton1.Checked) ProtocolTitle = ProtocolName1; - else if (radioButton2.Checked) ProtocolTitle = ProtocolName2; - else if (radioButton3.Checked) ProtocolTitle = ProtocolName3; - else if (radioButton4.Checked) ProtocolTitle = ProtocolName4; - - if (WaterMetersCount >= 1) EndStateText[0] = textBox1.Text; - if (WaterMetersCount >= 2) EndStateText[1] = textBox2.Text; - if (WaterMetersCount >= 3) EndStateText[2] = textBox3.Text; - if (WaterMetersCount >= 4) EndStateText[3] = textBox4.Text; - if (WaterMetersCount >= 5) EndStateText[4] = textBox5.Text; - if (WaterMetersCount >= 6) EndStateText[5] = textBox6.Text; - - if (ShowYear()) - { - int year; - if (WaterMetersCount >= 1 && int.TryParse(yearOfProduction1TextBox.Text, out year)) YearOfProduction[0] = year; - if (WaterMetersCount >= 2 && int.TryParse(yearOfProduction2TextBox.Text, out year)) YearOfProduction[1] = year; - if (WaterMetersCount >= 3 && int.TryParse(yearOfProduction3TextBox.Text, out year)) YearOfProduction[2] = year; - if (WaterMetersCount >= 4 && int.TryParse(yearOfProduction4TextBox.Text, out year)) YearOfProduction[3] = year; - if (WaterMetersCount >= 5 && int.TryParse(yearOfProduction5TextBox.Text, out year)) YearOfProduction[4] = year; - if (WaterMetersCount >= 6 && int.TryParse(yearOfProduction6TextBox.Text, out year)) YearOfProduction[5] = year; - } - - completed = true; - Close(); - } - - #region Forced close handling - - public void StartForceCloseHandler() - { - UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args) - { - if (InvokeRequired) { Invoke(new EventHandler(OnForceClose), sender, args); } - else OnForceClose(sender, args); - }; - } - - void OnForceClose(object sender, EventArgs args) - { - DialogResult = DialogResult.Cancel; - Close(); - } - - #endregion - - private void radioButton1_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } - private void radioButton2_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } - private void radioButton3_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } - private void radioButton4_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } - - bool ShowYear() - { - return radioButton2.Checked || radioButton3.Checked || radioButton4.Checked; - } - - void AnyRadioButtonChanged() - { - yearOfProduction1TextBox.Visible = yearOfProduction2TextBox.Visible = yearOfProduction3TextBox.Visible = - yearOfProduction4TextBox.Visible = yearOfProduction5TextBox.Visible = yearOfProduction6TextBox.Visible = - yearOfProduction1Label.Visible = yearOfProduction2Label.Visible = yearOfProduction3Label.Visible = - yearOfProduction4Label.Visible = yearOfProduction5Label.Visible = yearOfProduction6Label.Visible = ShowYear(); - } - } -} diff --git a/TBF/BenchControl/DataEntry/Munich3/CycleEndForm.resx b/TBF/BenchControl/DataEntry/Munich3/CycleEndForm.resx deleted file mode 100644 index 1af7de150..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/CycleEndForm.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/Munich3/EntryForm.cs b/TBF/BenchControl/DataEntry/Munich3/EntryForm.cs deleted file mode 100644 index fce121d88..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/EntryForm.cs +++ /dev/null @@ -1,263 +0,0 @@ -/// -/// Copyright (c) 2013-2017 Sensus Metering Systems -/// -using System; -using System.Collections.Generic; -using log4net; -using Config.Entities; -using TBF.BenchControl; -using TBF.BenchControl.GenericDevices; - -namespace TBF.BenchControl.DataEntry.Munich3 -{ - public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm, IHasWMStatesForm - { - private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm)); - public override string ToString() { return string.Format("DataEntry.Munich3({0})", Cfg.ToString(1)); } - - public bool UsesCameras() { return false; } - - readonly EntryFormCfg entryFormCfg; - IRegReader[] regReaders; - - /// - /// Properties set by the Begin and the End form - /// - string[] serialNr; - public string SerialNr(int wmNr) { return (wmNr >= 0 && wmNr < serialNr.Length) ? serialNr[wmNr] : string.Empty; } - - bool[] disabled; - public bool Disabled(int wmNr) { return (wmNr >= 0 && wmNr < disabled.Length) ? disabled[wmNr] : false; } - - string[] wmCycleEndState; - public string WMCycleEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmCycleEndState.Length) ? wmCycleEndState[wmNr] : string.Empty; } - - double[] wmStartState; - public double WMStartState(int wmNr) { return (wmNr >= 0 && wmNr < wmStartState.Length) ? wmStartState[wmNr] : 0; } - - double[] wmEndState; - public double WMEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmEndState.Length) ? wmEndState[wmNr] : 0; } - - string[] wmStartStateStr; - - - System.Windows.Forms.Form modelessDlg; - public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } } - - double refVolume; - double errLimLo; - double errLimHi; - - bool resultSaved; - - IList waterMeters; /// Reference to ...ProcessData.BatchRslts.WaterMeters[] - - public enum CurrentOp - { - None, - ShowFormAtCycleBeginning, - ShowFormAtCycleEnd, - EnterTestStartStates, - EnterTestEndStates, - } - - CurrentOp currentOp; - - - public EntryForm() - { - } - - public EntryForm(Generic.IComponentCfg cfg) - : base(cfg) - { - entryFormCfg = cfg as EntryFormCfg; - - serialNr = new string[Config.Data.WMsCount]; - disabled = new bool[Config.Data.WMsCount]; - wmStartState = new double[Config.Data.WMsCount]; - wmStartStateStr = new string[Config.Data.WMsCount]; - wmEndState = new double[Config.Data.WMsCount]; - wmCycleEndState = new string[Config.Data.WMsCount]; - - currentOp = CurrentOp.None; - log.Warn(this.ToString()); - } - - /// Reference to the operation - public IOperation ShowCycleBeginFormOp() - { - if (currentOp != CurrentOp.None) throw new Exception("Sequence error"); - currentOp = CurrentOp.ShowFormAtCycleBeginning; - this.waterMeters = TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch.WaterMeters; - return this; - } - - /// Reference to the operation - public IOperation ShowCycleEndFormOp(IList waterMeters) - { - if (currentOp != CurrentOp.None) throw new Exception("Sequence error"); - currentOp = CurrentOp.ShowFormAtCycleEnd; - this.waterMeters = waterMeters; - return this; - } - - /// Reference to the operation - public IOperation ShowTestStartFormOp(IRegReader[] regReaders) - { - if (currentOp != CurrentOp.None) throw new Exception("Sequence error"); - currentOp = CurrentOp.EnterTestStartStates; - this.regReaders = regReaders; - return this; - } - - /// null (not implemented) - public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList waterMeters, bool isCondOp) { return null; } - - /// Reference to the operation - public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi) - { - if (currentOp != CurrentOp.None) throw new Exception("Sequence error"); - currentOp = CurrentOp.EnterTestEndStates; - this.regReaders = regReaders; - this.refVolume = refVolume; - this.errLimLo = errLimLo; - this.errLimHi = errLimHi; - return this; - } - - delegate void EntryFormDlgt(EntryForm myRef); - /// - void OpenBeginningDlg(EntryForm myRef) - { - myRef.modelessDlg = new CycleBeginningForm(Config.Data.WMsCount); - modelessDlg.Show(); - } - /// - void OpenEndDlg(EntryForm myRef) - { - CycleEndForm endForm = new CycleEndForm(Config.Data.WMsCount); - endForm.ProtocolName1 = entryFormCfg.ProtocolTitle1; - endForm.ProtocolName2 = entryFormCfg.ProtocolTitle2; - endForm.ProtocolName3 = entryFormCfg.ProtocolTitle3; - endForm.ProtocolName4 = entryFormCfg.ProtocolTitle4; - myRef.modelessDlg = endForm; - modelessDlg.Show(); - } - /// - void OpenTestStartStatesDlg(EntryForm myRef) - { - myRef.modelessDlg = new TestStartEndForm(myRef.waterMeters.Count, myRef.regReaders, disabled); - modelessDlg.Show(); - } - /// - void OpenTestEndStatesDlg(EntryForm myRef) - { - myRef.modelessDlg = new TestStartEndForm(Config.Data.WMsCount, myRef.regReaders, wmStartStateStr, disabled, refVolume, errLimLo, errLimHi); - modelessDlg.Show(); - } - - /// Start this operation - public void Start() - { - resultSaved = false; - switch (currentOp) - { - case CurrentOp.ShowFormAtCycleBeginning: - Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this); - break; - case CurrentOp.ShowFormAtCycleEnd: - Program.MainWnd.Invoke(new EntryFormDlgt(OpenEndDlg), this); - break; - case CurrentOp.EnterTestStartStates: - Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestStartStatesDlg), this); - break; - case CurrentOp.EnterTestEndStates: - Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestEndStatesDlg), this); - break; - } - } - - /// Run this operation - /// Event.ResultsPrinted - public Event Run() - { - if ((modelessDlg is IHasCompleted) && !(modelessDlg as IHasCompleted).Completed) - { - return Event.ModelessFormIsOpen; - } - - if (!resultSaved) /// This is to save the result only once - { - if (modelessDlg is CycleBeginningForm) - { - CycleBeginningForm dlg = (modelessDlg as CycleBeginningForm); - - for (int i = 0; i < Math.Min(dlg.WaterMetersCount, waterMeters.Count); i++) - { - if (waterMeters[i] != null) - { - waterMeters[i].Disabled = disabled[i] = dlg.Disabled[i]; - waterMeters[i].SerialNr = serialNr[i] = dlg.SNText[i]; - } - } - } - else if (modelessDlg is CycleEndForm) - { - CycleEndForm dlg = (modelessDlg as CycleEndForm); - - Sequences.ProcessData.BatchRslts.Batch.ProtocolTitle = dlg.ProtocolTitle; - - for (int i = 0; i < Math.Min(dlg.WaterMetersCount, waterMeters.Count); i++) - { - if (waterMeters[i] != null) - { - waterMeters[i].EndState = wmCycleEndState[i] = dlg.EndStateText[i]; - waterMeters[i].YearOfProduction = dlg.YearOfProduction[i]; - } - } - } - else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestStartStates) - { - /// Fixed start test - start - TestStartEndForm dlg = (modelessDlg as TestStartEndForm); - if (dlg != null) - { - for (int i = 0; i < dlg.WaterMetersCount; i++) - { - wmStartState[i] = dlg.WMStartState[i]; - wmStartStateStr[i] = dlg.WMStartStateStr[i]; - } - } - } - else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestEndStates) - { - /// Fixed start test - end - TestStartEndForm dlg = (modelessDlg as TestStartEndForm); - if (dlg != null) - { - for (int i = 0; i < dlg.WaterMetersCount; i++) - { - wmEndState[i] = dlg.WMEndState[i]; - } - } - } - resultSaved = true; - modelessDlg = null; - } - - return Event.ModelessFormClosed; /// Form closed - } - - /// Stop this operation - public void Stop() - { - if (modelessDlg is IHasCompleted) - { - UiBridge.Bridge.OnCloseModelessForm(this, null); - modelessDlg = null; - } - currentOp = CurrentOp.None; - } - } -} diff --git a/TBF/BenchControl/DataEntry/Munich3/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Munich3/EntryFormCfg.cs deleted file mode 100644 index 6602312db..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/EntryFormCfg.cs +++ /dev/null @@ -1,52 +0,0 @@ -/// -/// Copyright (c) 2013-2016 Sensus Metering Systems -/// -using System.Collections.Generic; -using System.Xml.Serialization; -using TBF.BenchControl.Generic; - -namespace TBF.BenchControl.DataEntry.Munich3 -{ - public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg - { - public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0]; - public override XmlSerializer GetSerializer() { return Serializer; } - - public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new EntryFormCfgCtrl(); } - - /// - /// Serialized parameters - /// - public string ProtocolTitle1; - public string ProtocolTitle2; - public string ProtocolTitle3; - public string ProtocolTitle4; - - /// Private parameterless constructor invoked by all other (public) constructors - EntryFormCfg() - { - Name = "DataEntryForm-3"; - ParentName = string.Empty; - ProtocolTitle1 = "Protokoll 1"; - ProtocolTitle2 = "Protokoll 2"; - ProtocolTitle3 = "Protokoll 3"; - ProtocolTitle4 = "Protokoll 4"; - } - - public EntryFormCfg(IComponentFactory factory) - : this() - { - this.Factory = factory; - } - - public string ToString(int i) - { - return string.Format("Name={0}, P1={1}, P2={2}, P3={3}, P4={4}", - Name, - (string.IsNullOrEmpty(ProtocolTitle1) ? "-" : ProtocolTitle1), - (string.IsNullOrEmpty(ProtocolTitle2) ? "-" : ProtocolTitle2), - (string.IsNullOrEmpty(ProtocolTitle3) ? "-" : ProtocolTitle3), - (string.IsNullOrEmpty(ProtocolTitle4) ? "-" : ProtocolTitle4)); - } - } -} diff --git a/TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs deleted file mode 100644 index 257b1d98d..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs +++ /dev/null @@ -1,81 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -using System; -using System.Windows.Forms; -using Config.Entities; -using TBF.BenchControl.Generic; - -namespace TBF.BenchControl.DataEntry.Munich3 -{ - public partial class EntryFormCfgCtrl : UserControl, IComponentCfgCtrl - { - public bool ShowMore { get { return false; } } - - EntryFormCfg config; - public IComponentCfg Config - { - get { return config as IComponentCfg; } - set - { - config = value as EntryFormCfg; - Redraw(); - } - } - - public EntryFormCfgCtrl() - { - InitializeComponent(); - } - - private void EntryFormCfgCtrl_Load(object sender, EventArgs e) - { - Redraw(); - } - - public void Closing() - { - } - - void Redraw() - { - if (config == null) return; /// Control was not loaded, settings were not changed - classNameLabel.Text = config.Factory.ClassName; - nameTextBox.Text = config.Name; - protocolTitle1TextBox.Text = config.ProtocolTitle1; - protocolTitle2TextBox.Text = config.ProtocolTitle2; - protocolTitle3TextBox.Text = config.ProtocolTitle3; - protocolTitle4TextBox.Text = config.ProtocolTitle4; - } - - public void Unlock() - { - nameTextBox.Enabled = true; - protocolTitle1TextBox.Enabled = true; - protocolTitle2TextBox.Enabled = true; - protocolTitle3TextBox.Enabled = true; - protocolTitle4TextBox.Enabled = true; - } - - public CfgUpdateFlags VerifyCfg(ref string message) - { - CfgUpdateFlags flags = CfgUpdateFlags.None; - return flags; - } - - public CfgUpdateFlags UpdateCfg() - { - CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd; - - if (config == null) return CfgUpdateFlags.Error; /// Control was not loaded, settings were not changed - - config.Name = nameTextBox.Text; - config.ProtocolTitle1 = protocolTitle1TextBox.Text; - config.ProtocolTitle2 = protocolTitle2TextBox.Text; - config.ProtocolTitle3 = protocolTitle3TextBox.Text; - config.ProtocolTitle4 = protocolTitle4TextBox.Text; - - return flags; - } - } -} diff --git a/TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.designer.cs b/TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.designer.cs deleted file mode 100644 index 13f2ecc4b..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.designer.cs +++ /dev/null @@ -1,178 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -namespace TBF.BenchControl.DataEntry.Munich3 -{ - partial class EntryFormCfgCtrl - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - 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.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.protocolTitle1TextBox = new System.Windows.Forms.TextBox(); - this.protocolTitle2TextBox = new System.Windows.Forms.TextBox(); - this.protocolTitle3TextBox = new System.Windows.Forms.TextBox(); - this.protocolTitle4TextBox = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // nameTextBox - // - this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(137, 57); - this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(130, 20); - this.nameTextBox.TabIndex = 5; - // - // nameLabel - // - this.nameLabel.AutoSize = true; - this.nameLabel.Location = new System.Drawing.Point(27, 60); - this.nameLabel.Name = "nameLabel"; - this.nameLabel.Size = new System.Drawing.Size(35, 13); - this.nameLabel.TabIndex = 4; - this.nameLabel.Text = "Name"; - // - // classNameLabel - // - this.classNameLabel.AutoSize = true; - this.classNameLabel.Location = new System.Drawing.Point(134, 33); - this.classNameLabel.Name = "classNameLabel"; - this.classNameLabel.Size = new System.Drawing.Size(83, 13); - this.classNameLabel.TabIndex = 3; - this.classNameLabel.Text = "ComonentName"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(27, 86); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(74, 13); - this.label1.TabIndex = 6; - this.label1.Text = "Protocol title 1"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(27, 112); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(74, 13); - this.label2.TabIndex = 7; - this.label2.Text = "Protocol title 2"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(27, 138); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(74, 13); - this.label3.TabIndex = 8; - this.label3.Text = "Protocol title 3"; - // - // protocolTitle1TextBox - // - this.protocolTitle1TextBox.Enabled = false; - this.protocolTitle1TextBox.Location = new System.Drawing.Point(137, 83); - this.protocolTitle1TextBox.Name = "protocolTitle1TextBox"; - this.protocolTitle1TextBox.Size = new System.Drawing.Size(130, 20); - this.protocolTitle1TextBox.TabIndex = 9; - // - // protocolTitle2TextBox - // - this.protocolTitle2TextBox.Enabled = false; - this.protocolTitle2TextBox.Location = new System.Drawing.Point(137, 109); - this.protocolTitle2TextBox.Name = "protocolTitle2TextBox"; - this.protocolTitle2TextBox.Size = new System.Drawing.Size(130, 20); - this.protocolTitle2TextBox.TabIndex = 10; - // - // protocolTitle3TextBox - // - this.protocolTitle3TextBox.Enabled = false; - this.protocolTitle3TextBox.Location = new System.Drawing.Point(137, 135); - this.protocolTitle3TextBox.Name = "protocolTitle3TextBox"; - this.protocolTitle3TextBox.Size = new System.Drawing.Size(130, 20); - this.protocolTitle3TextBox.TabIndex = 11; - // - // protocolTitle4TextBox - // - this.protocolTitle4TextBox.Enabled = false; - this.protocolTitle4TextBox.Location = new System.Drawing.Point(137, 161); - this.protocolTitle4TextBox.Name = "protocolTitle4TextBox"; - this.protocolTitle4TextBox.Size = new System.Drawing.Size(130, 20); - this.protocolTitle4TextBox.TabIndex = 13; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(27, 164); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(74, 13); - this.label4.TabIndex = 12; - this.label4.Text = "Protocol title 4"; - // - // EntryFormCfgCtrl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.protocolTitle4TextBox); - this.Controls.Add(this.label4); - this.Controls.Add(this.protocolTitle3TextBox); - this.Controls.Add(this.protocolTitle2TextBox); - this.Controls.Add(this.protocolTitle1TextBox); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.nameTextBox); - this.Controls.Add(this.nameLabel); - this.Controls.Add(this.classNameLabel); - this.Name = "EntryFormCfgCtrl"; - this.Size = new System.Drawing.Size(300, 200); - this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.TextBox nameTextBox; - private System.Windows.Forms.Label nameLabel; - private System.Windows.Forms.Label classNameLabel; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.TextBox protocolTitle1TextBox; - private System.Windows.Forms.TextBox protocolTitle2TextBox; - private System.Windows.Forms.TextBox protocolTitle3TextBox; - private System.Windows.Forms.TextBox protocolTitle4TextBox; - private System.Windows.Forms.Label label4; - } -} diff --git a/TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.resx b/TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.resx deleted file mode 100644 index 1af7de150..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/Munich3/EntryFormFactory.cs b/TBF/BenchControl/DataEntry/Munich3/EntryFormFactory.cs deleted file mode 100644 index 58af1b0a3..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/EntryFormFactory.cs +++ /dev/null @@ -1,27 +0,0 @@ -/// -/// Copyright (c) 2013-2016 Sensus Metering Systems -/// -using System.Collections.Generic; -using TBF.BenchControl.Generic; - -namespace TBF.BenchControl.DataEntry.Munich3 -{ - public class EntryFormFactory : IComponentFactory - { - public string ClassName { get { return "DataEntryForm-3"; } } - public override string ToString() { return ClassName; } - - public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); } - - public IComponent DummyComponent() { return new EntryForm(); } - - public IComponent GetComponent(IComponentCfg cfg, IList components) { return new EntryForm(cfg); } - - public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); } - - public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component) - { - return ComponentCfgBase.CreateFromDbEntity(EntryFormCfg.Serializer, component, this); - } - } -} diff --git a/TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.cs deleted file mode 100644 index 86c5d9deb..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.cs +++ /dev/null @@ -1,405 +0,0 @@ -/// -/// Copyright (c) 2013-2017 Sensus Metering Systems -/// -using System; -using System.Windows.Forms; -using log4net; -using TBF.BenchControl.GenericDevices; -using TBF.Resources; - -namespace TBF.BenchControl.DataEntry.Munich3 -{ - public partial class TestStartEndForm : Form, GenericDevices.IHasCompleted - { - private static readonly ILog log = LogManager.GetLogger(typeof(TestStartEndForm)); - - // Set to 'true' when the form closes - public bool Completed { get { return completed; } } - bool completed; - - /// Number of water meters - public readonly int WaterMetersCount; - readonly IRegReader[] regReaders; - readonly bool[] disabled; - - // To be retrieved after the form closes - public double[] WMStartState; - - // To be retrieved after the form closes - public readonly string[] WMStartStateStr; - - // To be retrieved after the form closes - public double[] WMEndState; - - bool endStates; /// false=start states, true=end states - double refVolume; - double warningLimLo; /// limit to display exclamation mark, typically 2x errLimLo - double warningLimHi; /// limit to display exclamation mark, typically 2x errLimHi - - GroupBox[] groupBoxes; - Label[] labels; - TextBox[] startTextBoxes; - TextBox[] endTextBoxes; - Label[] exclamations; - - - public TestStartEndForm() - { - InitializeComponent(); - ControlBox = false; - - groupBoxes = new GroupBox[] { groupBox1, groupBox2, groupBox3, groupBox4, groupBox5, groupBox6 }; - labels = new Label[] { label1, label2, label3, label4, label5, label6 }; - startTextBoxes = new TextBox[] { startTextBox1, startTextBox2, startTextBox3, startTextBox4, startTextBox5, startTextBox6 }; - endTextBoxes = new TextBox[] { endTextBox1, endTextBox2, endTextBox3, endTextBox4, endTextBox5, endTextBox6 }; - exclamations = new Label[] { exclamation1, exclamation2, exclamation3, exclamation3, exclamation4, exclamation5 }; - - completed = false; - StartForceCloseHandler(); - } - - /// - /// Constructor to fill in start states - /// - /// Number of text boxes for serial numbers - public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled) - : this() - { - endStates = false; - - this.regReaders = regReaders; - this.WaterMetersCount = Math.Min(waterMetersCount, regReaders.Length); - this.disabled = disabled; - - WMStartState = new double[waterMetersCount]; - WMStartStateStr = new string[waterMetersCount]; - - Height = 70 + 90 * WaterMetersCount; - } - - /// - /// Constructor to fill in end states - /// - /// Number of text boxes for serial numbers - public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled, - double refVolume, double errLimLo, double errLimHi) - : this() - { - endStates = true; - - this.regReaders = regReaders; - this.WaterMetersCount = Math.Min(waterMetersCount, regReaders.Length); - this.WMStartStateStr = wmStartStateStr; - if (wmStartStateStr == null || wmStartStateStr.Length != this.WaterMetersCount) - throw (new Exception("Invalid 'wmStartStateStr' argument")); - this.disabled = disabled; - this.refVolume = refVolume; - this.warningLimLo = 2 * errLimLo; - this.warningLimHi = 2 * errLimHi; - - WMEndState = new double[waterMetersCount]; - - Height = 70 + 90 * WaterMetersCount; - } - - private void TestStartEndForm_Load(object sender, EventArgs e) - { - /// First 'WaterMetersCount' positions - for (int i = 0; i < WaterMetersCount; i++) - { - if (disabled.Length > i && regReaders[i] == null) disabled[i] = true; - - if (endStates) - { - startTextBoxes[i].Text = WMStartStateStr[i]; - endTextBoxes[i].Enabled = (disabled.Length > i && !disabled[i]); - } - else - { - startTextBoxes[i].Enabled = (disabled.Length > i && !disabled[i]); - } - } - - /// Remaining positions - for (int i = WaterMetersCount; i < 6; i++) - { - groupBoxes[i].Visible = false; - } - - Localize(); - } - - void Localize() - { - Text = Strings.Water_Meter_States; - startLabel.Text = Strings.Start; - endLabel.Text = Strings.End; - okButton.Text = Strings.OkBtnText; - - for (int i = 0; i < WaterMetersCount; i++) - { - groupBoxes[i].Text = string.Format("{0} {1}", Strings.Water_Meter, i + 1); - if (disabled.Length > i && !disabled[i]) - { - labels[i].Text = string.Format("{0} [{1}]", Strings.State, GetUnitStr(regReaders[i].PulsesPerLtr)); - } - else - { - labels[i].Text = string.Empty; - } - } - } - - - string GetUnitStr(double pulsesPerLtr) - { - if (pulsesPerLtr == 1 || pulsesPerLtr <= float.Epsilon) - { - return "l"; - } - else if (pulsesPerLtr == 0.001) - { - return "m3"; - } - else if (pulsesPerLtr == 1000) - { - return "ml"; - } - else - { - return string.Format("{0} l", 1/pulsesPerLtr); - } - } - - - private void okButton_Click(object sender, EventArgs e) - { - try - { - if (endStates) - { - for (int i = 0; i < WaterMetersCount; i++) - { - if (endTextBoxes[i].Enabled) WMEndState[i] = Utils.ParseUDouble(endTextBoxes[i].Text) * regReaders[i].LtrsPerPulse; - } - } - else - { - for (int i = 0; i < WaterMetersCount; i++) - { - if (startTextBoxes[i].Enabled) - { - WMStartStateStr[i] = startTextBoxes[i].Text; - WMStartState[i] = Utils.ParseUDouble(startTextBoxes[i].Text) * regReaders[i].LtrsPerPulse; - } - } - } - } - catch - { - return; - } - - completed = true; - Close(); - } - - #region Forced close handling - - public void StartForceCloseHandler() - { - UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args) - { - if (InvokeRequired) { Invoke(new EventHandler(OnForceClose), sender, args); } - else OnForceClose(sender, args); - }; - } - - void OnForceClose(object sender, EventArgs args) - { - DialogResult = DialogResult.Cancel; - Close(); - } - - #endregion - - - private void endTextBox1_TextChanged(object sender, EventArgs e) { EndTextChanged(0); } - private void endTextBox2_TextChanged(object sender, EventArgs e) { EndTextChanged(1); } - private void endTextBox3_TextChanged(object sender, EventArgs e) { EndTextChanged(2); } - private void endTextBox4_TextChanged(object sender, EventArgs e) { EndTextChanged(3); } - private void endTextBox5_TextChanged(object sender, EventArgs e) { EndTextChanged(4); } - private void endTextBox6_TextChanged(object sender, EventArgs e) { EndTextChanged(5); } - - void EndTextChanged(int i) - { - double err = 0; - try - { - double endState = Utils.ParseUDouble(endTextBoxes[i].Text) * regReaders[i].LtrsPerPulse; ; - double startState = Utils.ParseUDouble(startTextBoxes[i].Text) * regReaders[i].LtrsPerPulse; ; - err = 100.0 * (endState - startState - refVolume) / refVolume; - } - catch { err = 1000.0f; }; - - exclamations[i].Visible = (err < warningLimLo) || (warningLimHi < err); - } - - - private void startTextBox1_KeyPress(object sender, KeyPressEventArgs e) - { - if (e.KeyChar == '\r') - { - if (startTextBox2.Enabled) startTextBox2.Focus(); - else if (startTextBox3.Enabled) startTextBox3.Focus(); - else if (startTextBox4.Enabled) startTextBox4.Focus(); - else if (startTextBox5.Enabled) startTextBox5.Focus(); - else if (startTextBox6.Enabled) startTextBox6.Focus(); - } - else if (e.KeyChar == '+') okButton_Click(sender, e); - } - - private void startTextBox2_KeyPress(object sender, KeyPressEventArgs e) - { - if (e.KeyChar == '\r') - { - if (startTextBox3.Enabled) startTextBox3.Focus(); - else if (startTextBox4.Enabled) startTextBox4.Focus(); - else if (startTextBox5.Enabled) startTextBox5.Focus(); - else if (startTextBox6.Enabled) startTextBox6.Focus(); - else if (startTextBox1.Enabled) startTextBox1.Focus(); - } - else if (e.KeyChar == '+') okButton_Click(sender, e); - } - - private void startTextBox3_KeyPress(object sender, KeyPressEventArgs e) - { - if (e.KeyChar == '\r') - { - if (startTextBox4.Enabled) startTextBox4.Focus(); - else if (startTextBox5.Enabled) startTextBox5.Focus(); - else if (startTextBox6.Enabled) startTextBox6.Focus(); - else if (startTextBox1.Enabled) startTextBox1.Focus(); - else if (startTextBox2.Enabled) startTextBox2.Focus(); - } - else if (e.KeyChar == '+') okButton_Click(sender, e); - } - - private void startTextBox4_KeyPress(object sender, KeyPressEventArgs e) - { - if (e.KeyChar == '\r') - { - if (startTextBox5.Enabled) startTextBox5.Focus(); - else if (startTextBox6.Enabled) startTextBox6.Focus(); - else if (startTextBox1.Enabled) startTextBox1.Focus(); - else if (startTextBox2.Enabled) startTextBox2.Focus(); - else if (startTextBox3.Enabled) startTextBox3.Focus(); - } - else if (e.KeyChar == '+') okButton_Click(sender, e); - } - - private void startTextBox5_KeyPress(object sender, KeyPressEventArgs e) - { - if (e.KeyChar == '\r') - { - if (startTextBox6.Enabled) startTextBox6.Focus(); - else if (startTextBox1.Enabled) startTextBox1.Focus(); - else if (startTextBox2.Enabled) startTextBox2.Focus(); - else if (startTextBox3.Enabled) startTextBox3.Focus(); - else if (startTextBox4.Enabled) startTextBox4.Focus(); - } - else if (e.KeyChar == '+') okButton_Click(sender, e); - } - - private void startTextBox6_KeyPress(object sender, KeyPressEventArgs e) - { - if (e.KeyChar == '\r') - { - if (startTextBox1.Enabled) startTextBox1.Focus(); - else if (startTextBox1.Enabled) startTextBox1.Focus(); - else if (startTextBox3.Enabled) startTextBox3.Focus(); - else if (startTextBox4.Enabled) startTextBox4.Focus(); - else if (startTextBox5.Enabled) startTextBox5.Focus(); - } - else if (e.KeyChar == '+') okButton_Click(sender, e); - } - - private void endTextBox1_KeyPress(object sender, KeyPressEventArgs e) - { - if (e.KeyChar == '\r') - { - if (endTextBox2.Enabled) endTextBox2.Focus(); - else if (endTextBox3.Enabled) endTextBox3.Focus(); - else if (endTextBox4.Enabled) endTextBox4.Focus(); - else if (endTextBox5.Enabled) endTextBox5.Focus(); - else if (endTextBox6.Enabled) endTextBox6.Focus(); - } - else if (e.KeyChar == '+') okButton_Click(sender, e); - } - - private void endTextBox2_KeyPress(object sender, KeyPressEventArgs e) - { - if (e.KeyChar == '\r') - { - if (endTextBox3.Enabled) endTextBox3.Focus(); - else if (endTextBox4.Enabled) endTextBox4.Focus(); - else if (endTextBox5.Enabled) endTextBox5.Focus(); - else if (endTextBox6.Enabled) endTextBox6.Focus(); - else if (endTextBox1.Enabled) endTextBox1.Focus(); - } - else if (e.KeyChar == '+') okButton_Click(sender, e); - } - - private void endTextBox3_KeyPress(object sender, KeyPressEventArgs e) - { - if (e.KeyChar == '\r') - { - if (endTextBox4.Enabled) endTextBox4.Focus(); - else if (endTextBox5.Enabled) endTextBox5.Focus(); - else if (endTextBox6.Enabled) endTextBox6.Focus(); - else if (endTextBox1.Enabled) endTextBox1.Focus(); - else if (endTextBox2.Enabled) endTextBox2.Focus(); - } - else if (e.KeyChar == '+') okButton_Click(sender, e); - } - - private void endTextBox4_KeyPress(object sender, KeyPressEventArgs e) - { - if (e.KeyChar == '\r') - { - if (endTextBox5.Enabled) endTextBox5.Focus(); - else if (endTextBox6.Enabled) endTextBox6.Focus(); - else if (endTextBox1.Enabled) endTextBox1.Focus(); - else if (endTextBox2.Enabled) endTextBox2.Focus(); - else if (endTextBox3.Enabled) endTextBox3.Focus(); - } - else if (e.KeyChar == '+') okButton_Click(sender, e); - } - - private void endTextBox5_KeyPress(object sender, KeyPressEventArgs e) - { - if (e.KeyChar == '\r') - { - if (endTextBox6.Enabled) endTextBox6.Focus(); - else if (endTextBox1.Enabled) endTextBox1.Focus(); - else if (endTextBox2.Enabled) endTextBox2.Focus(); - else if (endTextBox3.Enabled) endTextBox3.Focus(); - else if (endTextBox4.Enabled) endTextBox4.Focus(); - } - else if (e.KeyChar == '+') okButton_Click(sender, e); - } - - private void endTextBox6_KeyPress(object sender, KeyPressEventArgs e) - { - if (e.KeyChar == '\r') - { - if (endTextBox1.Enabled) endTextBox1.Focus(); - else if (endTextBox1.Enabled) endTextBox1.Focus(); - else if (endTextBox3.Enabled) endTextBox3.Focus(); - else if (endTextBox4.Enabled) endTextBox4.Focus(); - else if (endTextBox5.Enabled) endTextBox5.Focus(); - } - else if (e.KeyChar == '+') okButton_Click(sender, e); - } - } -} diff --git a/TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.designer.cs b/TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.designer.cs deleted file mode 100644 index 01c24c82e..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.designer.cs +++ /dev/null @@ -1,512 +0,0 @@ -/// -/// Copyright (c) 2013-2017 Sensus Metering Systems -/// -namespace TBF.BenchControl.DataEntry.Munich3 -{ - partial class TestStartEndForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.exclamation2 = new System.Windows.Forms.Label(); - this.startTextBox2 = new System.Windows.Forms.TextBox(); - this.endTextBox2 = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.exclamation1 = new System.Windows.Forms.Label(); - this.startTextBox1 = new System.Windows.Forms.TextBox(); - this.endTextBox1 = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.okButton = new System.Windows.Forms.Button(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.exclamation3 = new System.Windows.Forms.Label(); - this.startTextBox3 = new System.Windows.Forms.TextBox(); - this.endTextBox3 = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.exclamation4 = new System.Windows.Forms.Label(); - this.startTextBox4 = new System.Windows.Forms.TextBox(); - this.endTextBox4 = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.exclamation5 = new System.Windows.Forms.Label(); - this.startTextBox5 = new System.Windows.Forms.TextBox(); - this.endTextBox5 = new System.Windows.Forms.TextBox(); - this.label5 = new System.Windows.Forms.Label(); - this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.exclamation6 = new System.Windows.Forms.Label(); - this.startTextBox6 = new System.Windows.Forms.TextBox(); - this.endTextBox6 = new System.Windows.Forms.TextBox(); - this.label6 = new System.Windows.Forms.Label(); - this.startLabel = new System.Windows.Forms.Label(); - this.endLabel = new System.Windows.Forms.Label(); - this.groupBox2.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.groupBox4.SuspendLayout(); - this.groupBox5.SuspendLayout(); - this.groupBox6.SuspendLayout(); - this.SuspendLayout(); - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.exclamation2); - this.groupBox2.Controls.Add(this.startTextBox2); - this.groupBox2.Controls.Add(this.endTextBox2); - this.groupBox2.Controls.Add(this.label2); - this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox2.ForeColor = System.Drawing.Color.Black; - this.groupBox2.Location = new System.Drawing.Point(25, 122); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(547, 81); - this.groupBox2.TabIndex = 2; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Water Meter 2"; - // - // exclamation2 - // - this.exclamation2.AutoSize = true; - this.exclamation2.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.exclamation2.ForeColor = System.Drawing.Color.Red; - this.exclamation2.Location = new System.Drawing.Point(515, 27); - this.exclamation2.Name = "exclamation2"; - this.exclamation2.Size = new System.Drawing.Size(30, 38); - this.exclamation2.TabIndex = 4; - this.exclamation2.Text = "!"; - this.exclamation2.Visible = false; - // - // wmStartStateTextBox2 - // - this.startTextBox2.Enabled = false; - this.startTextBox2.Location = new System.Drawing.Point(164, 31); - this.startTextBox2.Name = "wmStartStateTextBox2"; - this.startTextBox2.Size = new System.Drawing.Size(163, 31); - this.startTextBox2.TabIndex = 3; - this.startTextBox2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox2_KeyPress); - // - // wmEndStateTextBox2 - // - this.endTextBox2.Enabled = false; - this.endTextBox2.Location = new System.Drawing.Point(350, 31); - this.endTextBox2.Name = "wmEndStateTextBox2"; - this.endTextBox2.Size = new System.Drawing.Size(163, 31); - this.endTextBox2.TabIndex = 1; - this.endTextBox2.TextChanged += new System.EventHandler(this.endTextBox2_TextChanged); - this.endTextBox2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox2_KeyPress); - // - // wmStateLabel2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(18, 34); - this.label2.Name = "wmStateLabel2"; - this.label2.Size = new System.Drawing.Size(68, 23); - this.label2.TabIndex = 0; - this.label2.Text = "State:"; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.exclamation1); - this.groupBox1.Controls.Add(this.startTextBox1); - this.groupBox1.Controls.Add(this.endTextBox1); - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox1.ForeColor = System.Drawing.Color.Black; - this.groupBox1.Location = new System.Drawing.Point(25, 32); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(547, 81); - this.groupBox1.TabIndex = 1; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Water Meter 1"; - // - // exclamation1 - // - this.exclamation1.AutoSize = true; - this.exclamation1.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.exclamation1.ForeColor = System.Drawing.Color.Red; - this.exclamation1.Location = new System.Drawing.Point(515, 27); - this.exclamation1.Name = "exclamation1"; - this.exclamation1.Size = new System.Drawing.Size(30, 38); - this.exclamation1.TabIndex = 3; - this.exclamation1.Text = "!"; - this.exclamation1.Visible = false; - // - // wmStartStateTextBox1 - // - this.startTextBox1.Enabled = false; - this.startTextBox1.Location = new System.Drawing.Point(164, 31); - this.startTextBox1.Name = "wmStartStateTextBox1"; - this.startTextBox1.Size = new System.Drawing.Size(163, 31); - this.startTextBox1.TabIndex = 2; - this.startTextBox1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox1_KeyPress); - // - // wmEndStateTextBox1 - // - this.endTextBox1.Enabled = false; - this.endTextBox1.Location = new System.Drawing.Point(350, 31); - this.endTextBox1.Name = "wmEndStateTextBox1"; - this.endTextBox1.Size = new System.Drawing.Size(163, 31); - this.endTextBox1.TabIndex = 1; - this.endTextBox1.TextChanged += new System.EventHandler(this.endTextBox1_TextChanged); - this.endTextBox1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox1_KeyPress); - // - // wmStateLabel1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(18, 34); - this.label1.Name = "wmStateLabel1"; - this.label1.Size = new System.Drawing.Size(68, 23); - this.label1.TabIndex = 0; - this.label1.Text = "State:"; - // - // okButton - // - this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.okButton.ForeColor = System.Drawing.Color.Black; - this.okButton.Location = new System.Drawing.Point(603, 46); - this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(98, 63); - this.okButton.TabIndex = 7; - this.okButton.Text = "OK"; - this.okButton.UseVisualStyleBackColor = true; - this.okButton.Click += new System.EventHandler(this.okButton_Click); - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.exclamation3); - this.groupBox3.Controls.Add(this.startTextBox3); - this.groupBox3.Controls.Add(this.endTextBox3); - this.groupBox3.Controls.Add(this.label3); - this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox3.ForeColor = System.Drawing.Color.Black; - this.groupBox3.Location = new System.Drawing.Point(25, 212); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(547, 81); - this.groupBox3.TabIndex = 3; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "Water Meter 3"; - // - // exclamation3 - // - this.exclamation3.AutoSize = true; - this.exclamation3.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.exclamation3.ForeColor = System.Drawing.Color.Red; - this.exclamation3.Location = new System.Drawing.Point(515, 27); - this.exclamation3.Name = "exclamation3"; - this.exclamation3.Size = new System.Drawing.Size(30, 38); - this.exclamation3.TabIndex = 5; - this.exclamation3.Text = "!"; - this.exclamation3.Visible = false; - // - // wmStartStateTextBox3 - // - this.startTextBox3.Enabled = false; - this.startTextBox3.Location = new System.Drawing.Point(164, 31); - this.startTextBox3.Name = "wmStartStateTextBox3"; - this.startTextBox3.Size = new System.Drawing.Size(163, 31); - this.startTextBox3.TabIndex = 4; - this.startTextBox3.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox3_KeyPress); - // - // wmEndStateTextBox3 - // - this.endTextBox3.Enabled = false; - this.endTextBox3.Location = new System.Drawing.Point(350, 31); - this.endTextBox3.Name = "wmEndStateTextBox3"; - this.endTextBox3.Size = new System.Drawing.Size(163, 31); - this.endTextBox3.TabIndex = 1; - this.endTextBox3.TextChanged += new System.EventHandler(this.endTextBox3_TextChanged); - this.endTextBox3.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox3_KeyPress); - // - // wmStateLabel3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(18, 34); - this.label3.Name = "wmStateLabel3"; - this.label3.Size = new System.Drawing.Size(68, 23); - this.label3.TabIndex = 0; - this.label3.Text = "State:"; - // - // groupBox4 - // - this.groupBox4.Controls.Add(this.exclamation4); - this.groupBox4.Controls.Add(this.startTextBox4); - this.groupBox4.Controls.Add(this.endTextBox4); - this.groupBox4.Controls.Add(this.label4); - this.groupBox4.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox4.ForeColor = System.Drawing.Color.Black; - this.groupBox4.Location = new System.Drawing.Point(25, 302); - this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(547, 81); - this.groupBox4.TabIndex = 4; - this.groupBox4.TabStop = false; - this.groupBox4.Text = "Water Meter 4"; - // - // exclamation4 - // - this.exclamation4.AutoSize = true; - this.exclamation4.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.exclamation4.ForeColor = System.Drawing.Color.Red; - this.exclamation4.Location = new System.Drawing.Point(515, 27); - this.exclamation4.Name = "exclamation4"; - this.exclamation4.Size = new System.Drawing.Size(30, 38); - this.exclamation4.TabIndex = 5; - this.exclamation4.Text = "!"; - this.exclamation4.Visible = false; - // - // wmStartStateTextBox4 - // - this.startTextBox4.Enabled = false; - this.startTextBox4.Location = new System.Drawing.Point(164, 31); - this.startTextBox4.Name = "wmStartStateTextBox4"; - this.startTextBox4.Size = new System.Drawing.Size(163, 31); - this.startTextBox4.TabIndex = 4; - this.startTextBox4.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox4_KeyPress); - // - // wmEndStateTextBox4 - // - this.endTextBox4.Enabled = false; - this.endTextBox4.Location = new System.Drawing.Point(350, 31); - this.endTextBox4.Name = "wmEndStateTextBox4"; - this.endTextBox4.Size = new System.Drawing.Size(163, 31); - this.endTextBox4.TabIndex = 1; - this.endTextBox4.TextChanged += new System.EventHandler(this.endTextBox4_TextChanged); - this.endTextBox4.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox4_KeyPress); - // - // wmStateLabel4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(18, 34); - this.label4.Name = "wmStateLabel4"; - this.label4.Size = new System.Drawing.Size(68, 23); - this.label4.TabIndex = 0; - this.label4.Text = "State:"; - // - // groupBox5 - // - this.groupBox5.Controls.Add(this.exclamation5); - this.groupBox5.Controls.Add(this.startTextBox5); - this.groupBox5.Controls.Add(this.endTextBox5); - this.groupBox5.Controls.Add(this.label5); - this.groupBox5.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox5.ForeColor = System.Drawing.Color.Black; - this.groupBox5.Location = new System.Drawing.Point(25, 392); - this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(547, 81); - this.groupBox5.TabIndex = 5; - this.groupBox5.TabStop = false; - this.groupBox5.Text = "Water Meter 5"; - // - // exclamation5 - // - this.exclamation5.AutoSize = true; - this.exclamation5.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.exclamation5.ForeColor = System.Drawing.Color.Red; - this.exclamation5.Location = new System.Drawing.Point(515, 27); - this.exclamation5.Name = "exclamation5"; - this.exclamation5.Size = new System.Drawing.Size(30, 38); - this.exclamation5.TabIndex = 5; - this.exclamation5.Text = "!"; - this.exclamation5.Visible = false; - // - // wmStartStateTextBox5 - // - this.startTextBox5.Enabled = false; - this.startTextBox5.Location = new System.Drawing.Point(164, 31); - this.startTextBox5.Name = "wmStartStateTextBox5"; - this.startTextBox5.Size = new System.Drawing.Size(163, 31); - this.startTextBox5.TabIndex = 4; - this.startTextBox5.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox5_KeyPress); - // - // wmEndStateTextBox5 - // - this.endTextBox5.Enabled = false; - this.endTextBox5.Location = new System.Drawing.Point(350, 31); - this.endTextBox5.Name = "wmEndStateTextBox5"; - this.endTextBox5.Size = new System.Drawing.Size(163, 31); - this.endTextBox5.TabIndex = 1; - this.endTextBox5.TextChanged += new System.EventHandler(this.endTextBox5_TextChanged); - this.endTextBox5.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox5_KeyPress); - // - // wmStateLabel5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(18, 34); - this.label5.Name = "wmStateLabel5"; - this.label5.Size = new System.Drawing.Size(68, 23); - this.label5.TabIndex = 0; - this.label5.Text = "State:"; - // - // groupBox6 - // - this.groupBox6.Controls.Add(this.exclamation6); - this.groupBox6.Controls.Add(this.startTextBox6); - this.groupBox6.Controls.Add(this.endTextBox6); - this.groupBox6.Controls.Add(this.label6); - this.groupBox6.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox6.ForeColor = System.Drawing.Color.Black; - this.groupBox6.Location = new System.Drawing.Point(25, 482); - this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(547, 81); - this.groupBox6.TabIndex = 6; - this.groupBox6.TabStop = false; - this.groupBox6.Text = "Water Meter 6"; - // - // exclamation6 - // - this.exclamation6.AutoSize = true; - this.exclamation6.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.exclamation6.ForeColor = System.Drawing.Color.Red; - this.exclamation6.Location = new System.Drawing.Point(515, 27); - this.exclamation6.Name = "exclamation6"; - this.exclamation6.Size = new System.Drawing.Size(30, 38); - this.exclamation6.TabIndex = 5; - this.exclamation6.Text = "!"; - this.exclamation6.Visible = false; - // - // wmStartStateTextBox6 - // - this.startTextBox6.Enabled = false; - this.startTextBox6.Location = new System.Drawing.Point(164, 31); - this.startTextBox6.Name = "wmStartStateTextBox6"; - this.startTextBox6.Size = new System.Drawing.Size(163, 31); - this.startTextBox6.TabIndex = 4; - this.startTextBox6.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox6_KeyPress); - // - // wmEndStateTextBox6 - // - this.endTextBox6.Enabled = false; - this.endTextBox6.Location = new System.Drawing.Point(350, 31); - this.endTextBox6.Name = "wmEndStateTextBox6"; - this.endTextBox6.Size = new System.Drawing.Size(163, 31); - this.endTextBox6.TabIndex = 1; - this.endTextBox6.TextChanged += new System.EventHandler(this.endTextBox6_TextChanged); - this.endTextBox6.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox6_KeyPress); - // - // wmStateLabel6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(18, 34); - this.label6.Name = "wmStateLabel6"; - this.label6.Size = new System.Drawing.Size(68, 23); - this.label6.TabIndex = 0; - this.label6.Text = "State:"; - // - // startLabel - // - this.startLabel.AutoSize = true; - this.startLabel.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.startLabel.Location = new System.Drawing.Point(245, 11); - this.startLabel.Name = "startLabel"; - this.startLabel.Size = new System.Drawing.Size(56, 23); - this.startLabel.TabIndex = 8; - this.startLabel.Text = "Start"; - // - // endLabel - // - this.endLabel.AutoSize = true; - this.endLabel.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.endLabel.Location = new System.Drawing.Point(431, 11); - this.endLabel.Name = "endLabel"; - this.endLabel.Size = new System.Drawing.Size(46, 23); - this.endLabel.TabIndex = 9; - this.endLabel.Text = "End"; - // - // TestStartEndForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.DarkGoldenrod; - this.ClientSize = new System.Drawing.Size(729, 586); - this.Controls.Add(this.endLabel); - this.Controls.Add(this.startLabel); - this.Controls.Add(this.groupBox6); - this.Controls.Add(this.groupBox5); - this.Controls.Add(this.groupBox4); - this.Controls.Add(this.groupBox3); - this.Controls.Add(this.okButton); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.groupBox1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Name = "TestStartEndForm"; - this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; - this.Text = "End States"; - this.TopMost = true; - this.Load += new System.EventHandler(this.TestStartEndForm_Load); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.groupBox4.ResumeLayout(false); - this.groupBox4.PerformLayout(); - this.groupBox5.ResumeLayout(false); - this.groupBox5.PerformLayout(); - this.groupBox6.ResumeLayout(false); - this.groupBox6.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.TextBox endTextBox2; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.TextBox endTextBox1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Button okButton; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.TextBox endTextBox3; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.GroupBox groupBox4; - private System.Windows.Forms.TextBox endTextBox4; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.GroupBox groupBox5; - private System.Windows.Forms.TextBox endTextBox5; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.GroupBox groupBox6; - private System.Windows.Forms.TextBox endTextBox6; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.TextBox startTextBox2; - private System.Windows.Forms.TextBox startTextBox1; - private System.Windows.Forms.TextBox startTextBox3; - private System.Windows.Forms.TextBox startTextBox4; - private System.Windows.Forms.TextBox startTextBox5; - private System.Windows.Forms.TextBox startTextBox6; - private System.Windows.Forms.Label startLabel; - private System.Windows.Forms.Label endLabel; - private System.Windows.Forms.Label exclamation2; - private System.Windows.Forms.Label exclamation1; - private System.Windows.Forms.Label exclamation3; - private System.Windows.Forms.Label exclamation4; - private System.Windows.Forms.Label exclamation5; - private System.Windows.Forms.Label exclamation6; - - } -} \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.resx b/TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.resx deleted file mode 100644 index 1af7de150..000000000 --- a/TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.cs b/TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.cs deleted file mode 100644 index 91ee425f4..000000000 --- a/TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.cs +++ /dev/null @@ -1,194 +0,0 @@ -/// -/// Copyright (c) 2017 Sensus Metering Systems -/// -using System; -using System.Windows.Forms; -using log4net; -using TBF.Resources; - -namespace TBF.BenchControl.DataEntry.StandardCamera -{ - public partial class CycleEndFormMunich : Form, GenericDevices.IHasCompleted - { - private static readonly ILog log = LogManager.GetLogger(typeof(CycleEndFormMunich)); - - /// Number of text boxes for serial numbers - public readonly int WaterMetersCount; - - // To be set before the form opens - public string ProtocolName1; - public string ProtocolName2; - public string ProtocolName3; - public string ProtocolName4; - - // To be retrieved after the form closes - public string ProtocolTitle; - public string[] EndStateText; - public int[] YearOfProduction; - - // Set to 'true' when the form closes - public bool Completed { get { return completed; } } - bool completed; - - /// - /// Constructor - /// - /// Number of text boxes for serial numbers - public CycleEndFormMunich(int waterMetersCount) - { - InitializeComponent(); - ControlBox = false; - - this.WaterMetersCount = waterMetersCount; - EndStateText = new string[WaterMetersCount]; - YearOfProduction = new int[WaterMetersCount]; - completed = false; - StartForceCloseHandler(); - } - - /// Parameterless constructor for 3 watermeters - public CycleEndFormMunich() - : this(3) - { - } - - private void CycleEndForm_Load(object sender, EventArgs e) - { - Localize(); - - radioButton1.Text = ProtocolName1; - radioButton2.Text = ProtocolName2; - radioButton3.Text = ProtocolName3; - radioButton4.Text = ProtocolName4; - - if (WaterMetersCount < 1) groupBox1.Visible = false; - if (WaterMetersCount < 2) groupBox2.Visible = false; - if (WaterMetersCount < 3) groupBox3.Visible = false; - if (WaterMetersCount < 4) groupBox4.Visible = false; - if (WaterMetersCount < 5) groupBox5.Visible = false; - if (WaterMetersCount < 6) groupBox6.Visible = false; - - if (Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count >= 1) - { - YearOfProduction[0] = Sequences.ProcessData.BatchRslts.Batch.WaterMeters[0].YearOfProduction; - yearOfProduction1TextBox.Text = YearOfProduction[0].ToString(); - } - if (Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count >= 2) - { - YearOfProduction[1] = Sequences.ProcessData.BatchRslts.Batch.WaterMeters[1].YearOfProduction; - yearOfProduction2TextBox.Text = YearOfProduction[1].ToString(); - } - if (Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count >= 3) - { - YearOfProduction[2] = Sequences.ProcessData.BatchRslts.Batch.WaterMeters[2].YearOfProduction; - yearOfProduction3TextBox.Text = YearOfProduction[2].ToString(); - } - if (Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count >= 4) - { - YearOfProduction[3] = Sequences.ProcessData.BatchRslts.Batch.WaterMeters[3].YearOfProduction; - yearOfProduction4TextBox.Text = YearOfProduction[3].ToString(); - } - if (Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count >= 5) - { - YearOfProduction[4] = Sequences.ProcessData.BatchRslts.Batch.WaterMeters[4].YearOfProduction; - yearOfProduction5TextBox.Text = YearOfProduction[4].ToString(); - } - if (Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count >= 6) - { - YearOfProduction[5] = Sequences.ProcessData.BatchRslts.Batch.WaterMeters[5].YearOfProduction; - yearOfProduction6TextBox.Text = YearOfProduction[5].ToString(); - } - - Height = 228 + 90 * WaterMetersCount; - - AnyRadioButtonChanged(); - } - - void Localize() - { - Text = Strings.Data; - protocolGroupBox.Text = Strings.Protocol; - okButton.Text = Strings.OkBtnText; - - groupBox1.Text = Strings.Water_Meter + " 1"; - groupBox2.Text = Strings.Water_Meter + " 2"; - groupBox3.Text = Strings.Water_Meter + " 3"; - groupBox4.Text = Strings.Water_Meter + " 4"; - groupBox5.Text = Strings.Water_Meter + " 5"; - groupBox6.Text = Strings.Water_Meter + " 6"; - - label1.Text = label2.Text = label3.Text = label4.Text - = label5.Text = label6.Text = Strings.State; - - yearOfProduction1Label.Text = yearOfProduction2Label.Text - = yearOfProduction3Label.Text = yearOfProduction4Label.Text - = yearOfProduction5Label.Text = yearOfProduction6Label.Text = Strings.Year_of_production; - } - - private void okButton_Click(object sender, EventArgs e) - { - if (radioButton1.Checked) ProtocolTitle = ProtocolName1; - else if (radioButton2.Checked) ProtocolTitle = ProtocolName2; - else if (radioButton3.Checked) ProtocolTitle = ProtocolName3; - else if (radioButton4.Checked) ProtocolTitle = ProtocolName4; - - if (WaterMetersCount >= 1) EndStateText[0] = textBox1.Text; - if (WaterMetersCount >= 2) EndStateText[1] = textBox2.Text; - if (WaterMetersCount >= 3) EndStateText[2] = textBox3.Text; - if (WaterMetersCount >= 4) EndStateText[3] = textBox4.Text; - if (WaterMetersCount >= 5) EndStateText[4] = textBox5.Text; - if (WaterMetersCount >= 6) EndStateText[5] = textBox6.Text; - - if (ShowYear()) - { - int year; - if (WaterMetersCount >= 1 && int.TryParse(yearOfProduction1TextBox.Text, out year)) YearOfProduction[0] = year; - if (WaterMetersCount >= 2 && int.TryParse(yearOfProduction2TextBox.Text, out year)) YearOfProduction[1] = year; - if (WaterMetersCount >= 3 && int.TryParse(yearOfProduction3TextBox.Text, out year)) YearOfProduction[2] = year; - if (WaterMetersCount >= 4 && int.TryParse(yearOfProduction4TextBox.Text, out year)) YearOfProduction[3] = year; - if (WaterMetersCount >= 5 && int.TryParse(yearOfProduction5TextBox.Text, out year)) YearOfProduction[4] = year; - if (WaterMetersCount >= 6 && int.TryParse(yearOfProduction6TextBox.Text, out year)) YearOfProduction[5] = year; - } - - completed = true; - Close(); - } - - #region Forced close handling - - public void StartForceCloseHandler() - { - UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args) - { - if (InvokeRequired) { Invoke(new EventHandler(OnForceClose), sender, args); } - else OnForceClose(sender, args); - }; - } - - void OnForceClose(object sender, EventArgs args) - { - DialogResult = DialogResult.Cancel; - Close(); - } - - #endregion - - private void radioButton1_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } - private void radioButton2_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } - private void radioButton3_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } - private void radioButton4_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } - - bool ShowYear() - { - return radioButton2.Checked || radioButton3.Checked || radioButton4.Checked; - } - - void AnyRadioButtonChanged() - { - yearOfProduction1TextBox.Visible = yearOfProduction2TextBox.Visible = yearOfProduction3TextBox.Visible = - yearOfProduction4TextBox.Visible = yearOfProduction5TextBox.Visible = yearOfProduction6TextBox.Visible = - yearOfProduction1Label.Visible = yearOfProduction2Label.Visible = yearOfProduction3Label.Visible = - yearOfProduction4Label.Visible = yearOfProduction5Label.Visible = yearOfProduction6Label.Visible = ShowYear(); - } - } -} diff --git a/TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.designer.cs b/TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.designer.cs deleted file mode 100644 index f47144fe5..000000000 --- a/TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.designer.cs +++ /dev/null @@ -1,514 +0,0 @@ -/// -/// Copyright (c) 2017 Sensus Metering Systems -/// -namespace TBF.BenchControl.DataEntry.StandardCamera -{ - partial class CycleEndFormMunich - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.yearOfProduction2TextBox = new System.Windows.Forms.TextBox(); - this.yearOfProduction2Label = new System.Windows.Forms.Label(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.yearOfProduction1TextBox = new System.Windows.Forms.TextBox(); - this.yearOfProduction1Label = new System.Windows.Forms.Label(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.okButton = new System.Windows.Forms.Button(); - this.protocolGroupBox = new System.Windows.Forms.GroupBox(); - this.radioButton4 = new System.Windows.Forms.RadioButton(); - this.radioButton3 = new System.Windows.Forms.RadioButton(); - this.radioButton2 = new System.Windows.Forms.RadioButton(); - this.radioButton1 = new System.Windows.Forms.RadioButton(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.yearOfProduction3TextBox = new System.Windows.Forms.TextBox(); - this.yearOfProduction3Label = new System.Windows.Forms.Label(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.yearOfProduction4TextBox = new System.Windows.Forms.TextBox(); - this.yearOfProduction4Label = new System.Windows.Forms.Label(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.yearOfProduction5TextBox = new System.Windows.Forms.TextBox(); - this.yearOfProduction5Label = new System.Windows.Forms.Label(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.label5 = new System.Windows.Forms.Label(); - this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.yearOfProduction6TextBox = new System.Windows.Forms.TextBox(); - this.yearOfProduction6Label = new System.Windows.Forms.Label(); - this.textBox6 = new System.Windows.Forms.TextBox(); - this.label6 = new System.Windows.Forms.Label(); - this.groupBox2.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.protocolGroupBox.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.groupBox4.SuspendLayout(); - this.groupBox5.SuspendLayout(); - this.groupBox6.SuspendLayout(); - this.SuspendLayout(); - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.yearOfProduction2TextBox); - this.groupBox2.Controls.Add(this.yearOfProduction2Label); - this.groupBox2.Controls.Add(this.textBox2); - this.groupBox2.Controls.Add(this.label2); - this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox2.ForeColor = System.Drawing.Color.Black; - this.groupBox2.Location = new System.Drawing.Point(25, 284); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(682, 81); - this.groupBox2.TabIndex = 2; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Wasserzähler 2"; - // - // yearOfProduction2TextBox - // - this.yearOfProduction2TextBox.Location = new System.Drawing.Point(559, 31); - this.yearOfProduction2TextBox.Name = "yearOfProduction2TextBox"; - this.yearOfProduction2TextBox.Size = new System.Drawing.Size(98, 31); - this.yearOfProduction2TextBox.TabIndex = 11; - // - // yearOfProduction2Label - // - this.yearOfProduction2Label.AutoSize = true; - this.yearOfProduction2Label.Location = new System.Drawing.Point(351, 34); - this.yearOfProduction2Label.Name = "yearOfProduction2Label"; - this.yearOfProduction2Label.Size = new System.Drawing.Size(188, 23); - this.yearOfProduction2Label.TabIndex = 10; - this.yearOfProduction2Label.Text = "Year of production"; - // - // textBox2 - // - this.textBox2.Location = new System.Drawing.Point(160, 31); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(163, 31); - this.textBox2.TabIndex = 1; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(18, 34); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(74, 23); - this.label2.TabIndex = 0; - this.label2.Text = "Stand:"; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.yearOfProduction1TextBox); - this.groupBox1.Controls.Add(this.yearOfProduction1Label); - this.groupBox1.Controls.Add(this.textBox1); - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox1.ForeColor = System.Drawing.Color.Black; - this.groupBox1.Location = new System.Drawing.Point(25, 194); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(682, 81); - this.groupBox1.TabIndex = 1; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Wasserzähler 1"; - // - // yearOfProduction1TextBox - // - this.yearOfProduction1TextBox.Location = new System.Drawing.Point(559, 31); - this.yearOfProduction1TextBox.Name = "yearOfProduction1TextBox"; - this.yearOfProduction1TextBox.Size = new System.Drawing.Size(98, 31); - this.yearOfProduction1TextBox.TabIndex = 10; - // - // yearOfProduction1Label - // - this.yearOfProduction1Label.AutoSize = true; - this.yearOfProduction1Label.Location = new System.Drawing.Point(351, 34); - this.yearOfProduction1Label.Name = "yearOfProduction1Label"; - this.yearOfProduction1Label.Size = new System.Drawing.Size(188, 23); - this.yearOfProduction1Label.TabIndex = 9; - this.yearOfProduction1Label.Text = "Year of production"; - // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(160, 31); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(163, 31); - this.textBox1.TabIndex = 1; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(18, 34); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(74, 23); - this.label1.TabIndex = 0; - this.label1.Text = "Stand:"; - // - // okButton - // - this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.okButton.ForeColor = System.Drawing.Color.Black; - this.okButton.Location = new System.Drawing.Point(584, 29); - this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(98, 63); - this.okButton.TabIndex = 7; - this.okButton.Text = "OK"; - this.okButton.UseVisualStyleBackColor = true; - this.okButton.Click += new System.EventHandler(this.okButton_Click); - // - // protocolGroupBox - // - this.protocolGroupBox.Controls.Add(this.radioButton4); - this.protocolGroupBox.Controls.Add(this.radioButton3); - this.protocolGroupBox.Controls.Add(this.radioButton2); - this.protocolGroupBox.Controls.Add(this.radioButton1); - this.protocolGroupBox.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.protocolGroupBox.Location = new System.Drawing.Point(25, 13); - this.protocolGroupBox.Name = "protocolGroupBox"; - this.protocolGroupBox.Size = new System.Drawing.Size(362, 175); - this.protocolGroupBox.TabIndex = 0; - this.protocolGroupBox.TabStop = false; - this.protocolGroupBox.Text = "Protokoll"; - // - // radioButton4 - // - this.radioButton4.AutoSize = true; - this.radioButton4.Location = new System.Drawing.Point(34, 133); - this.radioButton4.Name = "radioButton4"; - this.radioButton4.Size = new System.Drawing.Size(152, 27); - this.radioButton4.TabIndex = 3; - this.radioButton4.TabStop = true; - this.radioButton4.Text = "radioButton4"; - this.radioButton4.UseVisualStyleBackColor = true; - this.radioButton4.CheckedChanged += new System.EventHandler(this.radioButton4_CheckedChanged); - // - // radioButton3 - // - this.radioButton3.AutoSize = true; - this.radioButton3.Location = new System.Drawing.Point(34, 100); - this.radioButton3.Name = "radioButton3"; - this.radioButton3.Size = new System.Drawing.Size(152, 27); - this.radioButton3.TabIndex = 2; - this.radioButton3.TabStop = true; - this.radioButton3.Text = "radioButton3"; - this.radioButton3.UseVisualStyleBackColor = true; - this.radioButton3.CheckedChanged += new System.EventHandler(this.radioButton3_CheckedChanged); - // - // radioButton2 - // - this.radioButton2.AutoSize = true; - this.radioButton2.Location = new System.Drawing.Point(34, 67); - this.radioButton2.Name = "radioButton2"; - this.radioButton2.Size = new System.Drawing.Size(152, 27); - this.radioButton2.TabIndex = 1; - this.radioButton2.TabStop = true; - this.radioButton2.Text = "radioButton2"; - this.radioButton2.UseVisualStyleBackColor = true; - this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged); - // - // radioButton1 - // - this.radioButton1.AutoSize = true; - this.radioButton1.Checked = true; - this.radioButton1.Location = new System.Drawing.Point(34, 34); - this.radioButton1.Name = "radioButton1"; - this.radioButton1.Size = new System.Drawing.Size(152, 27); - this.radioButton1.TabIndex = 0; - this.radioButton1.TabStop = true; - this.radioButton1.Text = "radioButton1"; - this.radioButton1.UseVisualStyleBackColor = true; - this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.yearOfProduction3TextBox); - this.groupBox3.Controls.Add(this.yearOfProduction3Label); - this.groupBox3.Controls.Add(this.textBox3); - this.groupBox3.Controls.Add(this.label3); - this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox3.ForeColor = System.Drawing.Color.Black; - this.groupBox3.Location = new System.Drawing.Point(25, 374); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(682, 81); - this.groupBox3.TabIndex = 3; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "Wasserzähler 3"; - // - // yearOfProduction3TextBox - // - this.yearOfProduction3TextBox.Location = new System.Drawing.Point(559, 31); - this.yearOfProduction3TextBox.Name = "yearOfProduction3TextBox"; - this.yearOfProduction3TextBox.Size = new System.Drawing.Size(98, 31); - this.yearOfProduction3TextBox.TabIndex = 11; - // - // yearOfProduction3Label - // - this.yearOfProduction3Label.AutoSize = true; - this.yearOfProduction3Label.Location = new System.Drawing.Point(351, 34); - this.yearOfProduction3Label.Name = "yearOfProduction3Label"; - this.yearOfProduction3Label.Size = new System.Drawing.Size(188, 23); - this.yearOfProduction3Label.TabIndex = 10; - this.yearOfProduction3Label.Text = "Year of production"; - // - // textBox3 - // - this.textBox3.Location = new System.Drawing.Point(160, 31); - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(163, 31); - this.textBox3.TabIndex = 1; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(18, 34); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(74, 23); - this.label3.TabIndex = 0; - this.label3.Text = "Stand:"; - // - // groupBox4 - // - this.groupBox4.Controls.Add(this.yearOfProduction4TextBox); - this.groupBox4.Controls.Add(this.yearOfProduction4Label); - this.groupBox4.Controls.Add(this.textBox4); - this.groupBox4.Controls.Add(this.label4); - this.groupBox4.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox4.ForeColor = System.Drawing.Color.Black; - this.groupBox4.Location = new System.Drawing.Point(25, 464); - this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(682, 81); - this.groupBox4.TabIndex = 4; - this.groupBox4.TabStop = false; - this.groupBox4.Text = "Wasserzähler 4"; - // - // yearOfProduction4TextBox - // - this.yearOfProduction4TextBox.Location = new System.Drawing.Point(559, 31); - this.yearOfProduction4TextBox.Name = "yearOfProduction4TextBox"; - this.yearOfProduction4TextBox.Size = new System.Drawing.Size(98, 31); - this.yearOfProduction4TextBox.TabIndex = 11; - // - // yearOfProduction4Label - // - this.yearOfProduction4Label.AutoSize = true; - this.yearOfProduction4Label.Location = new System.Drawing.Point(351, 34); - this.yearOfProduction4Label.Name = "yearOfProduction4Label"; - this.yearOfProduction4Label.Size = new System.Drawing.Size(188, 23); - this.yearOfProduction4Label.TabIndex = 10; - this.yearOfProduction4Label.Text = "Year of production"; - // - // textBox4 - // - this.textBox4.Location = new System.Drawing.Point(160, 31); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(163, 31); - this.textBox4.TabIndex = 1; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(18, 34); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(74, 23); - this.label4.TabIndex = 0; - this.label4.Text = "Stand:"; - // - // groupBox5 - // - this.groupBox5.Controls.Add(this.yearOfProduction5TextBox); - this.groupBox5.Controls.Add(this.yearOfProduction5Label); - this.groupBox5.Controls.Add(this.textBox5); - this.groupBox5.Controls.Add(this.label5); - this.groupBox5.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox5.ForeColor = System.Drawing.Color.Black; - this.groupBox5.Location = new System.Drawing.Point(25, 554); - this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(682, 81); - this.groupBox5.TabIndex = 5; - this.groupBox5.TabStop = false; - this.groupBox5.Text = "Wasserzähler 5"; - // - // yearOfProduction5TextBox - // - this.yearOfProduction5TextBox.Location = new System.Drawing.Point(559, 31); - this.yearOfProduction5TextBox.Name = "yearOfProduction5TextBox"; - this.yearOfProduction5TextBox.Size = new System.Drawing.Size(98, 31); - this.yearOfProduction5TextBox.TabIndex = 11; - // - // yearOfProduction5Label - // - this.yearOfProduction5Label.AutoSize = true; - this.yearOfProduction5Label.Location = new System.Drawing.Point(351, 34); - this.yearOfProduction5Label.Name = "yearOfProduction5Label"; - this.yearOfProduction5Label.Size = new System.Drawing.Size(188, 23); - this.yearOfProduction5Label.TabIndex = 10; - this.yearOfProduction5Label.Text = "Year of production"; - // - // textBox5 - // - this.textBox5.Location = new System.Drawing.Point(160, 31); - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(163, 31); - this.textBox5.TabIndex = 1; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(18, 34); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(74, 23); - this.label5.TabIndex = 0; - this.label5.Text = "Stand:"; - // - // groupBox6 - // - this.groupBox6.Controls.Add(this.yearOfProduction6TextBox); - this.groupBox6.Controls.Add(this.yearOfProduction6Label); - this.groupBox6.Controls.Add(this.textBox6); - this.groupBox6.Controls.Add(this.label6); - this.groupBox6.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox6.ForeColor = System.Drawing.Color.Black; - this.groupBox6.Location = new System.Drawing.Point(25, 644); - this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(682, 81); - this.groupBox6.TabIndex = 6; - this.groupBox6.TabStop = false; - this.groupBox6.Text = "Wasserzähler 6"; - // - // yearOfProduction6TextBox - // - this.yearOfProduction6TextBox.Location = new System.Drawing.Point(559, 31); - this.yearOfProduction6TextBox.Name = "yearOfProduction6TextBox"; - this.yearOfProduction6TextBox.Size = new System.Drawing.Size(98, 31); - this.yearOfProduction6TextBox.TabIndex = 11; - // - // yearOfProduction6Label - // - this.yearOfProduction6Label.AutoSize = true; - this.yearOfProduction6Label.Location = new System.Drawing.Point(351, 34); - this.yearOfProduction6Label.Name = "yearOfProduction6Label"; - this.yearOfProduction6Label.Size = new System.Drawing.Size(188, 23); - this.yearOfProduction6Label.TabIndex = 10; - this.yearOfProduction6Label.Text = "Year of production"; - // - // textBox6 - // - this.textBox6.Location = new System.Drawing.Point(160, 31); - this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(163, 31); - this.textBox6.TabIndex = 1; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(18, 34); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(74, 23); - this.label6.TabIndex = 0; - this.label6.Text = "Stand:"; - // - // CycleEndFormMunich - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.DarkGoldenrod; - this.ClientSize = new System.Drawing.Size(719, 746); - this.Controls.Add(this.groupBox6); - this.Controls.Add(this.groupBox5); - this.Controls.Add(this.groupBox4); - this.Controls.Add(this.groupBox3); - this.Controls.Add(this.protocolGroupBox); - this.Controls.Add(this.okButton); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.groupBox1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Name = "CycleEndFormMunich"; - this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; - this.Text = "Daten"; - this.TopMost = true; - this.Load += new System.EventHandler(this.CycleEndForm_Load); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.protocolGroupBox.ResumeLayout(false); - this.protocolGroupBox.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.groupBox4.ResumeLayout(false); - this.groupBox4.PerformLayout(); - this.groupBox5.ResumeLayout(false); - this.groupBox5.PerformLayout(); - this.groupBox6.ResumeLayout(false); - this.groupBox6.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Button okButton; - private System.Windows.Forms.GroupBox protocolGroupBox; - private System.Windows.Forms.RadioButton radioButton3; - private System.Windows.Forms.RadioButton radioButton2; - private System.Windows.Forms.RadioButton radioButton1; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.TextBox textBox3; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.GroupBox groupBox4; - private System.Windows.Forms.TextBox textBox4; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.GroupBox groupBox5; - private System.Windows.Forms.TextBox textBox5; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.GroupBox groupBox6; - private System.Windows.Forms.TextBox textBox6; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.RadioButton radioButton4; - private System.Windows.Forms.Label yearOfProduction1Label; - private System.Windows.Forms.TextBox yearOfProduction2TextBox; - private System.Windows.Forms.Label yearOfProduction2Label; - private System.Windows.Forms.TextBox yearOfProduction1TextBox; - private System.Windows.Forms.TextBox yearOfProduction3TextBox; - private System.Windows.Forms.Label yearOfProduction3Label; - private System.Windows.Forms.TextBox yearOfProduction4TextBox; - private System.Windows.Forms.Label yearOfProduction4Label; - private System.Windows.Forms.TextBox yearOfProduction5TextBox; - private System.Windows.Forms.Label yearOfProduction5Label; - private System.Windows.Forms.TextBox yearOfProduction6TextBox; - private System.Windows.Forms.Label yearOfProduction6Label; - - } -} \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.resx b/TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.resx deleted file mode 100644 index 1af7de150..000000000 --- a/TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs b/TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs index a98c28d16..9aabab645 100644 --- a/TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs +++ b/TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs @@ -193,23 +193,8 @@ namespace TBF.BenchControl.DataEntry.StandardCamera /// void OpenEndDlg(EntryForm myRef) { - if (!string.IsNullOrEmpty(entryFormCfg.ProtocolTitle1) || - !string.IsNullOrEmpty(entryFormCfg.ProtocolTitle2) || - !string.IsNullOrEmpty(entryFormCfg.ProtocolTitle3) || - !string.IsNullOrEmpty(entryFormCfg.ProtocolTitle4)) - { - myRef.modelessDlg = new CycleEndFormMunich(Config.Data.WMsCount); - (myRef.modelessDlg as CycleEndFormMunich).ProtocolName1 = entryFormCfg.ProtocolTitle1; - (myRef.modelessDlg as CycleEndFormMunich).ProtocolName2 = entryFormCfg.ProtocolTitle2; - (myRef.modelessDlg as CycleEndFormMunich).ProtocolName3 = entryFormCfg.ProtocolTitle3; - (myRef.modelessDlg as CycleEndFormMunich).ProtocolName4 = entryFormCfg.ProtocolTitle4; - } - else - { - myRef.modelessDlg = new CycleEndForm(Config.Data.WMsCount, Config.Data.LineSize); - } - - myRef.modelessDlg.Show(); + myRef.modelessDlg = new CycleEndForm(Config.Data.WMsCount, Config.Data.LineSize); + modelessDlg.Show(); } /// void OpenTestStartStatesDlg(EntryForm myRef) @@ -313,21 +298,6 @@ namespace TBF.BenchControl.DataEntry.StandardCamera } } } - else if (modelessDlg is CycleEndFormMunich) - { - CycleEndFormMunich dlg = (modelessDlg as CycleEndFormMunich); - - Sequences.ProcessData.BatchRslts.Batch.ProtocolTitle = dlg.ProtocolTitle; - - for (int i = 0; i < Math.Min(waterMeters.Count, dlg.WaterMetersCount); i++) - { - if (waterMeters[i] != null) - { - wmCycleEndState[i] = waterMeters[i].EndState = dlg.EndStateText[i]; - waterMeters[i].YearOfProduction = dlg.YearOfProduction[i]; - } - } - } } else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.TestStartStates) { diff --git a/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfg.cs index 8b8d2ede3..941930b9b 100644 --- a/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfg.cs @@ -21,10 +21,6 @@ namespace TBF.BenchControl.DataEntry.StandardCamera public bool EnterSerialNrsAtTheEnd; public bool ShowCycleEndForm; public bool SaveImages; - public string ProtocolTitle1; - public string ProtocolTitle2; - public string ProtocolTitle3; - public string ProtocolTitle4; /// Private parameterless constructor invoked by all other (public) constructors EntryFormCfg() @@ -35,10 +31,6 @@ namespace TBF.BenchControl.DataEntry.StandardCamera EnterSerialNrsAtTheEnd = false; ShowCycleEndForm = false; SaveImages = false; - ProtocolTitle1 = string.Empty; - ProtocolTitle2 = string.Empty; - ProtocolTitle3 = string.Empty; - ProtocolTitle4 = string.Empty; } public EntryFormCfg(IComponentFactory factory) diff --git a/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.cs index 649b510de..5a888a399 100644 --- a/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.cs +++ b/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017-2021 Sensus Slovensko a.s. /// using System; using System.Windows.Forms; @@ -55,10 +55,6 @@ namespace TBF.BenchControl.DataEntry.StandardCamera enterSNsAtTheEndCheckBox.Checked = config.EnterSerialNrsAtTheEnd; showEndStateFormCheckBox.Checked = config.ShowCycleEndForm; saveImagesCheckBox.Checked = config.SaveImages; - protocolTitle1TextBox.Text = config.ProtocolTitle1; - protocolTitle2TextBox.Text = config.ProtocolTitle2; - protocolTitle3TextBox.Text = config.ProtocolTitle3; - protocolTitle4TextBox.Text = config.ProtocolTitle4; } public void Unlock() @@ -68,10 +64,6 @@ namespace TBF.BenchControl.DataEntry.StandardCamera enterSNsAtTheEndCheckBox.Enabled = true; showEndStateFormCheckBox.Enabled = true; saveImagesCheckBox.Enabled = true; - protocolTitle1TextBox.Enabled = true; - protocolTitle2TextBox.Enabled = true; - protocolTitle3TextBox.Enabled = true; - protocolTitle4TextBox.Enabled = true; } public CfgUpdateFlags VerifyCfg(ref string message) @@ -91,10 +83,6 @@ namespace TBF.BenchControl.DataEntry.StandardCamera config.EnterSerialNrsAtTheEnd = enterSNsAtTheEndCheckBox.Checked; config.ShowCycleEndForm = showEndStateFormCheckBox.Checked; config.SaveImages = saveImagesCheckBox.Checked; - config.ProtocolTitle1 = protocolTitle1TextBox.Text; - config.ProtocolTitle2 = protocolTitle2TextBox.Text; - config.ProtocolTitle3 = protocolTitle3TextBox.Text; - config.ProtocolTitle4 = protocolTitle4TextBox.Text; return flags; } diff --git a/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.designer.cs b/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.designer.cs index db54d92e8..a548668f4 100644 --- a/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.designer.cs +++ b/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.designer.cs @@ -31,185 +31,101 @@ namespace TBF.BenchControl.DataEntry.StandardCamera /// 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.showEndStateFormCheckBox = new System.Windows.Forms.CheckBox(); - this.enterSNsAtTheEndCheckBox = new System.Windows.Forms.CheckBox(); - this.saveImagesCheckBox = new System.Windows.Forms.CheckBox(); - this.protocolTitle4TextBox = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.protocolTitle3TextBox = new System.Windows.Forms.TextBox(); - this.protocolTitle2TextBox = new System.Windows.Forms.TextBox(); - this.protocolTitle1TextBox = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.hideOrderCheckBox = new System.Windows.Forms.CheckBox(); - this.SuspendLayout(); - // - // nameTextBox - // - this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(136, 31); - this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(130, 20); - this.nameTextBox.TabIndex = 2; - // - // nameLabel - // - this.nameLabel.AutoSize = true; - this.nameLabel.Location = new System.Drawing.Point(26, 34); - 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(133, 10); - this.classNameLabel.Name = "classNameLabel"; - this.classNameLabel.Size = new System.Drawing.Size(61, 13); - this.classNameLabel.TabIndex = 0; - this.classNameLabel.Text = "Class name"; - // - // showEndStateFormCheckBox - // - this.showEndStateFormCheckBox.AutoSize = true; - this.showEndStateFormCheckBox.Enabled = false; - this.showEndStateFormCheckBox.Location = new System.Drawing.Point(136, 103); - this.showEndStateFormCheckBox.Name = "showEndStateFormCheckBox"; - this.showEndStateFormCheckBox.Size = new System.Drawing.Size(151, 17); - this.showEndStateFormCheckBox.TabIndex = 5; - this.showEndStateFormCheckBox.Text = "Watermeter end state form"; - this.showEndStateFormCheckBox.UseVisualStyleBackColor = true; - // - // enterSNsAtTheEndCheckBox - // - this.enterSNsAtTheEndCheckBox.AutoSize = true; - this.enterSNsAtTheEndCheckBox.Enabled = false; - this.enterSNsAtTheEndCheckBox.Location = new System.Drawing.Point(136, 82); - this.enterSNsAtTheEndCheckBox.Name = "enterSNsAtTheEndCheckBox"; - this.enterSNsAtTheEndCheckBox.Size = new System.Drawing.Size(167, 17); - this.enterSNsAtTheEndCheckBox.TabIndex = 4; - this.enterSNsAtTheEndCheckBox.Text = "Enter serial number at the end"; - this.enterSNsAtTheEndCheckBox.UseVisualStyleBackColor = true; - // - // saveImagesCheckBox - // - this.saveImagesCheckBox.AutoSize = true; - this.saveImagesCheckBox.Enabled = false; - this.saveImagesCheckBox.Location = new System.Drawing.Point(136, 124); - this.saveImagesCheckBox.Name = "saveImagesCheckBox"; - this.saveImagesCheckBox.Size = new System.Drawing.Size(87, 17); - this.saveImagesCheckBox.TabIndex = 6; - this.saveImagesCheckBox.Text = "Save images"; - this.saveImagesCheckBox.UseVisualStyleBackColor = true; - // - // protocolTitle4TextBox - // - this.protocolTitle4TextBox.Enabled = false; - this.protocolTitle4TextBox.Location = new System.Drawing.Point(136, 228); - this.protocolTitle4TextBox.Name = "protocolTitle4TextBox"; - this.protocolTitle4TextBox.Size = new System.Drawing.Size(130, 20); - this.protocolTitle4TextBox.TabIndex = 14; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(26, 231); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(74, 13); - this.label4.TabIndex = 13; - this.label4.Text = "Protocol title 4"; - // - // protocolTitle3TextBox - // - this.protocolTitle3TextBox.Enabled = false; - this.protocolTitle3TextBox.Location = new System.Drawing.Point(136, 202); - this.protocolTitle3TextBox.Name = "protocolTitle3TextBox"; - this.protocolTitle3TextBox.Size = new System.Drawing.Size(130, 20); - this.protocolTitle3TextBox.TabIndex = 12; - // - // protocolTitle2TextBox - // - this.protocolTitle2TextBox.Enabled = false; - this.protocolTitle2TextBox.Location = new System.Drawing.Point(136, 176); - this.protocolTitle2TextBox.Name = "protocolTitle2TextBox"; - this.protocolTitle2TextBox.Size = new System.Drawing.Size(130, 20); - this.protocolTitle2TextBox.TabIndex = 10; - // - // protocolTitle1TextBox - // - this.protocolTitle1TextBox.Enabled = false; - this.protocolTitle1TextBox.Location = new System.Drawing.Point(136, 150); - this.protocolTitle1TextBox.Name = "protocolTitle1TextBox"; - this.protocolTitle1TextBox.Size = new System.Drawing.Size(130, 20); - this.protocolTitle1TextBox.TabIndex = 8; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(26, 205); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(74, 13); - this.label3.TabIndex = 11; - this.label3.Text = "Protocol title 3"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(26, 179); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(74, 13); - this.label2.TabIndex = 9; - this.label2.Text = "Protocol title 2"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(26, 153); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(74, 13); - this.label1.TabIndex = 7; - this.label1.Text = "Protocol title 1"; - // - // hideOrderCheckBox - // - this.hideOrderCheckBox.AutoSize = true; - this.hideOrderCheckBox.Enabled = false; - this.hideOrderCheckBox.Location = new System.Drawing.Point(136, 61); - this.hideOrderCheckBox.Name = "hideOrderCheckBox"; - this.hideOrderCheckBox.Size = new System.Drawing.Size(103, 17); - this.hideOrderCheckBox.TabIndex = 3; - this.hideOrderCheckBox.Text = "Hide \'Order\' field"; - this.hideOrderCheckBox.UseVisualStyleBackColor = true; - // - // EntryFormCfgCtrl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.hideOrderCheckBox); - this.Controls.Add(this.protocolTitle4TextBox); - this.Controls.Add(this.label4); - this.Controls.Add(this.protocolTitle3TextBox); - this.Controls.Add(this.protocolTitle2TextBox); - this.Controls.Add(this.protocolTitle1TextBox); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.saveImagesCheckBox); - this.Controls.Add(this.enterSNsAtTheEndCheckBox); - this.Controls.Add(this.showEndStateFormCheckBox); - this.Controls.Add(this.nameTextBox); - this.Controls.Add(this.nameLabel); - this.Controls.Add(this.classNameLabel); - this.Name = "EntryFormCfgCtrl"; - this.Size = new System.Drawing.Size(359, 275); - this.Load += new System.EventHandler(this.EntryFormCfgCtrl_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.showEndStateFormCheckBox = new System.Windows.Forms.CheckBox(); + this.enterSNsAtTheEndCheckBox = new System.Windows.Forms.CheckBox(); + this.saveImagesCheckBox = new System.Windows.Forms.CheckBox(); + this.hideOrderCheckBox = new System.Windows.Forms.CheckBox(); + this.SuspendLayout(); + // + // nameTextBox + // + this.nameTextBox.Enabled = false; + this.nameTextBox.Location = new System.Drawing.Point(136, 31); + this.nameTextBox.Name = "nameTextBox"; + this.nameTextBox.Size = new System.Drawing.Size(130, 20); + this.nameTextBox.TabIndex = 2; + // + // nameLabel + // + this.nameLabel.AutoSize = true; + this.nameLabel.Location = new System.Drawing.Point(26, 34); + 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(133, 10); + this.classNameLabel.Name = "classNameLabel"; + this.classNameLabel.Size = new System.Drawing.Size(61, 13); + this.classNameLabel.TabIndex = 0; + this.classNameLabel.Text = "Class name"; + // + // showEndStateFormCheckBox + // + this.showEndStateFormCheckBox.AutoSize = true; + this.showEndStateFormCheckBox.Enabled = false; + this.showEndStateFormCheckBox.Location = new System.Drawing.Point(136, 103); + this.showEndStateFormCheckBox.Name = "showEndStateFormCheckBox"; + this.showEndStateFormCheckBox.Size = new System.Drawing.Size(151, 17); + this.showEndStateFormCheckBox.TabIndex = 5; + this.showEndStateFormCheckBox.Text = "Watermeter end state form"; + this.showEndStateFormCheckBox.UseVisualStyleBackColor = true; + // + // enterSNsAtTheEndCheckBox + // + this.enterSNsAtTheEndCheckBox.AutoSize = true; + this.enterSNsAtTheEndCheckBox.Enabled = false; + this.enterSNsAtTheEndCheckBox.Location = new System.Drawing.Point(136, 82); + this.enterSNsAtTheEndCheckBox.Name = "enterSNsAtTheEndCheckBox"; + this.enterSNsAtTheEndCheckBox.Size = new System.Drawing.Size(167, 17); + this.enterSNsAtTheEndCheckBox.TabIndex = 4; + this.enterSNsAtTheEndCheckBox.Text = "Enter serial number at the end"; + this.enterSNsAtTheEndCheckBox.UseVisualStyleBackColor = true; + // + // saveImagesCheckBox + // + this.saveImagesCheckBox.AutoSize = true; + this.saveImagesCheckBox.Enabled = false; + this.saveImagesCheckBox.Location = new System.Drawing.Point(136, 124); + this.saveImagesCheckBox.Name = "saveImagesCheckBox"; + this.saveImagesCheckBox.Size = new System.Drawing.Size(87, 17); + this.saveImagesCheckBox.TabIndex = 6; + this.saveImagesCheckBox.Text = "Save images"; + this.saveImagesCheckBox.UseVisualStyleBackColor = true; + // + // hideOrderCheckBox + // + this.hideOrderCheckBox.AutoSize = true; + this.hideOrderCheckBox.Enabled = false; + this.hideOrderCheckBox.Location = new System.Drawing.Point(136, 61); + this.hideOrderCheckBox.Name = "hideOrderCheckBox"; + this.hideOrderCheckBox.Size = new System.Drawing.Size(103, 17); + this.hideOrderCheckBox.TabIndex = 3; + this.hideOrderCheckBox.Text = "Hide \'Order\' field"; + this.hideOrderCheckBox.UseVisualStyleBackColor = true; + // + // EntryFormCfgCtrl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.hideOrderCheckBox); + this.Controls.Add(this.saveImagesCheckBox); + this.Controls.Add(this.enterSNsAtTheEndCheckBox); + this.Controls.Add(this.showEndStateFormCheckBox); + this.Controls.Add(this.nameTextBox); + this.Controls.Add(this.nameLabel); + this.Controls.Add(this.classNameLabel); + this.Name = "EntryFormCfgCtrl"; + this.Size = new System.Drawing.Size(359, 275); + this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -221,14 +137,6 @@ namespace TBF.BenchControl.DataEntry.StandardCamera private System.Windows.Forms.CheckBox showEndStateFormCheckBox; private System.Windows.Forms.CheckBox enterSNsAtTheEndCheckBox; private System.Windows.Forms.CheckBox saveImagesCheckBox; - private System.Windows.Forms.TextBox protocolTitle4TextBox; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.TextBox protocolTitle3TextBox; - private System.Windows.Forms.TextBox protocolTitle2TextBox; - private System.Windows.Forms.TextBox protocolTitle1TextBox; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; private System.Windows.Forms.CheckBox hideOrderCheckBox; } } diff --git a/TBF/BenchControl/Output/Printers/Munich/Printer.cs b/TBF/BenchControl/Output/Printers/Munich/Printer.cs deleted file mode 100644 index 6b691a785..000000000 --- a/TBF/BenchControl/Output/Printers/Munich/Printer.cs +++ /dev/null @@ -1,73 +0,0 @@ -/// -/// Copyright (c) 2013-2017 Sensus Slovensko a.s. -/// -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Drawing.Printing; -using log4net; -using Config.Entities; -using TBF.BenchControl; - -namespace TBF.BenchControl.Output.Printers.Munich -{ - public class Printer : ComponentBase, IOperation, GenericDevices.IResultsPrinter - { - private static readonly ILog log = LogManager.GetLogger(typeof(Printer)); - public override string ToString() { return string.Format("Output.Printers.Munich({0})", Cfg.ToString(1)); } - - readonly PrinterCfg printerCfg; - - public bool SupressPrinting { get { return false; } } - - - /// Data to print - Results.Entities.Batch batch; - - public string Version { get { return printerCfg.Version; } } - - - public Printer() - { - } - - public Printer(Generic.IComponentCfg cfg) - : base(cfg) - { - printerCfg = cfg as PrinterCfg; - log.Warn(this.ToString()); - } - - - /// Events: ResultsPrinted - /// Procedure to print the results of - /// Results to print - /// Reference to the operation - public IOperation ProcessResultsOp(Results.Entities.Batch batch) - { - this.batch = batch; - return this; - } - - /// Start this operation - public void Start() - { - foreach (var wm in batch.WaterMeters) - { - new Results.Output.Printers.Munich.MunichPrintDocument(printerCfg.Version, wm, printerCfg.PageOrientation).Print(); - } - } - - /// Run this operation - /// Event.ResultsPrinted - public Event Run() - { - return Event.ResultsPrinted; - } - - /// Stop this operation - public void Stop() - { - } - } -} diff --git a/TBF/BenchControl/Output/Printers/Munich/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/Munich/PrinterCfg.cs deleted file mode 100644 index fa28fdd2e..000000000 --- a/TBF/BenchControl/Output/Printers/Munich/PrinterCfg.cs +++ /dev/null @@ -1,50 +0,0 @@ -/// -/// Copyright (c) 2013-2018 Sensus Slovensko a.s. -/// -using System; -using System.Collections.Generic; -using System.IO; -using System.Xml.Serialization; -using Config.Entities; -using TBF.BenchControl.Generic; - -namespace TBF.BenchControl.Output.Printers.Munich -{ - public class PrinterCfg : ComponentCfgBase, Generic.IComponentCfg - { - public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PrinterCfg) })[0]; - public override XmlSerializer GetSerializer() { return Serializer; } - - public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new PrinterCfgCtrl(); } - - /// - /// Serialized parameters - /// - public string Version; - public PageOrientation PageOrientation; - public bool SupressPrinting; /// Bypass printing when true - - /// Private parameterless constructor invoked by all other (public) constructors - PrinterCfg() - { - } - - public PrinterCfg(string name, IComponentFactory factory) - : this() - { - this.Name = name; - this.Factory = factory; - ParentName = string.Empty; - PageOrientation = PageOrientation.Portrait; - SupressPrinting = false; - } - - public string ToString(int i) - { - return string.Format("Name={0}, Orientation={1}, SupressPrinting={2}", - Name, - PageOrientation, - SupressPrinting ? "yes" : "no"); - } - } -} diff --git a/TBF/BenchControl/Output/Printers/Munich/PrinterCfgCtrl.cs b/TBF/BenchControl/Output/Printers/Munich/PrinterCfgCtrl.cs deleted file mode 100644 index cbfbf42fe..000000000 --- a/TBF/BenchControl/Output/Printers/Munich/PrinterCfgCtrl.cs +++ /dev/null @@ -1,98 +0,0 @@ -/// -/// Copyright (c) 2013-2017 Sensus Slovensko a.s. -/// -using System; -using System.Windows.Forms; -using log4net; -using Config.Entities; -using TBF.BenchControl.Generic; - -namespace TBF.BenchControl.Output.Printers.Munich -{ - public partial class PrinterCfgCtrl : UserControl, IComponentCfgCtrl - { - static readonly ILog log = LogManager.GetLogger(typeof(PrinterCfgCtrl)); - - public bool ShowMore { get { return false; } } - - PrinterCfg config; - public IComponentCfg Config - { - get { return config as IComponentCfg; } - set - { - config = value as PrinterCfg; - Redraw(); - } - } - - public PrinterCfgCtrl() - { - InitializeComponent(); - - orientationComboBox.Items.Add(PageOrientation.Portrait.ToString()); - orientationComboBox.Items.Add(PageOrientation.Landscape.ToString()); - } - - private void PrinterCfgCtrl_Load(object sender, EventArgs e) - { - Redraw(); - } - - public void Closing() - { - } - - PageOrientation GetOrientation(string str) - { - if (str.Equals(PageOrientation.Landscape.ToString())) return PageOrientation.Landscape; - if (str.Equals(PageOrientation.Portrait.ToString())) return PageOrientation.Portrait; - return (PageOrientation)(-1); - } - - void Redraw() - { - if (config == null) return; /// Control was not loaded, settings were not changed - classNameLabel.Text = config.Factory.ClassName; - nameTextBox.Text = config.Name; - versionTextBox.Text = config.Version; - orientationComboBox.Text = config.PageOrientation.ToString(); - supressPrintingCheckBox.Checked = config.SupressPrinting; - } - - public void Unlock() - { - nameTextBox.Enabled = true; - versionTextBox.Enabled = true; - orientationComboBox.Enabled = true; - supressPrintingCheckBox.Enabled = true; - } - - public CfgUpdateFlags VerifyCfg(ref string message) - { - CfgUpdateFlags flags = CfgUpdateFlags.None; - - if ((int)GetOrientation(orientationComboBox.Text) < 0) - { - message += Environment.NewLine + "Invalid 'Page orientation'"; - flags |= CfgUpdateFlags.Error; - } - - return flags; - } - - public CfgUpdateFlags UpdateCfg() - { - CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd; - - if (config == null) return CfgUpdateFlags.Error; /// Control was not loaded, settings were not changed - - config.Name = nameTextBox.Text; - config.Version = versionTextBox.Text; - config.PageOrientation = GetOrientation(orientationComboBox.Text); - config.SupressPrinting = supressPrintingCheckBox.Checked; - - return flags; - } - } -} diff --git a/TBF/BenchControl/Output/Printers/Munich/PrinterCfgCtrl.designer.cs b/TBF/BenchControl/Output/Printers/Munich/PrinterCfgCtrl.designer.cs deleted file mode 100644 index 31b08d028..000000000 --- a/TBF/BenchControl/Output/Printers/Munich/PrinterCfgCtrl.designer.cs +++ /dev/null @@ -1,147 +0,0 @@ -/// -/// Copyright (c) 2013-2017 Sensus Slovensko a.s. -/// -namespace TBF.BenchControl.Output.Printers.Munich -{ - partial class PrinterCfgCtrl - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - 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.orientationComboBox = new System.Windows.Forms.ComboBox(); - this.orientationLabel = new System.Windows.Forms.Label(); - this.supressPrintingCheckBox = new System.Windows.Forms.CheckBox(); - this.versionTextBox = new System.Windows.Forms.TextBox(); - this.versionLabel = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // nameTextBox - // - this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(143, 57); - this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(130, 20); - this.nameTextBox.TabIndex = 2; - // - // nameLabel - // - this.nameLabel.AutoSize = true; - this.nameLabel.Location = new System.Drawing.Point(25, 60); - 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(140, 24); - this.classNameLabel.Name = "classNameLabel"; - this.classNameLabel.Size = new System.Drawing.Size(83, 13); - this.classNameLabel.TabIndex = 0; - this.classNameLabel.Text = "ComonentName"; - // - // orientationComboBox - // - this.orientationComboBox.Enabled = false; - this.orientationComboBox.FormattingEnabled = true; - this.orientationComboBox.Location = new System.Drawing.Point(143, 109); - this.orientationComboBox.Name = "orientationComboBox"; - this.orientationComboBox.Size = new System.Drawing.Size(130, 21); - this.orientationComboBox.TabIndex = 6; - // - // orientationLabel - // - this.orientationLabel.AutoSize = true; - this.orientationLabel.Location = new System.Drawing.Point(25, 112); - this.orientationLabel.Name = "orientationLabel"; - this.orientationLabel.Size = new System.Drawing.Size(84, 13); - this.orientationLabel.TabIndex = 5; - this.orientationLabel.Text = "Page orientation"; - // - // supressPrintingCheckBox - // - this.supressPrintingCheckBox.AutoSize = true; - this.supressPrintingCheckBox.Enabled = false; - this.supressPrintingCheckBox.Location = new System.Drawing.Point(143, 137); - this.supressPrintingCheckBox.Name = "supressPrintingCheckBox"; - this.supressPrintingCheckBox.Size = new System.Drawing.Size(101, 17); - this.supressPrintingCheckBox.TabIndex = 7; - this.supressPrintingCheckBox.Text = "Supress printing"; - this.supressPrintingCheckBox.UseVisualStyleBackColor = true; - // - // versionTextBox - // - this.versionTextBox.Enabled = false; - this.versionTextBox.Location = new System.Drawing.Point(143, 83); - this.versionTextBox.Name = "versionTextBox"; - this.versionTextBox.Size = new System.Drawing.Size(130, 20); - this.versionTextBox.TabIndex = 4; - // - // versionLabel - // - this.versionLabel.AutoSize = true; - this.versionLabel.Location = new System.Drawing.Point(25, 86); - this.versionLabel.Name = "versionLabel"; - this.versionLabel.Size = new System.Drawing.Size(42, 13); - this.versionLabel.TabIndex = 3; - this.versionLabel.Text = "Version"; - // - // PrinterCfgCtrl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.versionTextBox); - this.Controls.Add(this.versionLabel); - 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(300, 200); - this.Load += new System.EventHandler(this.PrinterCfgCtrl_Load); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.TextBox nameTextBox; - private System.Windows.Forms.Label nameLabel; - private System.Windows.Forms.Label classNameLabel; - private System.Windows.Forms.ComboBox orientationComboBox; - private System.Windows.Forms.Label orientationLabel; - private System.Windows.Forms.CheckBox supressPrintingCheckBox; - private System.Windows.Forms.TextBox versionTextBox; - private System.Windows.Forms.Label versionLabel; - } -} diff --git a/TBF/BenchControl/Output/Printers/Munich/PrinterCfgCtrl.resx b/TBF/BenchControl/Output/Printers/Munich/PrinterCfgCtrl.resx deleted file mode 100644 index 1af7de150..000000000 --- a/TBF/BenchControl/Output/Printers/Munich/PrinterCfgCtrl.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/TBF/BenchControl/Output/Printers/Munich/PrinterFactory.cs b/TBF/BenchControl/Output/Printers/Munich/PrinterFactory.cs deleted file mode 100644 index 6eadb4674..000000000 --- a/TBF/BenchControl/Output/Printers/Munich/PrinterFactory.cs +++ /dev/null @@ -1,27 +0,0 @@ -/// -/// Copyright (c) 2013-2018 Sensus Slovensko a.s. -/// -using System.Collections.Generic; -using TBF.BenchControl.Generic; - -namespace TBF.BenchControl.Output.Printers.Munich -{ - public class PrinterFactory : IComponentFactory - { - public string ClassName { get { return this.GetType().Namespace.Substring(17); } } - public override string ToString() { return ClassName; } - - public void ResetStaticProperties() { Printer.ResetStaticProperties(); } - - public IComponent DummyComponent() { return new Printer(); } - - public IComponent GetComponent(IComponentCfg cfg, IList components) { return new Printer(cfg); } - - public IComponentCfg DefaultConfig() { return new PrinterCfg(this.GetType().Namespace.Substring(24), this); } - - public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component) - { - return ComponentCfgBase.CreateFromDbEntity(PrinterCfg.Serializer, component, this); - } - } -} diff --git a/TBF/BenchControl/TbfComponents.cs b/TBF/BenchControl/TbfComponents.cs index 7c288441a..aa1d75e04 100644 --- a/TBF/BenchControl/TbfComponents.cs +++ b/TBF/BenchControl/TbfComponents.cs @@ -30,8 +30,6 @@ namespace TBF.BenchControl Factories.Add(new DataEntry.HeatMeters12.Factory()); Factories.Add(new DataEntry.Fewa.Factory()); Factories.Add(new DataEntry.Fewa.FactoryNoStartEnd()); - Factories.Add(new DataEntry.Munich3.EntryFormFactory()); - Factories.Add(new DataEntry.Munich.EntryFormFactory()); Factories.Add(new DataEntry.iPerl.EntryFormFactory()); Factories.Add(new DataEntry.Single.Factory()); Factories.Add(new DataEntry.Single.FactoryNoStartEnd()); @@ -104,7 +102,6 @@ namespace TBF.BenchControl Factories.Add(new Output.Printers.Enhanced.FactoryHeatMeters()); Factories.Add(new Output.Printers.Label.Factory()); Factories.Add(new Output.Printers.MultiLabel.Factory()); - Factories.Add(new Output.Printers.Munich.PrinterFactory()); Factories.Add(new Output.Printers.OnePerBatch.Factory()); Factories.Add(new Output.Printers.OnePerMeter.FactorySingle()); Factories.Add(new Output.Printers.OnePerMeter.FactoryCompound()); @@ -188,7 +185,6 @@ namespace TBF.BenchControl Factories.Add(new Various.ErrorFlags.Factory()); Factories.Add(new Various.StatisticsMonitoring.Factory()); Factories.Add(new Various.TankWithLevelMsrmnt.Factory()); - Factories.Add(new WaterMeters.Munich.WaterMeterFactory()); /// 'WaterMeters.Munich' Factories.Add(new WaterMeters.WaterMeter.WaterMeterFactory()); /// 'WaterMeter' } diff --git a/TBF/BenchControl/WaterMeters/Munich/ProcParams.cs b/TBF/BenchControl/WaterMeters/Munich/ProcParams.cs deleted file mode 100644 index afdefd1d5..000000000 --- a/TBF/BenchControl/WaterMeters/Munich/ProcParams.cs +++ /dev/null @@ -1,206 +0,0 @@ -/// -/// Copyright (c) 2016 Sensus Metering Systems -/// -using System; -using System.IO; -using System.Text; -using System.Xml.Serialization; -using Config.Entities; -using TBF.BenchControl.Generic; -using TBF.Resources; - -namespace TBF.BenchControl.WaterMeters.Munich -{ - public class ProcParams : ProcedureParamsBase, IParamsProvider, IProcedureParams - { - public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ProcParams) })[0]; - public override XmlSerializer GetSerializer() { return Serializer; } - - public string ProductName; /// Znak fabryczny (PL) - public string Producer; /// Producent (PL), Hersteller (D) - - public float DN; - public float L; /// stavebná dĺžka [mm] - public Mounting Mounting; - - public bool NewQnames; /// true = display Q4,Q3,Q2,Q1, false = display Qmax, Qn, Qt, Qmin - public float Qn; /// [m3/h] - public string MetrologicalClass; /// Metr. Klasse - public string ApprovalInfo; /// Zulassungszeichen, WE (PL) - - - public override void InitializeAll() - { - ProductName = string.Empty; - Producer = string.Empty; - DN = 0; - L = 0; - Mounting = Mounting.NotSpecified; - NewQnames = false; - Qn = 2.5f; - MetrologicalClass = "A"; - ApprovalInfo = string.Empty; - } - - string[] paramNames = new string[] - { -#if MUNICH - "Prüfvorlage;Zählertyp", -#else - Strings.Product_name, -#endif - Strings.Producer, - "DN [mm]", - "L [mm]", - Strings.Mounting, - Strings.New_Q_names, - Strings.Qn, - Strings.Metrological_class, - Strings.Approval_info, - }; - public override string ParamName(int i) - { - string name = paramNames[i]; - - if (NewQnames && name.Equals(Strings.Qmax)) name = "Q4 [m3/h]"; - if (NewQnames && name.Equals(Strings.Qn)) name = "Q3 [m3/h]"; - if (NewQnames && name.Equals(Strings.Qt)) name = "Q2 [m3/h]"; - if (NewQnames && name.Equals(Strings.Qmin)) name = "Q1 [m3/h]"; - - return name; - } - public override int ParamsCount() { return paramNames.Length; } - - public override string ToString(int i) - { - switch (i) - { - case 0: return ProductName; - case 1: return Producer; - case 2: return DN.ToString(); - case 3: return L.ToString(); - case 4: return Mounting.ToDescription(); - case 5: return (NewQnames ? Strings.yes : Strings.no); - case 6: return Qn.ToString(); - case 7: return MetrologicalClass; - case 8: return ApprovalInfo; - - default: return string.Empty; - } - } - - public CfgUpdateFlags UpdateParam(int i, string strValue) - { - switch (i) - { - case 0: ProductName = strValue; return CfgUpdateFlags.None; - case 1: Producer = strValue; return CfgUpdateFlags.None; - case 2: DN = Utils.ParseUFloat(strValue); return CfgUpdateFlags.None; - case 3: L = Utils.ParseUFloat(strValue); return CfgUpdateFlags.None; - case 4: - for (Mounting m = 0; m < Mounting.Count; m++) - { - if (m.ToDescription().Equals(strValue)) { Mounting = m; return CfgUpdateFlags.None; } - } - break; - case 5: NewQnames = strValue.Equals(Strings.yes); return CfgUpdateFlags.None; - case 6: Qn = Utils.ParseUFloat(strValue); return CfgUpdateFlags.None; - case 7: MetrologicalClass = strValue; return CfgUpdateFlags.None; - case 8: ApprovalInfo = strValue; return CfgUpdateFlags.None; - - default: return CfgUpdateFlags.None; - } - - return CfgUpdateFlags.None; - } - - public bool ValidateParam(int i, string strValue, out string message) - { - message = string.Empty; - - float dummy; - switch (i) - { - case 0: /// ProductName - case 1: /// Producer - case 7: /// MetrologicalClass - case 8: /// ApprovalInfo - return true; - case 2: /// DN - case 3: /// L - case 6: /// Qn - if (Utils.TryParseUFloat(strValue, out dummy)) return true; - break; - case 4: - for (Mounting tc = 0; tc < Mounting.Count; tc++) if (tc.ToDescription().Equals(strValue)) return true; - break; - case 5: - if (strValue.Equals(Strings.yes) || strValue.Equals(Strings.no)) return true; - break; - default: - message = "Invalid index"; - return false; - } - - message = ParamName(i) + " is invalid"; - return false; - } - - void CopyContentTo(ProcParams prms) - { - prms.ProductName = this.ProductName; - prms.Producer = this.Producer; - prms.DN = this.DN; - prms.L = this.L; - prms.Mounting = this.Mounting; - prms.NewQnames = this.NewQnames; - prms.Qn = this.Qn; - prms.MetrologicalClass = this.MetrologicalClass; - prms.ApprovalInfo = this.ApprovalInfo; - } - - public IParamsProvider Clone() - { - ProcParams pars = new ProcParams(); - CopyContentTo(pars); - return pars; - } - - public override void UpdateFromDbEntity(ComponentProcedure dbEntity) - { - if (dbEntity == null) return; - try - { - ProcParams tmp = Serializer.Deserialize(new StringReader(dbEntity.Parameters)) as ProcParams; - - procedureParamsEntity = dbEntity; - componentName = dbEntity.CmpntName; - procedure = dbEntity.Procedure; - - if (tmp != null) tmp.CopyContentTo(this); - } - catch - { - } - } - - /// - /// Parameterless constructor initializes the parameters - /// - public ProcParams() - { - } - - public ProcParams(bool initialize) - { - if (initialize) InitializeAll(); - } - - public ProcParams(ComponentProcedure procParamsEntity, string componentName, Procedure procedure) - { - this.procedureParamsEntity = procParamsEntity; - this.componentName = componentName; - this.procedure = procedure; - } - } -} diff --git a/TBF/BenchControl/WaterMeters/Munich/WaterMeter.cs b/TBF/BenchControl/WaterMeters/Munich/WaterMeter.cs deleted file mode 100644 index 59e18287c..000000000 --- a/TBF/BenchControl/WaterMeters/Munich/WaterMeter.cs +++ /dev/null @@ -1,115 +0,0 @@ -/// -/// Copyright (c) 2016 Sensus Metering Systems -/// -using System; -using System.Collections.Generic; -using log4net; -using TBF.BenchControl; -using Config.Entities; - -namespace TBF.BenchControl.WaterMeters.Munich -{ - /// - /// This component = instance of this class is a placeholder for a combined main watermeter - /// - public class WaterMeter : ComponentBase, GenericDevices.IWaterMeter - { - private static readonly ILog log = LogManager.GetLogger(typeof(WaterMeter)); - public override string ToString() { return string.Format("WaterMeter({0})", Cfg.ToString(1)); } - - readonly WaterMeterCfg waterMeterCfg; - - /// WaterMeter type (product name) and producer - public string ProductName { get { return waterMeterCfg.ProcParams.ProductName; } } - public string Producer { get { return waterMeterCfg.ProcParams.Producer; } } - - public double PulsesPerLtr { get { return 1.0; } } - - /// Pipe diameter [mm] - public float DN { get { return 0; } } - - /// Build lenght [mm] - public float L { get { return 0; } } - - public Mounting Mounting { get { return Config.Entities.Mounting.NotSpecified; } } - - /// Nominal water flow in [m3/h] - public bool NewQnames { get { return waterMeterCfg.ProcParams.NewQnames; } } - public float Q4_Qmax { get { return 0; } } - public float Q3_Qn { get { return waterMeterCfg.ProcParams.Qn; } } - public float Q2_Qt { get { return 0; } } - public float Q1_Qmin { get { return 0; } } - - /// Metrological class, etc - public string MetrologicalClass { get { return waterMeterCfg.ProcParams.MetrologicalClass; } } - public TemperatureClass TemperatureClass { get { return Config.Entities.TemperatureClass.NotSpecified; } } - public PressureLossClass PressureLossClass { get { return Config.Entities.PressureLossClass.NotSpecified; } } - public MaxAdmissiblePressure MaxAdmissiblePressure { get { return Config.Entities.MaxAdmissiblePressure.NotSpecified; } } - public FlowProfileSensitivityClass FlowProfileSensitivityClass { get { return Config.Entities.FlowProfileSensitivityClass.NotSpecified; } } - - /// WaterMeter approval information or signature - public string ApprovalInfo { get { return waterMeterCfg.ProcParams.ApprovalInfo; } } - public string Certificate { get { return string.Empty; } } - - public Medium Medium { get { return Medium.ColdWater; } } - - public string Text1 { get { return string.Empty; } } - public string Text2 { get { return string.Empty; } } - public string Text3 { get { return string.Empty; } } - public string Text4 { get { return string.Empty; } } - public string Text5 { get { return string.Empty; } } - - /// Water: cold / hot - public Config.Entities.Medium WaterTemp { get { return Config.Entities.Medium.NotSpecified; } } - - /// Properties set by the Begin and the End form - public string SerialNr - { - get { return serialNr; } - set { serialNr = value; } - } - string serialNr; - - public string EndState - { - get { return endState; } - set { endState = value; } - } - string endState; - - public string BeginState - { - get { return beginState; } - set { beginState = value; } - } - string beginState; - - public bool Disabled - { - get { return disabled; } - set { disabled = value; } - } - bool disabled; - - public WaterMeter() - { - ClearData(); - } - - public WaterMeter(Generic.IComponentCfg cfg) - : base(cfg) - { - ClearData(); - waterMeterCfg = cfg as WaterMeterCfg; - log.Warn(this.ToString()); - } - - public void ClearData() - { - serialNr = string.Empty; - endState = string.Empty; - beginState = string.Empty; - disabled = false; - } - } -} diff --git a/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfg.cs b/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfg.cs deleted file mode 100644 index f603ba6fe..000000000 --- a/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfg.cs +++ /dev/null @@ -1,46 +0,0 @@ -/// -/// Copyright (c) 2016 Sensus Metering Systems -/// -using System; -using System.Collections.Generic; -using System.IO; -using System.Xml.Serialization; -using Config.Entities; -using TBF.BenchControl.Generic; -using TBF.Resources; - -namespace TBF.BenchControl.WaterMeters.Munich -{ - public class WaterMeterCfg : ComponentCfgBase, Generic.IComponentCfg - { - public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(WaterMeterCfg) })[0]; - public override XmlSerializer GetSerializer() { return Serializer; } - - public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new WaterMeterCfgCtrl(); } - - /// Procedure parameters - [XmlIgnore] - public ProcParams ProcParams; - public override IParamsProvider GetRuntimeProcParamsProvider() { return ProcParams; } - public override IParamsProvider CreateProcParamsProvider() { return new ProcParams(true); } - - /// Private parameterless constructor invoked by all other (public) constructors - WaterMeterCfg() - { - Name = "WM"; - ParentName = string.Empty; - ProcParams = CreateProcParamsProvider() as ProcParams; - } - - public WaterMeterCfg(IComponentFactory factory) - : this() - { - this.Factory = factory; - } - - public string ToString(int i) - { - return string.Format("Name={0}", Name); - } - } -} diff --git a/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.cs b/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.cs deleted file mode 100644 index 3f679a9d6..000000000 --- a/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.cs +++ /dev/null @@ -1,71 +0,0 @@ -/// -/// Copyright (c) 2016 Sensus Metering Systems -/// -using System; -using System.Windows.Forms; -using Config.Entities; -using TBF.BenchControl.Generic; -using TBF.Resources; - -namespace TBF.BenchControl.WaterMeters.Munich -{ - public partial class WaterMeterCfgCtrl : UserControl, IComponentCfgCtrl - { - public bool ShowMore { get { return false; } } - - WaterMeterCfg config; - public IComponentCfg Config - { - get { return config as IComponentCfg; } - set - { - config = value as WaterMeterCfg; - Redraw(); - } - } - - public WaterMeterCfgCtrl() - { - InitializeComponent(); - } - - private void WaterMeterCfgCtrl_Load(object sender, EventArgs e) - { - nameLabel.Text = Strings.Name; - Redraw(); - } - - public void Closing() - { - } - - void Redraw() - { - if (config == null) return; /// Control was not loaded, settings were not changed - classNameLabel.Text = config.Factory.ClassName; - nameTextBox.Text = config.Name; - } - - public void Unlock() - { - nameTextBox.Enabled = true; - } - - public CfgUpdateFlags VerifyCfg(ref string message) - { - CfgUpdateFlags flags = CfgUpdateFlags.None; - return flags; - } - - public CfgUpdateFlags UpdateCfg() - { - CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd; - - if (config == null) return CfgUpdateFlags.Error; /// Control was not loaded, settings were not changed - - config.Name = nameTextBox.Text; - - return flags; - } - } -} diff --git a/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.designer.cs b/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.designer.cs deleted file mode 100644 index 9b9992737..000000000 --- a/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.designer.cs +++ /dev/null @@ -1,86 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -namespace TBF.BenchControl.WaterMeters.Munich -{ - partial class WaterMeterCfgCtrl - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - 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.SuspendLayout(); - // - // nameTextBox - // - this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(135, 55); - this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(130, 20); - this.nameTextBox.TabIndex = 5; - // - // nameLabel - // - this.nameLabel.AutoSize = true; - this.nameLabel.Location = new System.Drawing.Point(25, 58); - this.nameLabel.Name = "nameLabel"; - this.nameLabel.Size = new System.Drawing.Size(35, 13); - this.nameLabel.TabIndex = 4; - this.nameLabel.Text = "Name"; - // - // classNameLabel - // - this.classNameLabel.AutoSize = true; - this.classNameLabel.Location = new System.Drawing.Point(132, 31); - this.classNameLabel.Name = "classNameLabel"; - this.classNameLabel.Size = new System.Drawing.Size(60, 13); - this.classNameLabel.TabIndex = 3; - this.classNameLabel.Text = "ClassName"; - // - // WaterMeterCfgCtrl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.nameTextBox); - this.Controls.Add(this.nameLabel); - this.Controls.Add(this.classNameLabel); - this.Name = "WaterMeterCfgCtrl"; - this.Size = new System.Drawing.Size(300, 200); - this.Load += new System.EventHandler(this.WaterMeterCfgCtrl_Load); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.TextBox nameTextBox; - private System.Windows.Forms.Label nameLabel; - private System.Windows.Forms.Label classNameLabel; - } -} diff --git a/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.resx b/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.resx deleted file mode 100644 index 1af7de150..000000000 --- a/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/TBF/BenchControl/WaterMeters/Munich/WaterMeterFactory.cs b/TBF/BenchControl/WaterMeters/Munich/WaterMeterFactory.cs deleted file mode 100644 index 86c5a9338..000000000 --- a/TBF/BenchControl/WaterMeters/Munich/WaterMeterFactory.cs +++ /dev/null @@ -1,27 +0,0 @@ -/// -/// Copyright (c) 2016 Sensus Metering Systems -/// -using System.Collections.Generic; -using TBF.BenchControl.Generic; - -namespace TBF.BenchControl.WaterMeters.Munich -{ - public class WaterMeterFactory : IComponentFactory - { - public string ClassName { get { return this.GetType().Namespace.Substring(17); } } - public override string ToString() { return ClassName; } - - public void ResetStaticProperties() { WaterMeter.ResetStaticProperties(); } - - public IComponent DummyComponent() { return new WaterMeter(); } - - public IComponent GetComponent(IComponentCfg cfg, IList components) { return new WaterMeter(cfg); } - - public IComponentCfg DefaultConfig() { return new WaterMeterCfg(this); } - - public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component) - { - return ComponentCfgBase.CreateFromDbEntity(WaterMeterCfg.Serializer, component, this); - } - } -} diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index a094a39a4..47a24ea03 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -378,12 +378,6 @@ TestStartEndForm.cs - - Form - - - TestStartEndForm.cs - Form @@ -526,12 +520,6 @@ CycleEndForm.cs - - Form - - - CycleEndFormMunich.cs - UserControl @@ -1065,15 +1053,6 @@ PrinterCfgCtrl.cs - - - - UserControl - - - PrinterCfgCtrl.cs - - @@ -1720,16 +1699,6 @@ TankCfgCtrl.cs - - - - - UserControl - - - WaterMeterCfgCtrl.cs - - @@ -1774,48 +1743,6 @@ EntryFormCfgCtrl.cs - - Form - - - CycleBeginningForm.cs - - - Form - - - CycleEndForm.cs - - - - - UserControl - - - EntryFormCfgCtrl.cs - - - - Form - - - CycleBeginningForm.cs - - - Form - - - CycleEndForm.cs - - - - - UserControl - - - EntryFormCfgCtrl.cs - - Form @@ -2725,33 +2652,6 @@ TestStartEndForm.cs - - CycleBeginningForm.cs - - - CycleBeginningForm.cs - - - CycleBeginningForm.cs - - - CycleEndForm.cs - - - EntryFormCfgCtrl.cs - - - TestStartEndForm.cs - - - CycleBeginningForm.cs - - - CycleEndForm.cs - - - EntryFormCfgCtrl.cs - CycleBeginningForm.cs @@ -2845,9 +2745,6 @@ CycleEndForm.cs - - CycleEndFormMunich.cs - EntryFormCfgCtrl.cs @@ -3007,9 +2904,6 @@ PrinterCfgCtrl.cs - - PrinterCfgCtrl.cs - PrinterCfgCtrl.cs @@ -3205,9 +3099,6 @@ TankCfgCtrl.cs - - WaterMeterCfgCtrl.cs - WaterMeterCfgCtrl.cs diff --git a/TBF/UI/ResultsMI/PreviousResultsDlg.cs b/TBF/UI/ResultsMI/PreviousResultsDlg.cs index 5883c050a..3d4340fda 100644 --- a/TBF/UI/ResultsMI/PreviousResultsDlg.cs +++ b/TBF/UI/ResultsMI/PreviousResultsDlg.cs @@ -260,20 +260,6 @@ namespace TBF.UI.ResultsMI Redraw(); } } -#elif MUNICH - string docVersion = string.Empty; - foreach (var cmp in TBF.BenchControl.StateMachine.Components) - { - if (cmp.ClassName == "Output.Printers.Munich") - { - docVersion = (cmp as TBF.BenchControl.Output.Printers.Munich.Printer).Version; - break; - } - } - foreach (var wm in b.WaterMeters) - { - new Results.Output.Printers.Munich.MunichPrintDocument(docVersion, wm, Config.Entities.PageOrientation.Portrait).Print(); - } #endif } }