diff --git a/Results/ItemID.cs b/Results/ItemID.cs index ea48dd36d..7e0eae3a5 100644 --- a/Results/ItemID.cs +++ b/Results/ItemID.cs @@ -243,7 +243,13 @@ namespace Results Timestamp_end, /// 211 P_PMax_test_mean, /// 212 PMax test pressure mean of (Pup + Pdown)/2 - Medium, /// 213 Woda zimna/tepla + Medium, /// 213 Woda zimna/ciepla + + Flow_ctv, /// 214 + Flow_ctv_min, /// 215 + Flow_ctv_max, /// 216 + Flow_ctv_start, /// 217 + Flow_ctv_end, /// 218 Count, } diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 9ecc1c0d2..2d06f77e5 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.18.883.0")] -[assembly: AssemblyFileVersion("2.18.883.0")] +[assembly: AssemblyVersion("2.18.887.0")] +[assembly: AssemblyFileVersion("2.18.887.0")] diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs index a91c5555a..1e5235a85 100644 --- a/Results/WMeterRsltItemSpec.cs +++ b/Results/WMeterRsltItemSpec.cs @@ -176,7 +176,7 @@ namespace Results AllItems.Add(new WMeterRsltItemSpec(ItemID.Density, Strings.Density + " ()", Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).DensityLine))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Density_correction, Strings.Density_correction + " ()", Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", (w.Batch.DensityCorr)))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Rho_Wa_calc, string.Format("{0} of sample", Strings.Density), Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", RealDensity))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.RhoDistilledWtrAtMeLineTemp, string.Format("{0} of distilled water at T line", Strings.Density), Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", (w.GetTestRslt(t) == null) ? 0 : Config.Formulas.DistilledWaterDensityFromTemp(w.GetTestRslt(t).AmbTempMean)))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.RhoDistilledWtrAtMeLineTemp, string.Format("{0} of distilled water at T line", Strings.Density), Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", (w.GetTestRslt(t) == null) ? 0 : Config.Formulas.DistilledWaterDensityFromTemp((w.GetTestRslt(t).TempUpMean + w.GetTestRslt(t).TempDownMean) / 2)))); /// /// Date and time @@ -200,20 +200,25 @@ namespace Results /// /// Flow /// - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_from, string.Format("{0} {1}", Strings.VName_Flow, Strings.from), Quantity.Flow, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).Qfrom()))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_to, string.Format("{0} {1}", Strings.VName_Flow, Strings.to), Quantity.Flow, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).Qto()))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow, string.Format("{0} v r", Strings.VName_Flow), Strings.Tooltip_Q_v_r, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowVolume))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Qc, string.Format("Qc"), "Calculated water meter flow", Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).VolumeCTV / w.GetMeterTestRslt(t).TestTime * 3.6 * w.GetMeterTestRslt(t).PulsesMaster / w.GetTestRslt(t).PulsesMaster))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_mean, string.Format("{0} rim ()", Strings.VName_Flow), Strings.Tooltip_Q_rim, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMean))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_min, string.Format("{0} ref min ()", Strings.VName_Flow), Strings.Tooltip_Q_min, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMin))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_max, string.Format("{0} ref max ()", Strings.VName_Flow), Strings.Tooltip_Q_max, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMax))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_start, string.Format("{0} ref start ()", Strings.VName_Flow), Strings.Tooltip_Q_start, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowStart))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_end, string.Format("{0} ref end ()", Strings.VName_Flow), Strings.Tooltip_Q_end, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowEnd))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_rise, string.Format("{0} {1}", Strings.VName_Flow, Strings.rise), Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QRise)) : "")); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_fall, string.Format("{0} {1}", Strings.VName_Flow, Strings.fall), Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QFall == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QFall)) : "")); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_sensitivity, string.Format("{0} {1}", Strings.VName_Flow, Strings.sensitivity), Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QRise)) : "")); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_from, string.Format("{0} {1}", Strings.VName_Flow, Strings.from), Quantity.Flow, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).Qfrom()))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_to, string.Format("{0} {1}", Strings.VName_Flow, Strings.to), Quantity.Flow, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).Qto()))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow, string.Format("{0} v r", Strings.VName_Flow), Strings.Tooltip_Q_v_r, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowVolume))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Qc, string.Format("Qc"), "Calculated water meter flow", Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).VolumeCTV / w.GetMeterTestRslt(t).TestTime * 3.6 * w.GetMeterTestRslt(t).PulsesMaster / w.GetTestRslt(t).PulsesMaster))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_mean, string.Format("{0} rim ()", Strings.VName_Flow), Strings.Tooltip_Q_rim, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMean))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_min, string.Format("{0} ref min ()", Strings.VName_Flow), Strings.Tooltip_Q_min, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMin))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_max, string.Format("{0} ref max ()", Strings.VName_Flow), Strings.Tooltip_Q_max, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMax))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_start, string.Format("{0} ref start ()",Strings.VName_Flow),Strings.Tooltip_Q_start, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowStart))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_end, string.Format("{0} ref end ()", Strings.VName_Flow), Strings.Tooltip_Q_end, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowEnd))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv, string.Format("{0} ctv min ()", Strings.VName_Flow), "Mean CTV of the flow", Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TestTime == 0) ? 0 : w.GetTestRslt(t).VolumeCTV / w.GetTestRslt(t).TestTime))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_min, string.Format("{0} ctv min ()", Strings.VName_Flow), "Min. CTV of the flow", Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowMin / w.GetTestRslt(t).VolumeMaster))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_max, string.Format("{0} ctv max ()", Strings.VName_Flow), "Max. CTV of the flow", Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowMax / w.GetTestRslt(t).VolumeMaster))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_start, string.Format("{0} ctv start ()", Strings.VName_Flow), "Start flow CTV", Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowStart / w.GetTestRslt(t).VolumeMaster))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_end, string.Format("{0} ctv end ()", Strings.VName_Flow), "End flow CTV", Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowEnd / w.GetTestRslt(t).VolumeMaster))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_rise, string.Format("{0} {1}", Strings.VName_Flow, Strings.rise), Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QRise)) : "")); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_fall, string.Format("{0} {1}", Strings.VName_Flow, Strings.fall), Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QFall == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QFall)) : "")); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_sensitivity, string.Format("{0} {1}", Strings.VName_Flow, Strings.sensitivity), Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QRise)) : "")); - AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMaster, string.Format("k MID ()"), "Const. of the reference flow meter", Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", ((w.GetTestRslt(t).ConstMaster < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMaster))))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMaster, string.Format("k MID ()"), "Const. of the reference flow meter", Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", ((w.GetTestRslt(t).ConstMaster < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMaster))))); /// /// Temperature @@ -298,7 +303,7 @@ namespace Results AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_limit_Hi, Strings.ErrLimHi + "()", Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).ErrLimHi()))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Uncertainty, Strings.Uncertainty + "()", Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).Uncertainty()))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_error, string.Format("{0} rel.ref. ()", Strings.VName_Error), Strings.Tooltip_E_rel_ref, Quantity.Error, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).ErrorMaster))); -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_SPECIAL AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "0" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).Error))); #else AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).Error))); diff --git a/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfg.cs b/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfg.cs index 687b2df13..bf70ae725 100644 --- a/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfg.cs +++ b/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfg.cs @@ -47,6 +47,26 @@ namespace TBF.BenchControl.Elde.FlowMeter public double Press5Lo; public double Press5Hi; + /// Calibration info serialized parameters displayed in Metrology tab page + public string CalibCertificateNr; + public string CalibCertificate1; + public string CalibCertificate2; + public string CalibCertificate3; + public string CalibCertificate4; + public string CalibCertificate5; + public DateTime CalibDate; + public DateTime CalibDate1; + public DateTime CalibDate2; + public DateTime CalibDate3; + public DateTime CalibDate4; + public DateTime CalibDate5; + public DateTime CalibValidDate; + public DateTime CalibValidDate1; + public DateTime CalibValidDate2; + public DateTime CalibValidDate3; + public DateTime CalibValidDate4; + public DateTime CalibValidDate5; + public bool RangeEnabled(int rangeIx1) { @@ -118,26 +138,6 @@ namespace TBF.BenchControl.Elde.FlowMeter } } - /// Calibration info serialized parameters displayed in Metrology tab page - public string CalibCertificateNr; - public string CalibCertificate1; - public string CalibCertificate2; - public string CalibCertificate3; - public string CalibCertificate4; - public string CalibCertificate5; - public DateTime CalibDate; - public DateTime CalibDate1; - public DateTime CalibDate2; - public DateTime CalibDate3; - public DateTime CalibDate4; - public DateTime CalibDate5; - public DateTime CalibValidDate; - public DateTime CalibValidDate1; - public DateTime CalibValidDate2; - public DateTime CalibValidDate3; - public DateTime CalibValidDate4; - public DateTime CalibValidDate5; - public string GetCalibCertificate(int rangeIx1) { switch (rangeIx1) diff --git a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs index 0ac3734fd..36031f786 100644 --- a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs +++ b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs @@ -9,6 +9,8 @@ using NHibernate.Criterion; using Config; using Config.Entities; using MonitoringDB.Entities; +using TBF.BenchControl.Generic; +using TBF.BenchControl.GenericDevices; namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections { @@ -141,6 +143,26 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections cmpnt.Corrections.Add(mc); session.SaveOrUpdate(mc); } + + ICalibInfoCfg cfg = TbfComponents.CmpntCfgFromCmpntEntity(cmpnt) as ICalibInfoCfg; + if (cfg != null) + { + cfg.SetCalibDate(rangeIx, DateTime.Now); + + if (!string.IsNullOrEmpty(myCfg.CertificateFmt)) + { + cfg.SetCalibCertificate(rangeIx, string.Format(myCfg.CertificateFmt, batch.StartTime, batch.EndTime, batch.BatchNr)); + } + + if (myCfg.ValidityDays > 0) + { + cfg.SetCalibValidDate(rangeIx, DateTime.Now + new TimeSpan(myCfg.ValidityDays, 0, 0, 0)); + } + + Component modified = cfg.CreateDbEntity(); + cmpnt.Parameters = modified.Parameters; + } + session.SaveOrUpdate(cmpnt); } diff --git a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfg.cs b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfg.cs index a6dd48b63..6f24d0b6a 100644 --- a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfg.cs +++ b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfg.cs @@ -63,6 +63,9 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections public bool Flowm7Rng4; public bool Flowm7Rng5; + public string CertificateFmt; + public int ValidityDays; + public int FlowmetersCount() { return 7; } public int RangesCount() { return 5; } diff --git a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs index 0873f31e2..ccfc7657c 100644 --- a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs +++ b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs @@ -133,6 +133,9 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections flowm7Rng4CheckBox.Checked = config.Flowm7Rng4; flowm7Rng5CheckBox.Checked = config.Flowm7Rng5; flowm7Rng0CheckBox.Checked = !(config.Flowm7Rng1 || config.Flowm7Rng2 || config.Flowm7Rng3 || config.Flowm7Rng4 || config.Flowm7Rng5); + + certificateTextBox.Text = config.CertificateFmt; + validityTextBox.Text = config.ValidityDays.ToString(); } public void Unlock() @@ -194,6 +197,9 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections flowm7Rng3CheckBox.Enabled = true; flowm7Rng4CheckBox.Enabled = true; flowm7Rng5CheckBox.Enabled = true; + + certificateTextBox.Enabled = true; + validityTextBox.Enabled = true; } public CfgUpdateFlags VerifyCfg(ref string message) @@ -291,6 +297,13 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections message += Environment.NewLine + string.Format("Invalid ranges for {0}", flowmeter7Label.Text); } + int tmp; + if (!int.TryParse(validityTextBox.Text, out tmp) || tmp < 0) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + string.Format("Invalid {0}", validityLabel.Text); + } + return flags; } @@ -355,6 +368,9 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections flags |= UpdateDifferent(ref config.Flowm7Rng4, flowm7Rng4CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); flags |= UpdateDifferent(ref config.Flowm7Rng5, flowm7Rng5CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.CertificateFmt, certificateTextBox.Text, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.ValidityDays, validityTextBox.Text, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + return flags; } } diff --git a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.designer.cs b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.designer.cs index fde83b355..7225ee2bc 100644 --- a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.designer.cs +++ b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.designer.cs @@ -91,20 +91,25 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections this.flowm7Rng1CheckBox = new System.Windows.Forms.CheckBox(); this.flowmeter7ComboBox = new System.Windows.Forms.ComboBox(); this.flowmeter7Label = new System.Windows.Forms.Label(); + this.certificateTextBox = new System.Windows.Forms.TextBox(); + this.certificateLabel = new System.Windows.Forms.Label(); + this.validityTextBox = new System.Windows.Forms.TextBox(); + this.validityLabel = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.SuspendLayout(); // // nameTextBox // this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(95, 41); + this.nameTextBox.Location = new System.Drawing.Point(95, 31); this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(285, 20); + this.nameTextBox.Size = new System.Drawing.Size(212, 20); this.nameTextBox.TabIndex = 2; // // nameLabel // this.nameLabel.AutoSize = true; - this.nameLabel.Location = new System.Drawing.Point(15, 44); + this.nameLabel.Location = new System.Drawing.Point(15, 34); this.nameLabel.Name = "nameLabel"; this.nameLabel.Size = new System.Drawing.Size(35, 13); this.nameLabel.TabIndex = 1; @@ -113,7 +118,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // classNameLabel // this.classNameLabel.AutoSize = true; - this.classNameLabel.Location = new System.Drawing.Point(107, 19); + this.classNameLabel.Location = new System.Drawing.Point(107, 9); this.classNameLabel.Name = "classNameLabel"; this.classNameLabel.Size = new System.Drawing.Size(83, 13); this.classNameLabel.TabIndex = 0; @@ -122,7 +127,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // flowmeter1Label // this.flowmeter1Label.AutoSize = true; - this.flowmeter1Label.Location = new System.Drawing.Point(15, 96); + this.flowmeter1Label.Location = new System.Drawing.Point(15, 80); this.flowmeter1Label.Name = "flowmeter1Label"; this.flowmeter1Label.Size = new System.Drawing.Size(64, 13); this.flowmeter1Label.TabIndex = 3; @@ -132,7 +137,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowmeter1ComboBox.Enabled = false; this.flowmeter1ComboBox.FormattingEnabled = true; - this.flowmeter1ComboBox.Location = new System.Drawing.Point(95, 93); + this.flowmeter1ComboBox.Location = new System.Drawing.Point(95, 77); this.flowmeter1ComboBox.Name = "flowmeter1ComboBox"; this.flowmeter1ComboBox.Size = new System.Drawing.Size(69, 21); this.flowmeter1ComboBox.TabIndex = 4; @@ -141,7 +146,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm1Rng1CheckBox.AutoSize = true; this.flowm1Rng1CheckBox.Enabled = false; - this.flowm1Rng1CheckBox.Location = new System.Drawing.Point(245, 96); + this.flowm1Rng1CheckBox.Location = new System.Drawing.Point(245, 80); this.flowm1Rng1CheckBox.Name = "flowm1Rng1CheckBox"; this.flowm1Rng1CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm1Rng1CheckBox.TabIndex = 6; @@ -152,7 +157,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm1Rng2CheckBox.AutoSize = true; this.flowm1Rng2CheckBox.Enabled = false; - this.flowm1Rng2CheckBox.Location = new System.Drawing.Point(275, 96); + this.flowm1Rng2CheckBox.Location = new System.Drawing.Point(275, 80); this.flowm1Rng2CheckBox.Name = "flowm1Rng2CheckBox"; this.flowm1Rng2CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm1Rng2CheckBox.TabIndex = 7; @@ -163,7 +168,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm1Rng3CheckBox.AutoSize = true; this.flowm1Rng3CheckBox.Enabled = false; - this.flowm1Rng3CheckBox.Location = new System.Drawing.Point(305, 96); + this.flowm1Rng3CheckBox.Location = new System.Drawing.Point(305, 80); this.flowm1Rng3CheckBox.Name = "flowm1Rng3CheckBox"; this.flowm1Rng3CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm1Rng3CheckBox.TabIndex = 8; @@ -174,7 +179,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm1Rng4CheckBox.AutoSize = true; this.flowm1Rng4CheckBox.Enabled = false; - this.flowm1Rng4CheckBox.Location = new System.Drawing.Point(335, 96); + this.flowm1Rng4CheckBox.Location = new System.Drawing.Point(335, 80); this.flowm1Rng4CheckBox.Name = "flowm1Rng4CheckBox"; this.flowm1Rng4CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm1Rng4CheckBox.TabIndex = 9; @@ -185,7 +190,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm1Rng5CheckBox.AutoSize = true; this.flowm1Rng5CheckBox.Enabled = false; - this.flowm1Rng5CheckBox.Location = new System.Drawing.Point(365, 96); + this.flowm1Rng5CheckBox.Location = new System.Drawing.Point(365, 80); this.flowm1Rng5CheckBox.Name = "flowm1Rng5CheckBox"; this.flowm1Rng5CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm1Rng5CheckBox.TabIndex = 10; @@ -196,7 +201,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm2Rng5CheckBox.AutoSize = true; this.flowm2Rng5CheckBox.Enabled = false; - this.flowm2Rng5CheckBox.Location = new System.Drawing.Point(365, 123); + this.flowm2Rng5CheckBox.Location = new System.Drawing.Point(365, 104); this.flowm2Rng5CheckBox.Name = "flowm2Rng5CheckBox"; this.flowm2Rng5CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm2Rng5CheckBox.TabIndex = 18; @@ -207,7 +212,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm2Rng4CheckBox.AutoSize = true; this.flowm2Rng4CheckBox.Enabled = false; - this.flowm2Rng4CheckBox.Location = new System.Drawing.Point(335, 123); + this.flowm2Rng4CheckBox.Location = new System.Drawing.Point(335, 104); this.flowm2Rng4CheckBox.Name = "flowm2Rng4CheckBox"; this.flowm2Rng4CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm2Rng4CheckBox.TabIndex = 17; @@ -218,7 +223,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm2Rng3CheckBox.AutoSize = true; this.flowm2Rng3CheckBox.Enabled = false; - this.flowm2Rng3CheckBox.Location = new System.Drawing.Point(305, 123); + this.flowm2Rng3CheckBox.Location = new System.Drawing.Point(305, 104); this.flowm2Rng3CheckBox.Name = "flowm2Rng3CheckBox"; this.flowm2Rng3CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm2Rng3CheckBox.TabIndex = 16; @@ -229,7 +234,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm2Rng2CheckBox.AutoSize = true; this.flowm2Rng2CheckBox.Enabled = false; - this.flowm2Rng2CheckBox.Location = new System.Drawing.Point(275, 123); + this.flowm2Rng2CheckBox.Location = new System.Drawing.Point(275, 104); this.flowm2Rng2CheckBox.Name = "flowm2Rng2CheckBox"; this.flowm2Rng2CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm2Rng2CheckBox.TabIndex = 15; @@ -240,7 +245,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm2Rng1CheckBox.AutoSize = true; this.flowm2Rng1CheckBox.Enabled = false; - this.flowm2Rng1CheckBox.Location = new System.Drawing.Point(245, 123); + this.flowm2Rng1CheckBox.Location = new System.Drawing.Point(245, 104); this.flowm2Rng1CheckBox.Name = "flowm2Rng1CheckBox"; this.flowm2Rng1CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm2Rng1CheckBox.TabIndex = 14; @@ -251,7 +256,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowmeter2ComboBox.Enabled = false; this.flowmeter2ComboBox.FormattingEnabled = true; - this.flowmeter2ComboBox.Location = new System.Drawing.Point(95, 120); + this.flowmeter2ComboBox.Location = new System.Drawing.Point(95, 101); this.flowmeter2ComboBox.Name = "flowmeter2ComboBox"; this.flowmeter2ComboBox.Size = new System.Drawing.Size(69, 21); this.flowmeter2ComboBox.TabIndex = 12; @@ -259,7 +264,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // flowmeter2Label // this.flowmeter2Label.AutoSize = true; - this.flowmeter2Label.Location = new System.Drawing.Point(15, 123); + this.flowmeter2Label.Location = new System.Drawing.Point(15, 104); this.flowmeter2Label.Name = "flowmeter2Label"; this.flowmeter2Label.Size = new System.Drawing.Size(64, 13); this.flowmeter2Label.TabIndex = 11; @@ -269,7 +274,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm3Rng5CheckBox.AutoSize = true; this.flowm3Rng5CheckBox.Enabled = false; - this.flowm3Rng5CheckBox.Location = new System.Drawing.Point(365, 150); + this.flowm3Rng5CheckBox.Location = new System.Drawing.Point(365, 128); this.flowm3Rng5CheckBox.Name = "flowm3Rng5CheckBox"; this.flowm3Rng5CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm3Rng5CheckBox.TabIndex = 26; @@ -280,7 +285,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm3Rng4CheckBox.AutoSize = true; this.flowm3Rng4CheckBox.Enabled = false; - this.flowm3Rng4CheckBox.Location = new System.Drawing.Point(335, 150); + this.flowm3Rng4CheckBox.Location = new System.Drawing.Point(335, 128); this.flowm3Rng4CheckBox.Name = "flowm3Rng4CheckBox"; this.flowm3Rng4CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm3Rng4CheckBox.TabIndex = 25; @@ -291,7 +296,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm3Rng3CheckBox.AutoSize = true; this.flowm3Rng3CheckBox.Enabled = false; - this.flowm3Rng3CheckBox.Location = new System.Drawing.Point(305, 150); + this.flowm3Rng3CheckBox.Location = new System.Drawing.Point(305, 128); this.flowm3Rng3CheckBox.Name = "flowm3Rng3CheckBox"; this.flowm3Rng3CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm3Rng3CheckBox.TabIndex = 24; @@ -302,7 +307,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm3Rng2CheckBox.AutoSize = true; this.flowm3Rng2CheckBox.Enabled = false; - this.flowm3Rng2CheckBox.Location = new System.Drawing.Point(275, 150); + this.flowm3Rng2CheckBox.Location = new System.Drawing.Point(275, 128); this.flowm3Rng2CheckBox.Name = "flowm3Rng2CheckBox"; this.flowm3Rng2CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm3Rng2CheckBox.TabIndex = 23; @@ -313,7 +318,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm3Rng1CheckBox.AutoSize = true; this.flowm3Rng1CheckBox.Enabled = false; - this.flowm3Rng1CheckBox.Location = new System.Drawing.Point(245, 150); + this.flowm3Rng1CheckBox.Location = new System.Drawing.Point(245, 128); this.flowm3Rng1CheckBox.Name = "flowm3Rng1CheckBox"; this.flowm3Rng1CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm3Rng1CheckBox.TabIndex = 22; @@ -324,7 +329,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowmeter3ComboBox.Enabled = false; this.flowmeter3ComboBox.FormattingEnabled = true; - this.flowmeter3ComboBox.Location = new System.Drawing.Point(95, 147); + this.flowmeter3ComboBox.Location = new System.Drawing.Point(95, 125); this.flowmeter3ComboBox.Name = "flowmeter3ComboBox"; this.flowmeter3ComboBox.Size = new System.Drawing.Size(69, 21); this.flowmeter3ComboBox.TabIndex = 20; @@ -332,7 +337,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // flowmeter3Label // this.flowmeter3Label.AutoSize = true; - this.flowmeter3Label.Location = new System.Drawing.Point(15, 150); + this.flowmeter3Label.Location = new System.Drawing.Point(15, 128); this.flowmeter3Label.Name = "flowmeter3Label"; this.flowmeter3Label.Size = new System.Drawing.Size(64, 13); this.flowmeter3Label.TabIndex = 19; @@ -342,7 +347,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm4Rng5CheckBox.AutoSize = true; this.flowm4Rng5CheckBox.Enabled = false; - this.flowm4Rng5CheckBox.Location = new System.Drawing.Point(365, 177); + this.flowm4Rng5CheckBox.Location = new System.Drawing.Point(365, 152); this.flowm4Rng5CheckBox.Name = "flowm4Rng5CheckBox"; this.flowm4Rng5CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm4Rng5CheckBox.TabIndex = 34; @@ -353,7 +358,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm4Rng4CheckBox.AutoSize = true; this.flowm4Rng4CheckBox.Enabled = false; - this.flowm4Rng4CheckBox.Location = new System.Drawing.Point(335, 177); + this.flowm4Rng4CheckBox.Location = new System.Drawing.Point(335, 152); this.flowm4Rng4CheckBox.Name = "flowm4Rng4CheckBox"; this.flowm4Rng4CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm4Rng4CheckBox.TabIndex = 33; @@ -364,7 +369,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm4Rng3CheckBox.AutoSize = true; this.flowm4Rng3CheckBox.Enabled = false; - this.flowm4Rng3CheckBox.Location = new System.Drawing.Point(305, 177); + this.flowm4Rng3CheckBox.Location = new System.Drawing.Point(305, 152); this.flowm4Rng3CheckBox.Name = "flowm4Rng3CheckBox"; this.flowm4Rng3CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm4Rng3CheckBox.TabIndex = 32; @@ -375,7 +380,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm4Rng2CheckBox.AutoSize = true; this.flowm4Rng2CheckBox.Enabled = false; - this.flowm4Rng2CheckBox.Location = new System.Drawing.Point(275, 177); + this.flowm4Rng2CheckBox.Location = new System.Drawing.Point(275, 152); this.flowm4Rng2CheckBox.Name = "flowm4Rng2CheckBox"; this.flowm4Rng2CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm4Rng2CheckBox.TabIndex = 31; @@ -386,7 +391,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm4Rng1CheckBox.AutoSize = true; this.flowm4Rng1CheckBox.Enabled = false; - this.flowm4Rng1CheckBox.Location = new System.Drawing.Point(245, 177); + this.flowm4Rng1CheckBox.Location = new System.Drawing.Point(245, 152); this.flowm4Rng1CheckBox.Name = "flowm4Rng1CheckBox"; this.flowm4Rng1CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm4Rng1CheckBox.TabIndex = 30; @@ -397,7 +402,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowmeter4ComboBox.Enabled = false; this.flowmeter4ComboBox.FormattingEnabled = true; - this.flowmeter4ComboBox.Location = new System.Drawing.Point(95, 174); + this.flowmeter4ComboBox.Location = new System.Drawing.Point(95, 149); this.flowmeter4ComboBox.Name = "flowmeter4ComboBox"; this.flowmeter4ComboBox.Size = new System.Drawing.Size(69, 21); this.flowmeter4ComboBox.TabIndex = 28; @@ -405,7 +410,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // flowmeter4Label // this.flowmeter4Label.AutoSize = true; - this.flowmeter4Label.Location = new System.Drawing.Point(15, 177); + this.flowmeter4Label.Location = new System.Drawing.Point(15, 152); this.flowmeter4Label.Name = "flowmeter4Label"; this.flowmeter4Label.Size = new System.Drawing.Size(64, 13); this.flowmeter4Label.TabIndex = 27; @@ -415,7 +420,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm5Rng5CheckBox.AutoSize = true; this.flowm5Rng5CheckBox.Enabled = false; - this.flowm5Rng5CheckBox.Location = new System.Drawing.Point(365, 204); + this.flowm5Rng5CheckBox.Location = new System.Drawing.Point(365, 176); this.flowm5Rng5CheckBox.Name = "flowm5Rng5CheckBox"; this.flowm5Rng5CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm5Rng5CheckBox.TabIndex = 42; @@ -426,7 +431,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm5Rng4CheckBox.AutoSize = true; this.flowm5Rng4CheckBox.Enabled = false; - this.flowm5Rng4CheckBox.Location = new System.Drawing.Point(335, 204); + this.flowm5Rng4CheckBox.Location = new System.Drawing.Point(335, 176); this.flowm5Rng4CheckBox.Name = "flowm5Rng4CheckBox"; this.flowm5Rng4CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm5Rng4CheckBox.TabIndex = 41; @@ -437,7 +442,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm5Rng3CheckBox.AutoSize = true; this.flowm5Rng3CheckBox.Enabled = false; - this.flowm5Rng3CheckBox.Location = new System.Drawing.Point(305, 204); + this.flowm5Rng3CheckBox.Location = new System.Drawing.Point(305, 176); this.flowm5Rng3CheckBox.Name = "flowm5Rng3CheckBox"; this.flowm5Rng3CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm5Rng3CheckBox.TabIndex = 40; @@ -448,7 +453,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm5Rng2CheckBox.AutoSize = true; this.flowm5Rng2CheckBox.Enabled = false; - this.flowm5Rng2CheckBox.Location = new System.Drawing.Point(275, 204); + this.flowm5Rng2CheckBox.Location = new System.Drawing.Point(275, 176); this.flowm5Rng2CheckBox.Name = "flowm5Rng2CheckBox"; this.flowm5Rng2CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm5Rng2CheckBox.TabIndex = 39; @@ -459,7 +464,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm5Rng1CheckBox.AutoSize = true; this.flowm5Rng1CheckBox.Enabled = false; - this.flowm5Rng1CheckBox.Location = new System.Drawing.Point(245, 204); + this.flowm5Rng1CheckBox.Location = new System.Drawing.Point(245, 176); this.flowm5Rng1CheckBox.Name = "flowm5Rng1CheckBox"; this.flowm5Rng1CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm5Rng1CheckBox.TabIndex = 38; @@ -470,7 +475,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowmeter5ComboBox.Enabled = false; this.flowmeter5ComboBox.FormattingEnabled = true; - this.flowmeter5ComboBox.Location = new System.Drawing.Point(95, 201); + this.flowmeter5ComboBox.Location = new System.Drawing.Point(95, 173); this.flowmeter5ComboBox.Name = "flowmeter5ComboBox"; this.flowmeter5ComboBox.Size = new System.Drawing.Size(69, 21); this.flowmeter5ComboBox.TabIndex = 36; @@ -478,7 +483,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // flowmeter5Label // this.flowmeter5Label.AutoSize = true; - this.flowmeter5Label.Location = new System.Drawing.Point(15, 204); + this.flowmeter5Label.Location = new System.Drawing.Point(15, 176); this.flowmeter5Label.Name = "flowmeter5Label"; this.flowmeter5Label.Size = new System.Drawing.Size(64, 13); this.flowmeter5Label.TabIndex = 35; @@ -488,7 +493,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm5Rng0CheckBox.AutoSize = true; this.flowm5Rng0CheckBox.Enabled = false; - this.flowm5Rng0CheckBox.Location = new System.Drawing.Point(196, 204); + this.flowm5Rng0CheckBox.Location = new System.Drawing.Point(196, 176); this.flowm5Rng0CheckBox.Name = "flowm5Rng0CheckBox"; this.flowm5Rng0CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm5Rng0CheckBox.TabIndex = 37; @@ -499,7 +504,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm4Rng0CheckBox.AutoSize = true; this.flowm4Rng0CheckBox.Enabled = false; - this.flowm4Rng0CheckBox.Location = new System.Drawing.Point(196, 177); + this.flowm4Rng0CheckBox.Location = new System.Drawing.Point(196, 152); this.flowm4Rng0CheckBox.Name = "flowm4Rng0CheckBox"; this.flowm4Rng0CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm4Rng0CheckBox.TabIndex = 29; @@ -510,7 +515,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm3Rng0CheckBox.AutoSize = true; this.flowm3Rng0CheckBox.Enabled = false; - this.flowm3Rng0CheckBox.Location = new System.Drawing.Point(196, 150); + this.flowm3Rng0CheckBox.Location = new System.Drawing.Point(196, 128); this.flowm3Rng0CheckBox.Name = "flowm3Rng0CheckBox"; this.flowm3Rng0CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm3Rng0CheckBox.TabIndex = 21; @@ -521,7 +526,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm2Rng0CheckBox.AutoSize = true; this.flowm2Rng0CheckBox.Enabled = false; - this.flowm2Rng0CheckBox.Location = new System.Drawing.Point(196, 123); + this.flowm2Rng0CheckBox.Location = new System.Drawing.Point(196, 104); this.flowm2Rng0CheckBox.Name = "flowm2Rng0CheckBox"; this.flowm2Rng0CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm2Rng0CheckBox.TabIndex = 13; @@ -532,7 +537,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm1Rng0CheckBox.AutoSize = true; this.flowm1Rng0CheckBox.Enabled = false; - this.flowm1Rng0CheckBox.Location = new System.Drawing.Point(196, 96); + this.flowm1Rng0CheckBox.Location = new System.Drawing.Point(196, 80); this.flowm1Rng0CheckBox.Name = "flowm1Rng0CheckBox"; this.flowm1Rng0CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm1Rng0CheckBox.TabIndex = 5; @@ -542,7 +547,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(193, 72); + this.label1.Location = new System.Drawing.Point(193, 58); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(179, 13); this.label1.TabIndex = 43; @@ -552,7 +557,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm6Rng0CheckBox.AutoSize = true; this.flowm6Rng0CheckBox.Enabled = false; - this.flowm6Rng0CheckBox.Location = new System.Drawing.Point(196, 231); + this.flowm6Rng0CheckBox.Location = new System.Drawing.Point(196, 200); this.flowm6Rng0CheckBox.Name = "flowm6Rng0CheckBox"; this.flowm6Rng0CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm6Rng0CheckBox.TabIndex = 46; @@ -563,7 +568,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm6Rng5CheckBox.AutoSize = true; this.flowm6Rng5CheckBox.Enabled = false; - this.flowm6Rng5CheckBox.Location = new System.Drawing.Point(365, 231); + this.flowm6Rng5CheckBox.Location = new System.Drawing.Point(365, 200); this.flowm6Rng5CheckBox.Name = "flowm6Rng5CheckBox"; this.flowm6Rng5CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm6Rng5CheckBox.TabIndex = 51; @@ -574,7 +579,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm6Rng4CheckBox.AutoSize = true; this.flowm6Rng4CheckBox.Enabled = false; - this.flowm6Rng4CheckBox.Location = new System.Drawing.Point(335, 231); + this.flowm6Rng4CheckBox.Location = new System.Drawing.Point(335, 200); this.flowm6Rng4CheckBox.Name = "flowm6Rng4CheckBox"; this.flowm6Rng4CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm6Rng4CheckBox.TabIndex = 50; @@ -585,7 +590,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm6Rng3CheckBox.AutoSize = true; this.flowm6Rng3CheckBox.Enabled = false; - this.flowm6Rng3CheckBox.Location = new System.Drawing.Point(305, 231); + this.flowm6Rng3CheckBox.Location = new System.Drawing.Point(305, 200); this.flowm6Rng3CheckBox.Name = "flowm6Rng3CheckBox"; this.flowm6Rng3CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm6Rng3CheckBox.TabIndex = 49; @@ -596,7 +601,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm6Rng2CheckBox.AutoSize = true; this.flowm6Rng2CheckBox.Enabled = false; - this.flowm6Rng2CheckBox.Location = new System.Drawing.Point(275, 231); + this.flowm6Rng2CheckBox.Location = new System.Drawing.Point(275, 200); this.flowm6Rng2CheckBox.Name = "flowm6Rng2CheckBox"; this.flowm6Rng2CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm6Rng2CheckBox.TabIndex = 48; @@ -607,7 +612,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm6Rng1CheckBox.AutoSize = true; this.flowm6Rng1CheckBox.Enabled = false; - this.flowm6Rng1CheckBox.Location = new System.Drawing.Point(245, 231); + this.flowm6Rng1CheckBox.Location = new System.Drawing.Point(245, 200); this.flowm6Rng1CheckBox.Name = "flowm6Rng1CheckBox"; this.flowm6Rng1CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm6Rng1CheckBox.TabIndex = 47; @@ -618,7 +623,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowmeter6ComboBox.Enabled = false; this.flowmeter6ComboBox.FormattingEnabled = true; - this.flowmeter6ComboBox.Location = new System.Drawing.Point(95, 228); + this.flowmeter6ComboBox.Location = new System.Drawing.Point(95, 197); this.flowmeter6ComboBox.Name = "flowmeter6ComboBox"; this.flowmeter6ComboBox.Size = new System.Drawing.Size(69, 21); this.flowmeter6ComboBox.TabIndex = 45; @@ -626,7 +631,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // flowmeter6Label // this.flowmeter6Label.AutoSize = true; - this.flowmeter6Label.Location = new System.Drawing.Point(15, 231); + this.flowmeter6Label.Location = new System.Drawing.Point(15, 200); this.flowmeter6Label.Name = "flowmeter6Label"; this.flowmeter6Label.Size = new System.Drawing.Size(64, 13); this.flowmeter6Label.TabIndex = 44; @@ -636,7 +641,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm7Rng0CheckBox.AutoSize = true; this.flowm7Rng0CheckBox.Enabled = false; - this.flowm7Rng0CheckBox.Location = new System.Drawing.Point(196, 258); + this.flowm7Rng0CheckBox.Location = new System.Drawing.Point(196, 224); this.flowm7Rng0CheckBox.Name = "flowm7Rng0CheckBox"; this.flowm7Rng0CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm7Rng0CheckBox.TabIndex = 54; @@ -647,7 +652,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm7Rng5CheckBox.AutoSize = true; this.flowm7Rng5CheckBox.Enabled = false; - this.flowm7Rng5CheckBox.Location = new System.Drawing.Point(365, 258); + this.flowm7Rng5CheckBox.Location = new System.Drawing.Point(365, 224); this.flowm7Rng5CheckBox.Name = "flowm7Rng5CheckBox"; this.flowm7Rng5CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm7Rng5CheckBox.TabIndex = 59; @@ -658,7 +663,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm7Rng4CheckBox.AutoSize = true; this.flowm7Rng4CheckBox.Enabled = false; - this.flowm7Rng4CheckBox.Location = new System.Drawing.Point(335, 258); + this.flowm7Rng4CheckBox.Location = new System.Drawing.Point(335, 224); this.flowm7Rng4CheckBox.Name = "flowm7Rng4CheckBox"; this.flowm7Rng4CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm7Rng4CheckBox.TabIndex = 58; @@ -669,7 +674,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm7Rng3CheckBox.AutoSize = true; this.flowm7Rng3CheckBox.Enabled = false; - this.flowm7Rng3CheckBox.Location = new System.Drawing.Point(305, 258); + this.flowm7Rng3CheckBox.Location = new System.Drawing.Point(305, 224); this.flowm7Rng3CheckBox.Name = "flowm7Rng3CheckBox"; this.flowm7Rng3CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm7Rng3CheckBox.TabIndex = 57; @@ -680,7 +685,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm7Rng2CheckBox.AutoSize = true; this.flowm7Rng2CheckBox.Enabled = false; - this.flowm7Rng2CheckBox.Location = new System.Drawing.Point(275, 258); + this.flowm7Rng2CheckBox.Location = new System.Drawing.Point(275, 224); this.flowm7Rng2CheckBox.Name = "flowm7Rng2CheckBox"; this.flowm7Rng2CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm7Rng2CheckBox.TabIndex = 56; @@ -691,7 +696,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowm7Rng1CheckBox.AutoSize = true; this.flowm7Rng1CheckBox.Enabled = false; - this.flowm7Rng1CheckBox.Location = new System.Drawing.Point(245, 258); + this.flowm7Rng1CheckBox.Location = new System.Drawing.Point(245, 224); this.flowm7Rng1CheckBox.Name = "flowm7Rng1CheckBox"; this.flowm7Rng1CheckBox.Size = new System.Drawing.Size(32, 17); this.flowm7Rng1CheckBox.TabIndex = 55; @@ -702,7 +707,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // this.flowmeter7ComboBox.Enabled = false; this.flowmeter7ComboBox.FormattingEnabled = true; - this.flowmeter7ComboBox.Location = new System.Drawing.Point(95, 255); + this.flowmeter7ComboBox.Location = new System.Drawing.Point(95, 221); this.flowmeter7ComboBox.Name = "flowmeter7ComboBox"; this.flowmeter7ComboBox.Size = new System.Drawing.Size(69, 21); this.flowmeter7ComboBox.TabIndex = 53; @@ -710,16 +715,64 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections // flowmeter7Label // this.flowmeter7Label.AutoSize = true; - this.flowmeter7Label.Location = new System.Drawing.Point(15, 258); + this.flowmeter7Label.Location = new System.Drawing.Point(15, 224); this.flowmeter7Label.Name = "flowmeter7Label"; this.flowmeter7Label.Size = new System.Drawing.Size(64, 13); this.flowmeter7Label.TabIndex = 52; this.flowmeter7Label.Text = "Flowmeter 7"; // + // certificateTextBox + // + this.certificateTextBox.Enabled = false; + this.certificateTextBox.Location = new System.Drawing.Point(95, 249); + this.certificateTextBox.Name = "certificateTextBox"; + this.certificateTextBox.Size = new System.Drawing.Size(212, 20); + this.certificateTextBox.TabIndex = 61; + // + // certificateLabel + // + this.certificateLabel.AutoSize = true; + this.certificateLabel.Location = new System.Drawing.Point(15, 252); + this.certificateLabel.Name = "certificateLabel"; + this.certificateLabel.Size = new System.Drawing.Size(54, 13); + this.certificateLabel.TabIndex = 60; + this.certificateLabel.Text = "Certificate"; + // + // validityTextBox + // + this.validityTextBox.Enabled = false; + this.validityTextBox.Location = new System.Drawing.Point(95, 273); + this.validityTextBox.Name = "validityTextBox"; + this.validityTextBox.Size = new System.Drawing.Size(69, 20); + this.validityTextBox.TabIndex = 63; + // + // validityLabel + // + this.validityLabel.AutoSize = true; + this.validityLabel.Location = new System.Drawing.Point(15, 276); + this.validityLabel.Name = "validityLabel"; + this.validityLabel.Size = new System.Drawing.Size(71, 13); + this.validityLabel.TabIndex = 62; + this.validityLabel.Text = "Validity (days)"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(313, 252); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(120, 13); + this.label2.TabIndex = 64; + this.label2.Text = "(0=start 1-end, 2=batch)"; + // // SaveFlowmeterCorrCfgCtrl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label2); + this.Controls.Add(this.validityTextBox); + this.Controls.Add(this.validityLabel); + this.Controls.Add(this.certificateTextBox); + this.Controls.Add(this.certificateLabel); this.Controls.Add(this.flowm7Rng0CheckBox); this.Controls.Add(this.flowm7Rng5CheckBox); this.Controls.Add(this.flowm7Rng4CheckBox); @@ -850,5 +903,10 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections private System.Windows.Forms.CheckBox flowm7Rng1CheckBox; private System.Windows.Forms.ComboBox flowmeter7ComboBox; private System.Windows.Forms.Label flowmeter7Label; + private System.Windows.Forms.TextBox certificateTextBox; + private System.Windows.Forms.Label certificateLabel; + private System.Windows.Forms.TextBox validityTextBox; + private System.Windows.Forms.Label validityLabel; + private System.Windows.Forms.Label label2; } }