diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs index 085db937a..00165f2bd 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs @@ -102,7 +102,7 @@ namespace TBF.BenchControl.ResultsPrinters.Munich PrintAt(e, Tab1, lineNr * SpacingOne, prn.Version); lineNr++; PrintAt(e, Tab1, lineNr * SpacingOne, "Prüfstand Nr :"); - PrintAt(e, Tab2, lineNr * SpacingOne, prn.BenchId.TestBenchNr.ToString()); + PrintAt(e, Tab2, lineNr * SpacingOne, (prn.BenchId != null) ? prn.BenchId.TestBenchNr.ToString() : ""); PrintAt(e, Tab3, lineNr * SpacingOne, "Datum :"); PrintAt(e, Tab4, lineNr * SpacingOne, DateTime.Now.Date.ToString("d")); lineNr++; diff --git a/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs b/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs index 58fd852d1..b33bef570 100644 --- a/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs +++ b/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs @@ -19,7 +19,6 @@ namespace TBF.BenchControl.ResultsWriters.Basic /// IList results; DateTime now; - Stream stream; StreamWriter writer; public Writer(WriterCfg cfg) @@ -36,12 +35,20 @@ namespace TBF.BenchControl.ResultsWriters.Basic public IOperation WriteResultsOp(IList results) { this.results = results; - this.now = DateTime.Now; - this.stream = System.IO.File.Create(string.Format("{0}Results\\{1}-{2}-{3}\\{4}-{5}.txt", - Program.HomeDir, - now.Year, now.Month, now.Date, - now.Hour, now.Minute)); - this.writer = new StreamWriter(stream); + now = DateTime.Now; + try + { + string dayDirectory = string.Format("{0}Results\\{1}-{2}-{3}", Program.HomeDir, + now.Year, now.Month.ToString("D2"), now.Day.ToString("D2")); + string fileName = string.Format("{0}\\{1}-{2}.txt", dayDirectory, + now.Hour.ToString("D2"), now.Minute.ToString("D2")); + Directory.CreateDirectory(dayDirectory); + writer = new StreamWriter(System.IO.File.Create(fileName)); + } + catch + { + writer = null; + } return this; } @@ -49,16 +56,22 @@ namespace TBF.BenchControl.ResultsWriters.Basic /// Start this operation public void Start() { + if (writer == null) return; + writer.WriteLine("Staatlich anerkante Prüfstelle für Meßgeräte für Wasser WB2"); writer.WriteLine(""); writer.WriteLine(string.Format(" PROTOKOLL Nummer {0}", 0)); writer.WriteLine(""); writer.WriteLine("Ver. 3/13"); - writer.WriteLine(string.Format("Datum / Zeit : {0}.{1}.{2} / {3}:{4} Seite : 1/ 1 / 1", - now.Date, now.Month, now.Year, now.Hour, now.Minute)); + writer.WriteLine(string.Format("Datum / Zeit : {0}.{1}.{2} {3}:{4} Seite : 1/1", + now.Day.ToString("D2"), + now.Month.ToString("D2"), + now.Year.ToString("D4"), + now.Hour.ToString("D2"), + now.Minute.ToString("D2"))); writer.WriteLine("Wasserzähler Type : 110338"); writer.WriteLine("Gerät Nr. : 1"); - writer.WriteLine("Benutzer : Bauer"); + writer.WriteLine(string.Format("Benutzer : {0}", Entities.User.CurrentUser.Name)); writer.WriteLine("Impulsrate : 1 67.422 1"); writer.WriteLine("Bereich : 22,9 °C 947 mbar 43 %"); writer.WriteLine(""); @@ -70,35 +83,35 @@ namespace TBF.BenchControl.ResultsWriters.Basic { if (tr.MetersKind == Entities.MetersKind.Single) { - writer.WriteLine(string.Format("{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11}"), - tr.Name, - tr.Method, - tr.Meters[0].VolumeErrorPct, - tr.FlowMass, - tr.Time, - tr.TempInAvrg, - tr.TempDivAvrg, - tr.DensityOut, - tr.MassDiff, - tr.PressInAvrg, - tr.PressOutAvrg, - tr.VolumeCTV); + writer.WriteLine(string.Format("{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11}", + tr.Name, + tr.Method, + tr.Meters[0].VolumeErrorPct, + tr.FlowMass, + tr.Time, + tr.TempInAvrg, + tr.TempDivAvrg, + tr.DensityOut, + tr.MassDiff, + tr.PressInAvrg, + tr.PressOutAvrg, + tr.VolumeCTV)); } else if (tr.MetersKind == Entities.MetersKind.Combined) { - writer.WriteLine(string.Format("{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11}"), - tr.Name, - tr.Method, - tr.CombinedMeters[0].VolumeErrorPct, - tr.FlowMass, - tr.Time, - tr.TempInAvrg, - tr.TempDivAvrg, - tr.DensityOut, - tr.MassDiff, - tr.PressInAvrg, - tr.PressOutAvrg, - tr.VolumeCTV); + writer.WriteLine(string.Format("{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11}", + tr.Name, + tr.Method, + tr.CombinedMeters[0].VolumeErrorPct, + tr.FlowMass, + tr.Time, + tr.TempInAvrg, + tr.TempDivAvrg, + tr.DensityOut, + tr.MassDiff, + tr.PressInAvrg, + tr.PressOutAvrg, + tr.VolumeCTV)); } } @@ -113,14 +126,15 @@ namespace TBF.BenchControl.ResultsWriters.Basic /// Event.ResultsWritten public Event Run() { - return Event.ResultsWritten; } /// Stop this operation public void Stop() { - writer.WriteLine("---------------------------------------------------------------------------------------------------------------------------------------"); + if (writer == null) return; + + writer.WriteLine("---------------------------------------------------------------------------------------------------------------------------------------"); writer.WriteLine(""); writer.WriteLine("Hersteller : Bemerkung : M - Prüfung gegen Waage"); writer.WriteLine(" V - Prüfung gegen MID"); @@ -132,9 +146,7 @@ namespace TBF.BenchControl.ResultsWriters.Basic writer.WriteLine("---------------------------------------------------------------------------------------------------------------------------------------"); if (writer != null) writer.Close(); - if (stream != null) stream.Close(); writer = null; - stream = null; } } } diff --git a/TestBenchFramework/ProcedureDlg.Designer.cs b/TestBenchFramework/ProcedureDlg.Designer.cs index 505f2ccc6..03db46383 100644 --- a/TestBenchFramework/ProcedureDlg.Designer.cs +++ b/TestBenchFramework/ProcedureDlg.Designer.cs @@ -90,26 +90,29 @@ // // mainSplitContainer.Panel1 // + resources.ApplyResources(this.mainSplitContainer.Panel1, "mainSplitContainer.Panel1"); this.mainSplitContainer.Panel1.Controls.Add(this.tabControl); // // mainSplitContainer.Panel2 // + resources.ApplyResources(this.mainSplitContainer.Panel2, "mainSplitContainer.Panel2"); this.mainSplitContainer.Panel2.Controls.Add(this.sharedButtons); // // tabControl // + resources.ApplyResources(this.tabControl, "tabControl"); this.tabControl.Controls.Add(this.generalTabPage); this.tabControl.Controls.Add(this.historyTabPage); this.tabControl.Controls.Add(this.metrology1TabPage); this.tabControl.Controls.Add(this.metrology2TabPage); this.tabControl.Controls.Add(this.processTabPage); - resources.ApplyResources(this.tabControl, "tabControl"); this.tabControl.Name = "tabControl"; this.tabControl.SelectedIndex = 0; this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged); // // generalTabPage // + resources.ApplyResources(this.generalTabPage, "generalTabPage"); this.generalTabPage.Controls.Add(this.transitionEndComboBox); this.generalTabPage.Controls.Add(this.transitionEndLabel); this.generalTabPage.Controls.Add(this.transitionStartComboBox); @@ -137,15 +140,14 @@ this.generalTabPage.Controls.Add(this.procNameTextBox); this.generalTabPage.Controls.Add(this.label1); this.generalTabPage.ImageKey = global::TBF.Resources.Strings.String1; - resources.ApplyResources(this.generalTabPage, "generalTabPage"); this.generalTabPage.Name = "generalTabPage"; this.generalTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.generalTabPage.UseVisualStyleBackColor = true; // // transitionEndComboBox // - this.transitionEndComboBox.FormattingEnabled = true; resources.ApplyResources(this.transitionEndComboBox, "transitionEndComboBox"); + this.transitionEndComboBox.FormattingEnabled = true; this.transitionEndComboBox.Name = "transitionEndComboBox"; // // transitionEndLabel @@ -156,8 +158,8 @@ // // transitionStartComboBox // - this.transitionStartComboBox.FormattingEnabled = true; resources.ApplyResources(this.transitionStartComboBox, "transitionStartComboBox"); + this.transitionStartComboBox.FormattingEnabled = true; this.transitionStartComboBox.Name = "transitionStartComboBox"; // // transitionStartLabel @@ -168,20 +170,20 @@ // // resultsWriterComboBox // - this.resultsWriterComboBox.FormattingEnabled = true; resources.ApplyResources(this.resultsWriterComboBox, "resultsWriterComboBox"); + this.resultsWriterComboBox.FormattingEnabled = true; this.resultsWriterComboBox.Name = "resultsWriterComboBox"; // // resultsPrinterComboBox // - this.resultsPrinterComboBox.FormattingEnabled = true; resources.ApplyResources(this.resultsPrinterComboBox, "resultsPrinterComboBox"); + this.resultsPrinterComboBox.FormattingEnabled = true; this.resultsPrinterComboBox.Name = "resultsPrinterComboBox"; // // dataEntryComboBox // - this.dataEntryComboBox.FormattingEnabled = true; resources.ApplyResources(this.dataEntryComboBox, "dataEntryComboBox"); + this.dataEntryComboBox.FormattingEnabled = true; this.dataEntryComboBox.Name = "dataEntryComboBox"; // // resultsWriterLabel @@ -292,21 +294,21 @@ // // historyTabPage // + resources.ApplyResources(this.historyTabPage, "historyTabPage"); this.historyTabPage.Controls.Add(this.historyListViewEx); this.historyTabPage.ImageKey = global::TBF.Resources.Strings.String1; - resources.ApplyResources(this.historyTabPage, "historyTabPage"); this.historyTabPage.Name = "historyTabPage"; this.historyTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.historyTabPage.UseVisualStyleBackColor = true; // // historyListViewEx // + resources.ApplyResources(this.historyListViewEx, "historyListViewEx"); this.historyListViewEx.AllowColumnReorder = true; this.historyListViewEx.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.changedByClmnHdr, this.dateClmnHdr, this.descriptionClmnHdr}); - resources.ApplyResources(this.historyListViewEx, "historyListViewEx"); this.historyListViewEx.DoubleClickActivation = false; this.historyListViewEx.FullRowSelect = true; this.historyListViewEx.GridLines = true; @@ -328,17 +330,17 @@ // // metrology1TabPage // + resources.ApplyResources(this.metrology1TabPage, "metrology1TabPage"); this.metrology1TabPage.Controls.Add(this.metrology1ListViewEx); this.metrology1TabPage.ImageKey = global::TBF.Resources.Strings.String1; - resources.ApplyResources(this.metrology1TabPage, "metrology1TabPage"); this.metrology1TabPage.Name = "metrology1TabPage"; this.metrology1TabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.metrology1TabPage.UseVisualStyleBackColor = true; // // metrology1ListViewEx // - this.metrology1ListViewEx.AllowColumnReorder = true; resources.ApplyResources(this.metrology1ListViewEx, "metrology1ListViewEx"); + this.metrology1ListViewEx.AllowColumnReorder = true; this.metrology1ListViewEx.DoubleClickActivation = false; this.metrology1ListViewEx.FullRowSelect = true; this.metrology1ListViewEx.GridLines = true; @@ -349,17 +351,17 @@ // // metrology2TabPage // + resources.ApplyResources(this.metrology2TabPage, "metrology2TabPage"); this.metrology2TabPage.Controls.Add(this.metrology2ListViewEx); this.metrology2TabPage.ImageKey = global::TBF.Resources.Strings.String1; - resources.ApplyResources(this.metrology2TabPage, "metrology2TabPage"); this.metrology2TabPage.Name = "metrology2TabPage"; this.metrology2TabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.metrology2TabPage.UseVisualStyleBackColor = true; // // metrology2ListViewEx // - this.metrology2ListViewEx.AllowColumnReorder = true; resources.ApplyResources(this.metrology2ListViewEx, "metrology2ListViewEx"); + this.metrology2ListViewEx.AllowColumnReorder = true; this.metrology2ListViewEx.DoubleClickActivation = false; this.metrology2ListViewEx.FullRowSelect = true; this.metrology2ListViewEx.GridLines = true; @@ -370,17 +372,17 @@ // // processTabPage // + resources.ApplyResources(this.processTabPage, "processTabPage"); this.processTabPage.Controls.Add(this.processListViewEx); this.processTabPage.ImageKey = global::TBF.Resources.Strings.String1; - resources.ApplyResources(this.processTabPage, "processTabPage"); this.processTabPage.Name = "processTabPage"; this.processTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.processTabPage.UseVisualStyleBackColor = true; // // processListViewEx // - this.processListViewEx.AllowColumnReorder = true; resources.ApplyResources(this.processListViewEx, "processListViewEx"); + this.processListViewEx.AllowColumnReorder = true; this.processListViewEx.DoubleClickActivation = false; this.processListViewEx.FullRowSelect = true; this.processListViewEx.GridLines = true; diff --git a/TestBenchFramework/ProcedureDlg.cs b/TestBenchFramework/ProcedureDlg.cs index b3a8df3f3..e08401b5d 100644 --- a/TestBenchFramework/ProcedureDlg.cs +++ b/TestBenchFramework/ProcedureDlg.cs @@ -90,7 +90,10 @@ namespace TBF Valves = BenchControl.GenericDevices.ValveBase.MasterValves(TbfComponents); RegulValves = new List(); TestMethods = new List(); - foreach (var cmpnt in TbfComponents) + dataEntryComboBox.Items.Add("---"); + resultsPrinterComboBox.Items.Add("---"); + resultsWriterComboBox.Items.Add("---"); + foreach (var cmpnt in TbfComponents) { if (cmpnt is IRegulValve) RegulValves.Add(cmpnt as IRegulValve); if (cmpnt is ITestMethod) TestMethods.Add(cmpnt as ITestMethod); @@ -272,9 +275,9 @@ namespace TBF lastChangedOnTextBox.Text = LoadedProcedure.LastChgTime.ToShortDateString(); } notesTextBox.Text = LoadedProcedure.LongDescription; - dataEntryComboBox.Text = LoadedProcedure.DataEntry; - resultsPrinterComboBox.Text = LoadedProcedure.ResultsPrinter; - resultsWriterComboBox.Text = LoadedProcedure.ResultsWriter; + dataEntryComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.DataEntry) ? "---" : LoadedProcedure.DataEntry; + resultsPrinterComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.ResultsPrinter) ? "---" : LoadedProcedure.ResultsPrinter; + resultsWriterComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.ResultsWriter) ? "---" : LoadedProcedure.ResultsWriter; transitionStartComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.TransitionStart) ? "---" : LoadedProcedure.TransitionStart; transitionEndComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.TransitionEnd) ? "---" : LoadedProcedure.TransitionEnd; } @@ -290,9 +293,18 @@ namespace TBF LoadedProcedure.LongDescription = notesTextBox.Text; LoadedProcedure.Watermeters = watermetersTextBox.Text; float ppl; - if (dataEntryComboBox.Items.Contains(dataEntryComboBox.Text)) { LoadedProcedure.DataEntry = dataEntryComboBox.Text; } - if (resultsPrinterComboBox.Items.Contains(resultsPrinterComboBox.Text)) { LoadedProcedure.ResultsPrinter = resultsPrinterComboBox.Text; } - if (resultsWriterComboBox.Items.Contains(resultsWriterComboBox.Text)) { LoadedProcedure.ResultsWriter = resultsWriterComboBox.Text; } + if (dataEntryComboBox.Items.Contains(dataEntryComboBox.Text)) + { + LoadedProcedure.DataEntry = dataEntryComboBox.Text.Equals("---") ? string.Empty : dataEntryComboBox.Text; + } + if (resultsPrinterComboBox.Items.Contains(resultsPrinterComboBox.Text)) + { + LoadedProcedure.ResultsPrinter = resultsPrinterComboBox.Text.Equals("---") ? string.Empty : resultsPrinterComboBox.Text; + } + if (resultsWriterComboBox.Items.Contains(resultsWriterComboBox.Text)) + { + LoadedProcedure.ResultsWriter = resultsWriterComboBox.Text.Equals("---") ? string.Empty : resultsWriterComboBox.Text; + } if (transitionStartComboBox.Items.Contains(transitionStartComboBox.Text)) { LoadedProcedure.TransitionStart = transitionStartComboBox.Text.Equals("---") ? string.Empty : transitionStartComboBox.Text; diff --git a/TestBenchFramework/ProcedureDlg.de.resx b/TestBenchFramework/ProcedureDlg.de.resx index e5fdb4910..65e47f2fc 100644 --- a/TestBenchFramework/ProcedureDlg.de.resx +++ b/TestBenchFramework/ProcedureDlg.de.resx @@ -118,56 +118,74 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 931, 409 - - - 1034, 409 - - - 923, 371 - - - Allgemein - - 139, 325 + 148, 325 24, 330 + + 62, 13 + + + Entwässern + - 139, 295 + 148, 295 24, 300 + + 45, 13 + + + Befüllen + - 139, 264 + 148, 264 - 139, 233 + 148, 233 - 139, 203 + 148, 203 24, 267 + + 122, 13 + + + Speichern auf Festplatte + 24, 236 + + 45, 13 + + + Drucker + 24, 206 + + 112, 13 + + + Zählernummereingabe + - 348, 205 + 357, 205 317, 141 - 281, 208 + 290, 208 61, 13 @@ -176,7 +194,7 @@ Bemerkung - 139, 162 + 148, 162 526, 20 @@ -184,8 +202,17 @@ 24, 165 + + 59, 13 + + + Information + - 348, 120 + 357, 120 + + + 300, 123 38, 13 @@ -194,7 +221,7 @@ Datum - 140, 121 + 149, 121 102, 13 @@ -203,7 +230,10 @@ letzte Änderung von - 348, 87 + 357, 87 + + + 300, 90 38, 13 @@ -211,12 +241,18 @@ Datum + + 148, 87 + 62, 13 Errstellt von + + 148, 53 + 526, 20 @@ -226,20 +262,20 @@ Kurzbeschreibung + + 148, 21 + 75, 13 Prüfungsname - - 923, 406 + + 923, 371 - - Änderungen - - - 917, 400 + + Allgemein Benutzername @@ -250,57 +286,47 @@ Kurzbeschreibung + + 917, 365 + + + 923, 371 + + + Änderungen + + + 917, 365 + - 923, 406 + 923, 371 Metrologie I. - - 917, 400 + + 917, 365 - 923, 406 + 923, 371 Metrologie II. - - 917, 400 + + 917, 365 - 923, 406 + 923, 371 Prozess - - 917, 400 + + 931, 409 - - - 3, 3, 3, 3 - - - 923, 406 - - - Spülung - Start - - - 3, 3 - - - 917, 400 - - - 923, 406 - - - Spülung - Ende - - - 923, 406 + + 1034, 409 1034, 409 diff --git a/TestBenchFramework/ProcedureDlg.resx b/TestBenchFramework/ProcedureDlg.resx index c52523c49..867883114 100644 --- a/TestBenchFramework/ProcedureDlg.resx +++ b/TestBenchFramework/ProcedureDlg.resx @@ -118,1059 +118,1062 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fill + + NoControl - - - True + + Metrology I. - - 0, 0 + + 121, 20 - - 139, 313 + + 344, 191 - - 121, 21 + + 24, 90 - - 29 - - - transitionEndComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - + + 0 - - True + + tabControl - - NoControl + + 0 - - 24, 318 + + 10 - - 63, 13 + + $this - - 28 - - - Purge - End - - - transitionEndLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + generalTabPage - + + 139, 87 + + + label15 + + + 923, 352 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 22 + + 1 - - 139, 283 - - - 121, 21 - - - 27 - - - transitionStartComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 2 - - - True - - - NoControl - - - 24, 288 - - - 71, 13 - - - 26 - - - Purge - Begin - - - transitionStartLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 3 - - - 139, 253 - - - 121, 21 - - - 25 - - - resultsWriterComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 4 - - - 139, 222 - - - 121, 21 - - - 24 - - - resultsPrinterComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - generalTabPage + + Results printer + + + generalTabPage + + + 0 + + + metrology2TabPage + + + 24, 159 + + + True + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + lastChangedByTextBox + + + 0 + + + 931, 390 + 5 - - 139, 191 + + 1 - - 121, 21 + + 9 - - 23 + + metrology2ListViewEx - - dataEntryComboBox + + 344, 87 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 86, 13 - + + 923, 352 + + + 18 + + + 16 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 344, 120 + + + 24 + + + processTabPage + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + procNameTextBox + + + History of Changes + + + 86, 13 + + + 139, 253 + + + resultsPrinterLabel + + + 139, 53 + + + 317, 143 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + descriptionClmnHdr + + + historyTabPage + + + Fill + + + 80 + + + Procedure + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3 + + + 2 + + generalTabPage - - 6 - - - True - - + NoControl 24, 258 - - 70, 13 + + 139, 283 - - 22 - - - Results writer - - - resultsWriterLabel - - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + dateClmnHdr + + + 1 + + + lastChangedOnTextBox + + + True + + + NoControl + + + 9 + + + 139, 21 + + generalTabPage - - 7 + + -1, 0 - + True + + generalTabPage + + + 3, 3, 3, 3 + + + Date + + + Changed by + + + 57, 13 + + + 6, 13 + + + mainSplitContainer + + + 10 + + + Meter types tested + + + transitionEndLabel + + + 4, 34 + + + 3 + + + 0, 0 + + + transitionStartComboBox + + + 30, 13 + + + TBF.UiControls.ListViewEx, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + Fill + + + transitionStartLabel + + + 14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 522, 20 + + + 94, 13 + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + generalTabPage + + + 923, 352 + + + historyListViewEx + + + tabControl + + + 12 + + + notesTextBox + + + metrology1TabPage + + + True + + + 139, 313 + + + generalTabPage + + + createdOnTextBox + + + metrology1ListViewEx + + + 17 + + + label12 + + + watermetersTextBox + + + 24, 56 + + + 19 + + + 923, 352 + + + generalTabPage + + + 28 + + + 0 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + generalTabPage + + + metrology1TabPage + + + 85, 13 + + + 11 + NoControl - - 24, 227 + + 4 - - 74, 13 + + label13 - - 21 - - - Results printer - - - resultsPrinterLabel - - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + 15 + + + 24, 288 + + + generalTabPage + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 24 + + + 291, 90 + + + 931 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + label18 + + + 12 + + + 23 + + + label1 + + + generalTabPage + + + True + + + generalTabPage + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 25, 194 + + + CenterParent + + + 1 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + Procedure name + + + 3 + + + Fill + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 100, 400 + + + resultsWriterLabel + + + NoControl + + + 13 + + + 0, 0 + + + NoControl + + + 139, 120 + + + Description + + + mainSplitContainer + + + Fill + + + 13 + + + 5 + + + resultsPrinterComboBox + + + 97, 20 + + + 24, 123 + + + 0 + + + True + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + processTabPage + + + 139, 191 + + + 917, 346 + + + 26 + + + generalTabPage + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 58, 13 + + + 14 + + + 522, 20 + + + NoControl + + + NoControl + + + historyTabPage + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + transitionEndComboBox + + + 29 + + + 121, 21 + + + 71, 13 + + + 7 + + generalTabPage 8 - - True - - - NoControl - - - 25, 194 - - - 57, 13 - - - 20 - - - Data Entry - - - dataEntryLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 9 - - - 344, 191 - - - True - - - 317, 143 - - - 17 - - - notesTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 10 - - - True - - - NoControl - - - 291, 194 - - - 35, 13 - - - 16 - - - Notes - - - label18 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 11 - - - 139, 156 - - - 522, 20 - - - 15 - - - watermetersTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 12 - - - True - - - NoControl - - - 24, 159 - - - 94, 13 - - - 14 - - - Meter types tested - - - watermetersLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 13 - - - 344, 120 - - - 97, 20 - - - 13 - - - lastChangedOnTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 14 - - - True + + 30, 13 NoControl - - 291, 123 - - - 30, 13 - - - 12 - - - Date - - - label15 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 15 - - - 139, 120 - - - 121, 20 - - - 11 - - - lastChangedByTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 16 - - - True - - - NoControl - - - 24, 123 - - - 86, 13 - - - 10 - - - Last changed by - - - label16 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 17 - - - 344, 87 - - - 97, 20 - - - 9 - - - createdOnTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 18 - - - True - - - NoControl - - - 291, 90 - - - 30, 13 - - - 8 - - - Date - - - label14 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 19 - - - 139, 87 - - - 121, 20 - - - 7 - - - createdByTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 20 - - - True - - - NoControl - - - 24, 90 - - - 58, 13 - - - 6 - - - Created by - - - label13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 21 - - - 139, 53 - - - 522, 20 - - - 5 - - - descriptionTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + generalTabPage 22 - - True + + Process - - NoControl - - - 24, 56 - - - 86, 13 - - - 4 - - - Short description - - - label12 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 23 - - - 139, 21 - - - 217, 20 - - - 3 - - - procNameTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 24 - - - True - - - NoControl - - - 24, 24 - - - 85, 13 - - - 2 - - - Procedure name - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 25 - - - 4, 34 - - + 3, 3, 3, 3 - - 923, 352 + + watermetersLabel - - 0 - - - General - - + generalTabPage - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 0 - - - Changed by - - - 80 - - - Date - - - Description - - - 400 - - - Fill - - - 3, 3 - - + 917, 346 - - 0 - - - historyListViewEx - - - TBF.UiControls.ListViewEx, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - historyTabPage - - - 0 - 4, 34 - - 3, 3, 3, 3 - - - 923, 352 - - - 1 - - - History of Changes - - - historyTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tabControl - - 1 + + 27 - - Fill + + Purge - Begin + + + 8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 20 + + + resultsWriterComboBox + + + 17 + + + True + + + mainSplitContainer.Panel2 + + + 15 + + + 16 + + + mainSplitContainer.Panel1 3, 3 + + 6 + + + generalTabPage + + + 917, 346 + + + 6 + + + mainSplitContainer.Panel2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 24, 24 + + + 217, 20 + + + tabControl + + + 63, 13 + 917, 346 - + + 3 + + + generalTabPage + + 0 - - metrology1ListViewEx + + True - - TBF.UiControls.ListViewEx, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 121, 21 - - metrology1TabPage + + ProcedureDlg - + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Purge - End + + + tabControl + + + generalTabPage + + + generalTabPage + + + sharedButtons + + + Metrology II. + + + 139, 156 + + + 20 + + + True + + + 3, 3 + + + True + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dataEntryComboBox + + + Notes + + + 97, 20 + + + 74, 13 + + + 139, 222 + + + 23 + + + 0 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 25 + + + generalTabPage + + + Created by + + + createdByTextBox + + + True + + + 21 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 4, 34 - - 3, 3, 3, 3 - - - 923, 352 - - - 2 - - - Metrology I. - - - metrology1TabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 2 - - - Fill - - - 3, 3 - - - 917, 346 - - + 0 - - metrology2ListViewEx - - - TBF.UiControls.ListViewEx, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - metrology2TabPage - - - 0 - - - 4, 34 - - - 3, 3, 3, 3 - - - 923, 352 - - - 3 - - - Metrology II. - - - metrology2TabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 3 - - - Fill - - - 3, 3 - - - 917, 346 - - - 0 - - - processListViewEx - - - TBF.UiControls.ListViewEx, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - processTabPage - - - 0 - - - 4, 34 - - - 3, 3, 3, 3 - - - 923, 352 - - - 4 - - - Process - - - processTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 4 - - - Fill - - - 58, 30 - - - 0, 0 - - - 931, 390 - - - 1 - - - tabControl - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainSplitContainer.Panel1 - - - 0 - - - mainSplitContainer.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainSplitContainer - - - 0 - - - -1, 0 - - - 100, 400 - - - 0 - - - sharedButtons - - - TBF.UiControls.SharedButtons, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - mainSplitContainer.Panel2 - - - 0 - - - mainSplitContainer.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainSplitContainer - - - 1 - - - 1034, 390 - - - 931 - - - 1 - - - mainSplitContainer - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - True - - - 6, 13 - - - 1034, 390 - - - CenterParent - - - Procedure - - - changedByClmnHdr - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - dateClmnHdr + + 21 - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3, 3 - - descriptionClmnHdr + + TBF.UiControls.ListViewEx, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4 - - ProcedureDlg + + mainSplitContainer.Panel1 - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 291, 194 + + + 11 + + + 24, 227 + + + 1 + + + Data Entry + + + 3, 3, 3, 3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 121, 21 + + + Date + + + Results writer + + + changedByClmnHdr + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3, 3 + + + generalTabPage + + + 4 + + + generalTabPage + + + 25 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 2 + + + 0 + + + 0 + + + 24, 318 + + + metrology2TabPage + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 400 + + + Fill + + + 1034, 390 + + + 0 + + + 2 + + + tabControl + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3, 3, 3, 3 + + + TBF.UiControls.ListViewEx, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + 3, 3, 3, 3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + processListViewEx + + + 1 + + + 4 + + + 1034, 390 + + + mainSplitContainer + + + 121, 20 + + + True + + + 291, 123 + + + 4, 34 + + + 0 + + + descriptionTextBox + + + 2 + + + generalTabPage + + + 70, 13 + + + label16 + + + Last changed by + + + dataEntryLabel + + + NoControl + + + 4, 34 + + + True + + + 923, 352 + + + General + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 58, 30 + + + Short description + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + Date + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + TBF.UiControls.ListViewEx, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + 7 + + + True + + + 121, 21 + + + 35, 13 + + + TBF.UiControls.SharedButtons, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + True + + + NoControl + + + 121, 21 + + + 0 + + + label14 + + + True + + + de + \ No newline at end of file