From 776f8ed8414bc10d62ba42296249dbae6368b0bf Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 16 Feb 2018 09:53:27 +0100 Subject: [PATCH] SaveFlowmeterCorr : Support for calibration of multiple flow meters and ranges, part 1, UI, ver. 2.18.816 --- .../SaveFlowmeterCorr.cs | 22 +- .../SaveFlowmeterCorrCfg.cs | 64 +- .../SaveFlowmeterCorrCfgCtrl.cs | 276 +++++- .../SaveFlowmeterCorrCfgCtrl.designer.cs | 805 +++++++++++++++++- TBF/Properties/AssemblyInfo.cs | 4 +- 5 files changed, 1099 insertions(+), 72 deletions(-) diff --git a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs index 4bce715b2..1bb162255 100644 --- a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs +++ b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs @@ -23,6 +23,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections public override string ToString() { return string.Format("SaveFlowmeterCorr({0})", Cfg.ToString(1)); } SaveFlowmeterCorrCfg myCfg; + int rangeIx; enum CurrentOp { @@ -123,7 +124,14 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections opCompleted = false; anyError = false; - newCorrections = GetCorrections(batch, myCfg.Flowmeter, myCfg.RangeIx); + if (myCfg.Flowm1Rng1) rangeIx = 1; + else if (myCfg.Flowm1Rng2) rangeIx = 2; + else if (myCfg.Flowm1Rng3) rangeIx = 3; + else if (myCfg.Flowm1Rng4) rangeIx = 4; + else if (myCfg.Flowm1Rng5) rangeIx = 5; + else rangeIx = 0; + + newCorrections = GetCorrections(batch, myCfg.Flowmeter1, rangeIx); } /// Run this operation @@ -147,19 +155,19 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections transaction = session.BeginTransaction(); var cmpnts = session.QueryOver() - .Where(cmpnt => (cmpnt.Name == myCfg.Flowmeter)) + .Where(cmpnt => (cmpnt.Name == myCfg.Flowmeter1)) .List(); - if (cmpnts.Count != 1) throw (new Exception(string.Format("No unique component in SaveNewCorrections(.,{0},{1})", myCfg.Flowmeter, myCfg.RangeIx))); + if (cmpnts.Count != 1) throw (new Exception(string.Format("No unique component in SaveNewCorrections(.,{0},{1})", myCfg.Flowmeter1, rangeIx))); - DeleteExistingCorrections(session, cmpnts[0], myCfg.RangeIx); - SaveNewCorrections(session, cmpnts[0], myCfg.RangeIx, newCorrections); + DeleteExistingCorrections(session, cmpnts[0], rangeIx); + SaveNewCorrections(session, cmpnts[0], rangeIx, newCorrections); transaction.Commit(); session.Flush(); opCompleted = true; - log.ErrorFormat("Measurement corrections of {0}/{1} saved", myCfg.Flowmeter, myCfg.RangeIx); + log.ErrorFormat("Measurement corrections of {0}/{1} saved", myCfg.Flowmeter1, rangeIx); } catch (Exception exc) { @@ -167,7 +175,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections anyError = true; log.WarnFormat("Failed to write batch {0} results to measurement {1}/{2} corrections: {3}", - batch.BatchNr, myCfg.Flowmeter, myCfg.RangeIx, exc.Message); + batch.BatchNr, myCfg.Flowmeter1, rangeIx, exc.Message); } } diff --git a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfg.cs b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfg.cs index eaca9b773..e5f597562 100644 --- a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfg.cs +++ b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfg.cs @@ -13,16 +13,67 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections public IComponentCfgCtrl GetControl() { return new SaveFlowmeterCorrCfgCtrl(); } - public string Flowmeter; - public int RangeIx; + public string Flowmeter1; + public bool Flowm1Rng1; + public bool Flowm1Rng2; + public bool Flowm1Rng3; + public bool Flowm1Rng4; + public bool Flowm1Rng5; + + public string Flowmeter2; + public bool Flowm2Rng1; + public bool Flowm2Rng2; + public bool Flowm2Rng3; + public bool Flowm2Rng4; + public bool Flowm2Rng5; + + public string Flowmeter3; + public bool Flowm3Rng1; + public bool Flowm3Rng2; + public bool Flowm3Rng3; + public bool Flowm3Rng4; + public bool Flowm3Rng5; + + public string Flowmeter4; + public bool Flowm4Rng1; + public bool Flowm4Rng2; + public bool Flowm4Rng3; + public bool Flowm4Rng4; + public bool Flowm4Rng5; + + public string Flowmeter5; + public bool Flowm5Rng1; + public bool Flowm5Rng2; + public bool Flowm5Rng3; + public bool Flowm5Rng4; + public bool Flowm5Rng5; + + public string Flowmeter6; + public bool Flowm6Rng1; + public bool Flowm6Rng2; + public bool Flowm6Rng3; + public bool Flowm6Rng4; + public bool Flowm6Rng5; + + public string Flowmeter7; + public bool Flowm7Rng1; + public bool Flowm7Rng2; + public bool Flowm7Rng3; + public bool Flowm7Rng4; + public bool Flowm7Rng5; /// Private parameterless constructor invoked by all other (public) constructors SaveFlowmeterCorrCfg() { ParentName = string.Empty; - Flowmeter = "I1"; - RangeIx = 0; - } + Flowmeter1 = "I1"; + Flowmeter2 = "I2"; + Flowmeter3 = "I3"; + Flowmeter4 = null; + Flowmeter5 = null; + Flowmeter6 = null; + Flowmeter7 = null; + } public SaveFlowmeterCorrCfg(string name, IComponentFactory factory) : this() @@ -33,7 +84,8 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections public string ToString(int i) { - return string.Format("Name={0}, Flowmtr={1}, RangeIx={2}", Name, Flowmeter, RangeIx); + return string.Format("Name={0}, Flowmtr1={1}, Flowmtr2={2}, Flowmtr3={3}, Flowmtr4={4}, Flowmtr5={5}, Flowmtr6={6}, Flowmtr7={7}", + Name, Flowmeter1, Flowmeter2, Flowmeter3, Flowmeter4, Flowmeter5, Flowmeter6, Flowmeter7); } } } diff --git a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs index 3117672d2..0873f31e2 100644 --- a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs +++ b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs @@ -41,11 +41,25 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections if (parent.TbfComponents != null) { + flowmeter1ComboBox.Items.Add("---"); + flowmeter2ComboBox.Items.Add("---"); + flowmeter3ComboBox.Items.Add("---"); + flowmeter4ComboBox.Items.Add("---"); + flowmeter5ComboBox.Items.Add("---"); + flowmeter6ComboBox.Items.Add("---"); + flowmeter7ComboBox.Items.Add("---"); + /// foreach (var cmpnt in parent.TbfComponents) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.BenchControl.Elde.FlowMeter.FlowMeterFactory) { - flowmeterComboBox.Items.Add(cmpnt.Name); + flowmeter1ComboBox.Items.Add(cmpnt.Name); + flowmeter2ComboBox.Items.Add(cmpnt.Name); + flowmeter3ComboBox.Items.Add(cmpnt.Name); + flowmeter4ComboBox.Items.Add(cmpnt.Name); + flowmeter5ComboBox.Items.Add(cmpnt.Name); + flowmeter6ComboBox.Items.Add(cmpnt.Name); + flowmeter7ComboBox.Items.Add(cmpnt.Name); } } } @@ -63,32 +77,218 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections classNameLabel.Text = config.Factory.ClassName; nameTextBox.Text = config.Name; - flowmeterComboBox.Text = config.Flowmeter; - rangeIdTextBox.Text = config.RangeIx.ToString(); - } + + flowmeter1ComboBox.Text = string.IsNullOrEmpty(config.Flowmeter1) ? "---" : config.Flowmeter1; + flowm1Rng1CheckBox.Checked = config.Flowm1Rng1; + flowm1Rng2CheckBox.Checked = config.Flowm1Rng2; + flowm1Rng3CheckBox.Checked = config.Flowm1Rng3; + flowm1Rng4CheckBox.Checked = config.Flowm1Rng4; + flowm1Rng5CheckBox.Checked = config.Flowm1Rng5; + flowm1Rng0CheckBox.Checked = !(config.Flowm1Rng1 || config.Flowm1Rng2 || config.Flowm1Rng3 || config.Flowm1Rng4 || config.Flowm1Rng5); + + flowmeter2ComboBox.Text = string.IsNullOrEmpty(config.Flowmeter2) ? "---" : config.Flowmeter2; + flowm2Rng1CheckBox.Checked = config.Flowm2Rng1; + flowm2Rng2CheckBox.Checked = config.Flowm2Rng2; + flowm2Rng3CheckBox.Checked = config.Flowm2Rng3; + flowm2Rng4CheckBox.Checked = config.Flowm2Rng4; + flowm2Rng5CheckBox.Checked = config.Flowm2Rng5; + flowm2Rng0CheckBox.Checked = !(config.Flowm2Rng1 || config.Flowm2Rng2 || config.Flowm2Rng3 || config.Flowm2Rng4 || config.Flowm2Rng5); + + flowmeter3ComboBox.Text = string.IsNullOrEmpty(config.Flowmeter3) ? "---" : config.Flowmeter3; + flowm3Rng1CheckBox.Checked = config.Flowm3Rng1; + flowm3Rng2CheckBox.Checked = config.Flowm3Rng2; + flowm3Rng3CheckBox.Checked = config.Flowm3Rng3; + flowm3Rng4CheckBox.Checked = config.Flowm3Rng4; + flowm3Rng5CheckBox.Checked = config.Flowm3Rng5; + flowm3Rng0CheckBox.Checked = !(config.Flowm3Rng1 || config.Flowm3Rng2 || config.Flowm3Rng3 || config.Flowm3Rng4 || config.Flowm3Rng5); + + flowmeter4ComboBox.Text = string.IsNullOrEmpty(config.Flowmeter4) ? "---" : config.Flowmeter4; + flowm4Rng1CheckBox.Checked = config.Flowm4Rng1; + flowm4Rng2CheckBox.Checked = config.Flowm4Rng2; + flowm4Rng3CheckBox.Checked = config.Flowm4Rng3; + flowm4Rng4CheckBox.Checked = config.Flowm4Rng4; + flowm4Rng5CheckBox.Checked = config.Flowm4Rng5; + flowm4Rng0CheckBox.Checked = !(config.Flowm4Rng1 || config.Flowm4Rng2 || config.Flowm4Rng3 || config.Flowm4Rng4 || config.Flowm4Rng5); + + flowmeter5ComboBox.Text = string.IsNullOrEmpty(config.Flowmeter5) ? "---" : config.Flowmeter5; + flowm5Rng1CheckBox.Checked = config.Flowm5Rng1; + flowm5Rng2CheckBox.Checked = config.Flowm5Rng2; + flowm5Rng3CheckBox.Checked = config.Flowm5Rng3; + flowm5Rng4CheckBox.Checked = config.Flowm5Rng4; + flowm5Rng5CheckBox.Checked = config.Flowm5Rng5; + flowm5Rng0CheckBox.Checked = !(config.Flowm5Rng1 || config.Flowm5Rng2 || config.Flowm5Rng3 || config.Flowm5Rng4 || config.Flowm5Rng5); + + flowmeter6ComboBox.Text = string.IsNullOrEmpty(config.Flowmeter6) ? "---" : config.Flowmeter6; + flowm6Rng1CheckBox.Checked = config.Flowm6Rng1; + flowm6Rng2CheckBox.Checked = config.Flowm6Rng2; + flowm6Rng3CheckBox.Checked = config.Flowm6Rng3; + flowm6Rng4CheckBox.Checked = config.Flowm6Rng4; + flowm6Rng5CheckBox.Checked = config.Flowm6Rng5; + flowm6Rng0CheckBox.Checked = !(config.Flowm6Rng1 || config.Flowm6Rng2 || config.Flowm6Rng3 || config.Flowm6Rng4 || config.Flowm6Rng5); + + flowmeter7ComboBox.Text = string.IsNullOrEmpty(config.Flowmeter7) ? "---" : config.Flowmeter7; + flowm7Rng1CheckBox.Checked = config.Flowm7Rng1; + flowm7Rng2CheckBox.Checked = config.Flowm7Rng2; + flowm7Rng3CheckBox.Checked = config.Flowm7Rng3; + flowm7Rng4CheckBox.Checked = config.Flowm7Rng4; + flowm7Rng5CheckBox.Checked = config.Flowm7Rng5; + flowm7Rng0CheckBox.Checked = !(config.Flowm7Rng1 || config.Flowm7Rng2 || config.Flowm7Rng3 || config.Flowm7Rng4 || config.Flowm7Rng5); + } public void Unlock() { nameTextBox.Enabled = true; - flowmeterComboBox.Enabled = true; - rangeIdTextBox.Enabled = true; - } + + flowmeter1ComboBox.Enabled = true; + flowm1Rng0CheckBox.Enabled = true; + flowm1Rng1CheckBox.Enabled = true; + flowm1Rng2CheckBox.Enabled = true; + flowm1Rng3CheckBox.Enabled = true; + flowm1Rng4CheckBox.Enabled = true; + flowm1Rng5CheckBox.Enabled = true; + + flowmeter2ComboBox.Enabled = true; + flowm2Rng0CheckBox.Enabled = true; + flowm2Rng1CheckBox.Enabled = true; + flowm2Rng2CheckBox.Enabled = true; + flowm2Rng3CheckBox.Enabled = true; + flowm2Rng4CheckBox.Enabled = true; + flowm2Rng5CheckBox.Enabled = true; + + flowmeter3ComboBox.Enabled = true; + flowm3Rng0CheckBox.Enabled = true; + flowm3Rng1CheckBox.Enabled = true; + flowm3Rng2CheckBox.Enabled = true; + flowm3Rng3CheckBox.Enabled = true; + flowm3Rng4CheckBox.Enabled = true; + flowm3Rng5CheckBox.Enabled = true; + + flowmeter4ComboBox.Enabled = true; + flowm4Rng0CheckBox.Enabled = true; + flowm4Rng1CheckBox.Enabled = true; + flowm4Rng2CheckBox.Enabled = true; + flowm4Rng3CheckBox.Enabled = true; + flowm4Rng4CheckBox.Enabled = true; + flowm4Rng5CheckBox.Enabled = true; + + flowmeter5ComboBox.Enabled = true; + flowm5Rng0CheckBox.Enabled = true; + flowm5Rng1CheckBox.Enabled = true; + flowm5Rng2CheckBox.Enabled = true; + flowm5Rng3CheckBox.Enabled = true; + flowm5Rng4CheckBox.Enabled = true; + flowm5Rng5CheckBox.Enabled = true; + + flowmeter6ComboBox.Enabled = true; + flowm6Rng0CheckBox.Enabled = true; + flowm6Rng1CheckBox.Enabled = true; + flowm6Rng2CheckBox.Enabled = true; + flowm6Rng3CheckBox.Enabled = true; + flowm6Rng4CheckBox.Enabled = true; + flowm6Rng5CheckBox.Enabled = true; + + flowmeter7ComboBox.Enabled = true; + flowm7Rng0CheckBox.Enabled = true; + flowm7Rng1CheckBox.Enabled = true; + flowm7Rng2CheckBox.Enabled = true; + flowm7Rng3CheckBox.Enabled = true; + flowm7Rng4CheckBox.Enabled = true; + flowm7Rng5CheckBox.Enabled = true; + } public CfgUpdateFlags VerifyCfg(ref string message) { CfgUpdateFlags flags = CfgUpdateFlags.None; - if (!flowmeterComboBox.Items.Contains(flowmeterComboBox.Text)) + if (!flowmeter1ComboBox.Items.Contains(flowmeter1ComboBox.Text)) { flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + string.Format("Invalid {0}", flowmeterLabel.Text); + message += Environment.NewLine + string.Format("Invalid {0}", flowmeter1Label.Text); + } + if ((flowmeter1ComboBox.Text != "---") && + (flowm1Rng0CheckBox.Checked == (flowm1Rng1CheckBox.Checked || flowm1Rng2CheckBox.Checked || flowm1Rng3CheckBox.Checked || + flowm1Rng4CheckBox.Checked || flowm1Rng5CheckBox.Checked))) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + string.Format("Invalid ranges for {0}", flowmeter1Label.Text); } - int dummy; - if (!int.TryParse(rangeIdTextBox.Text, out dummy) || dummy < 0 || dummy > 5) + if (!flowmeter2ComboBox.Items.Contains(flowmeter2ComboBox.Text)) { flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + string.Format("Invalid {0}", rangeIdLabel.Text); + message += Environment.NewLine + string.Format("Invalid {0}", flowmeter2Label.Text); + } + if ((flowmeter2ComboBox.Text != "---") && + (flowm2Rng0CheckBox.Checked == (flowm2Rng1CheckBox.Checked || flowm2Rng2CheckBox.Checked || flowm2Rng3CheckBox.Checked || + flowm2Rng4CheckBox.Checked || flowm2Rng5CheckBox.Checked))) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + string.Format("Invalid ranges for {0}", flowmeter2Label.Text); + } + + if (!flowmeter3ComboBox.Items.Contains(flowmeter3ComboBox.Text)) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + string.Format("Invalid {0}", flowmeter3Label.Text); + } + if ((flowmeter3ComboBox.Text != "---") && + (flowm3Rng0CheckBox.Checked == (flowm3Rng1CheckBox.Checked || flowm3Rng2CheckBox.Checked || flowm3Rng3CheckBox.Checked || + flowm3Rng4CheckBox.Checked || flowm3Rng5CheckBox.Checked))) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + string.Format("Invalid ranges for {0}", flowmeter3Label.Text); + } + + if (!flowmeter4ComboBox.Items.Contains(flowmeter4ComboBox.Text)) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + string.Format("Invalid {0}", flowmeter4Label.Text); + } + if ((flowmeter4ComboBox.Text != "---") && + (flowm4Rng0CheckBox.Checked == (flowm4Rng1CheckBox.Checked || flowm4Rng2CheckBox.Checked || flowm4Rng3CheckBox.Checked || + flowm4Rng4CheckBox.Checked || flowm4Rng5CheckBox.Checked))) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + string.Format("Invalid ranges for {0}", flowmeter4Label.Text); + } + + if (!flowmeter5ComboBox.Items.Contains(flowmeter5ComboBox.Text)) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + string.Format("Invalid {0}", flowmeter5Label.Text); + } + if ((flowmeter5ComboBox.Text != "---") && + (flowm5Rng0CheckBox.Checked == (flowm5Rng1CheckBox.Checked || flowm5Rng2CheckBox.Checked || flowm5Rng3CheckBox.Checked || + flowm5Rng4CheckBox.Checked || flowm5Rng5CheckBox.Checked))) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + string.Format("Invalid ranges for {0}", flowmeter5Label.Text); + } + + if (!flowmeter6ComboBox.Items.Contains(flowmeter6ComboBox.Text)) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + string.Format("Invalid {0}", flowmeter6Label.Text); + } + if ((flowmeter6ComboBox.Text != "---") && + (flowm6Rng0CheckBox.Checked == (flowm6Rng1CheckBox.Checked || flowm6Rng2CheckBox.Checked || flowm6Rng3CheckBox.Checked || + flowm6Rng4CheckBox.Checked || flowm6Rng5CheckBox.Checked))) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + string.Format("Invalid ranges for {0}", flowmeter6Label.Text); + } + + if (!flowmeter7ComboBox.Items.Contains(flowmeter7ComboBox.Text)) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + string.Format("Invalid {0}", flowmeter7Label.Text); + } + if ((flowmeter7ComboBox.Text != "---") && + (flowm7Rng0CheckBox.Checked == (flowm7Rng1CheckBox.Checked || flowm7Rng2CheckBox.Checked || flowm7Rng3CheckBox.Checked || + flowm7Rng4CheckBox.Checked || flowm7Rng5CheckBox.Checked))) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + string.Format("Invalid ranges for {0}", flowmeter7Label.Text); } return flags; @@ -106,10 +306,56 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections flags |= CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd; } - flags |= UpdateDifferent(ref config.Flowmeter, flowmeterComboBox.Text, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); - flags |= UpdateDifferent(ref config.RangeIx, rangeIdTextBox.Text, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowmeter1, flowmeter1ComboBox.Text, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm1Rng1, flowm1Rng1CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm1Rng2, flowm1Rng2CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm1Rng3, flowm1Rng3CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm1Rng4, flowm1Rng4CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm1Rng5, flowm1Rng5CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); - return flags; + flags |= UpdateDifferent(ref config.Flowmeter2, flowmeter2ComboBox.Text, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm2Rng1, flowm2Rng1CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm2Rng2, flowm2Rng2CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm2Rng3, flowm2Rng3CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm2Rng4, flowm2Rng4CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm2Rng5, flowm2Rng5CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + + flags |= UpdateDifferent(ref config.Flowmeter3, flowmeter3ComboBox.Text, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm3Rng1, flowm3Rng1CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm3Rng2, flowm3Rng2CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm3Rng3, flowm3Rng3CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm3Rng4, flowm3Rng4CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm3Rng5, flowm3Rng5CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + + flags |= UpdateDifferent(ref config.Flowmeter4, flowmeter4ComboBox.Text, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm4Rng1, flowm4Rng1CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm4Rng2, flowm4Rng2CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm4Rng3, flowm4Rng3CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm4Rng4, flowm4Rng4CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm4Rng5, flowm4Rng5CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + + flags |= UpdateDifferent(ref config.Flowmeter5, flowmeter5ComboBox.Text, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm5Rng1, flowm5Rng1CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm5Rng2, flowm5Rng2CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm5Rng3, flowm5Rng3CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm5Rng4, flowm5Rng4CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm5Rng5, flowm5Rng5CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + + flags |= UpdateDifferent(ref config.Flowmeter6, flowmeter6ComboBox.Text, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm6Rng1, flowm6Rng1CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm6Rng2, flowm6Rng2CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm6Rng3, flowm6Rng3CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm6Rng4, flowm6Rng4CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm6Rng5, flowm6Rng5CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + + flags |= UpdateDifferent(ref config.Flowmeter7, flowmeter7ComboBox.Text, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm7Rng1, flowm7Rng1CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm7Rng2, flowm7Rng2CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm7Rng3, flowm7Rng3CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm7Rng4, flowm7Rng4CheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd); + flags |= UpdateDifferent(ref config.Flowm7Rng5, flowm7Rng5CheckBox.Checked, 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 48b03227e..fde83b355 100644 --- a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.designer.cs +++ b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.designer.cs @@ -34,18 +34,71 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections this.nameTextBox = new System.Windows.Forms.TextBox(); this.nameLabel = new System.Windows.Forms.Label(); this.classNameLabel = new System.Windows.Forms.Label(); - this.flowmeterLabel = new System.Windows.Forms.Label(); - this.rangeIdTextBox = new System.Windows.Forms.TextBox(); - this.rangeIdLabel = new System.Windows.Forms.Label(); - this.flowmeterComboBox = new System.Windows.Forms.ComboBox(); + this.flowmeter1Label = new System.Windows.Forms.Label(); + this.flowmeter1ComboBox = new System.Windows.Forms.ComboBox(); + this.flowm1Rng1CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm1Rng2CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm1Rng3CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm1Rng4CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm1Rng5CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm2Rng5CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm2Rng4CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm2Rng3CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm2Rng2CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm2Rng1CheckBox = new System.Windows.Forms.CheckBox(); + this.flowmeter2ComboBox = new System.Windows.Forms.ComboBox(); + this.flowmeter2Label = new System.Windows.Forms.Label(); + this.flowm3Rng5CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm3Rng4CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm3Rng3CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm3Rng2CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm3Rng1CheckBox = new System.Windows.Forms.CheckBox(); + this.flowmeter3ComboBox = new System.Windows.Forms.ComboBox(); + this.flowmeter3Label = new System.Windows.Forms.Label(); + this.flowm4Rng5CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm4Rng4CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm4Rng3CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm4Rng2CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm4Rng1CheckBox = new System.Windows.Forms.CheckBox(); + this.flowmeter4ComboBox = new System.Windows.Forms.ComboBox(); + this.flowmeter4Label = new System.Windows.Forms.Label(); + this.flowm5Rng5CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm5Rng4CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm5Rng3CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm5Rng2CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm5Rng1CheckBox = new System.Windows.Forms.CheckBox(); + this.flowmeter5ComboBox = new System.Windows.Forms.ComboBox(); + this.flowmeter5Label = new System.Windows.Forms.Label(); + this.flowm5Rng0CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm4Rng0CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm3Rng0CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm2Rng0CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm1Rng0CheckBox = new System.Windows.Forms.CheckBox(); + this.label1 = new System.Windows.Forms.Label(); + this.flowm6Rng0CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm6Rng5CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm6Rng4CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm6Rng3CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm6Rng2CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm6Rng1CheckBox = new System.Windows.Forms.CheckBox(); + this.flowmeter6ComboBox = new System.Windows.Forms.ComboBox(); + this.flowmeter6Label = new System.Windows.Forms.Label(); + this.flowm7Rng0CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm7Rng5CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm7Rng4CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm7Rng3CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm7Rng2CheckBox = new System.Windows.Forms.CheckBox(); + this.flowm7Rng1CheckBox = new System.Windows.Forms.CheckBox(); + this.flowmeter7ComboBox = new System.Windows.Forms.ComboBox(); + this.flowmeter7Label = new System.Windows.Forms.Label(); this.SuspendLayout(); // // nameTextBox // this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(110, 41); + this.nameTextBox.Location = new System.Drawing.Point(95, 41); this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(225, 20); + this.nameTextBox.Size = new System.Drawing.Size(285, 20); this.nameTextBox.TabIndex = 2; // // nameLabel @@ -66,54 +119,669 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections this.classNameLabel.TabIndex = 0; this.classNameLabel.Text = "ComonentName"; // - // flowmeterLabel + // flowmeter1Label // - this.flowmeterLabel.AutoSize = true; - this.flowmeterLabel.Location = new System.Drawing.Point(15, 70); - this.flowmeterLabel.Name = "flowmeterLabel"; - this.flowmeterLabel.Size = new System.Drawing.Size(55, 13); - this.flowmeterLabel.TabIndex = 3; - this.flowmeterLabel.Text = "Flowmeter"; + this.flowmeter1Label.AutoSize = true; + this.flowmeter1Label.Location = new System.Drawing.Point(15, 96); + this.flowmeter1Label.Name = "flowmeter1Label"; + this.flowmeter1Label.Size = new System.Drawing.Size(64, 13); + this.flowmeter1Label.TabIndex = 3; + this.flowmeter1Label.Text = "Flowmeter 1"; // - // rangeIdTextBox + // flowmeter1ComboBox // - this.rangeIdTextBox.Enabled = false; - this.rangeIdTextBox.Location = new System.Drawing.Point(110, 93); - this.rangeIdTextBox.Name = "rangeIdTextBox"; - this.rangeIdTextBox.Size = new System.Drawing.Size(36, 20); - this.rangeIdTextBox.TabIndex = 22; + this.flowmeter1ComboBox.Enabled = false; + this.flowmeter1ComboBox.FormattingEnabled = true; + this.flowmeter1ComboBox.Location = new System.Drawing.Point(95, 93); + this.flowmeter1ComboBox.Name = "flowmeter1ComboBox"; + this.flowmeter1ComboBox.Size = new System.Drawing.Size(69, 21); + this.flowmeter1ComboBox.TabIndex = 4; // - // rangeIdLabel + // flowm1Rng1CheckBox // - this.rangeIdLabel.AutoSize = true; - this.rangeIdLabel.Location = new System.Drawing.Point(15, 96); - this.rangeIdLabel.Name = "rangeIdLabel"; - this.rangeIdLabel.Size = new System.Drawing.Size(51, 13); - this.rangeIdLabel.TabIndex = 21; - this.rangeIdLabel.Text = "Range Id"; + this.flowm1Rng1CheckBox.AutoSize = true; + this.flowm1Rng1CheckBox.Enabled = false; + this.flowm1Rng1CheckBox.Location = new System.Drawing.Point(245, 96); + this.flowm1Rng1CheckBox.Name = "flowm1Rng1CheckBox"; + this.flowm1Rng1CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm1Rng1CheckBox.TabIndex = 6; + this.flowm1Rng1CheckBox.Text = "1"; + this.flowm1Rng1CheckBox.UseVisualStyleBackColor = true; // - // flowmeterComboBox + // flowm1Rng2CheckBox // - this.flowmeterComboBox.Enabled = false; - this.flowmeterComboBox.FormattingEnabled = true; - this.flowmeterComboBox.Location = new System.Drawing.Point(110, 67); - this.flowmeterComboBox.Name = "flowmeterComboBox"; - this.flowmeterComboBox.Size = new System.Drawing.Size(225, 21); - this.flowmeterComboBox.TabIndex = 23; + this.flowm1Rng2CheckBox.AutoSize = true; + this.flowm1Rng2CheckBox.Enabled = false; + this.flowm1Rng2CheckBox.Location = new System.Drawing.Point(275, 96); + this.flowm1Rng2CheckBox.Name = "flowm1Rng2CheckBox"; + this.flowm1Rng2CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm1Rng2CheckBox.TabIndex = 7; + this.flowm1Rng2CheckBox.Text = "2"; + this.flowm1Rng2CheckBox.UseVisualStyleBackColor = true; + // + // flowm1Rng3CheckBox + // + this.flowm1Rng3CheckBox.AutoSize = true; + this.flowm1Rng3CheckBox.Enabled = false; + this.flowm1Rng3CheckBox.Location = new System.Drawing.Point(305, 96); + this.flowm1Rng3CheckBox.Name = "flowm1Rng3CheckBox"; + this.flowm1Rng3CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm1Rng3CheckBox.TabIndex = 8; + this.flowm1Rng3CheckBox.Text = "3"; + this.flowm1Rng3CheckBox.UseVisualStyleBackColor = true; + // + // flowm1Rng4CheckBox + // + this.flowm1Rng4CheckBox.AutoSize = true; + this.flowm1Rng4CheckBox.Enabled = false; + this.flowm1Rng4CheckBox.Location = new System.Drawing.Point(335, 96); + this.flowm1Rng4CheckBox.Name = "flowm1Rng4CheckBox"; + this.flowm1Rng4CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm1Rng4CheckBox.TabIndex = 9; + this.flowm1Rng4CheckBox.Text = "4"; + this.flowm1Rng4CheckBox.UseVisualStyleBackColor = true; + // + // flowm1Rng5CheckBox + // + this.flowm1Rng5CheckBox.AutoSize = true; + this.flowm1Rng5CheckBox.Enabled = false; + this.flowm1Rng5CheckBox.Location = new System.Drawing.Point(365, 96); + this.flowm1Rng5CheckBox.Name = "flowm1Rng5CheckBox"; + this.flowm1Rng5CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm1Rng5CheckBox.TabIndex = 10; + this.flowm1Rng5CheckBox.Text = "5"; + this.flowm1Rng5CheckBox.UseVisualStyleBackColor = true; + // + // flowm2Rng5CheckBox + // + this.flowm2Rng5CheckBox.AutoSize = true; + this.flowm2Rng5CheckBox.Enabled = false; + this.flowm2Rng5CheckBox.Location = new System.Drawing.Point(365, 123); + this.flowm2Rng5CheckBox.Name = "flowm2Rng5CheckBox"; + this.flowm2Rng5CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm2Rng5CheckBox.TabIndex = 18; + this.flowm2Rng5CheckBox.Text = "5"; + this.flowm2Rng5CheckBox.UseVisualStyleBackColor = true; + // + // flowm2Rng4CheckBox + // + this.flowm2Rng4CheckBox.AutoSize = true; + this.flowm2Rng4CheckBox.Enabled = false; + this.flowm2Rng4CheckBox.Location = new System.Drawing.Point(335, 123); + this.flowm2Rng4CheckBox.Name = "flowm2Rng4CheckBox"; + this.flowm2Rng4CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm2Rng4CheckBox.TabIndex = 17; + this.flowm2Rng4CheckBox.Text = "4"; + this.flowm2Rng4CheckBox.UseVisualStyleBackColor = true; + // + // flowm2Rng3CheckBox + // + this.flowm2Rng3CheckBox.AutoSize = true; + this.flowm2Rng3CheckBox.Enabled = false; + this.flowm2Rng3CheckBox.Location = new System.Drawing.Point(305, 123); + this.flowm2Rng3CheckBox.Name = "flowm2Rng3CheckBox"; + this.flowm2Rng3CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm2Rng3CheckBox.TabIndex = 16; + this.flowm2Rng3CheckBox.Text = "3"; + this.flowm2Rng3CheckBox.UseVisualStyleBackColor = true; + // + // flowm2Rng2CheckBox + // + this.flowm2Rng2CheckBox.AutoSize = true; + this.flowm2Rng2CheckBox.Enabled = false; + this.flowm2Rng2CheckBox.Location = new System.Drawing.Point(275, 123); + this.flowm2Rng2CheckBox.Name = "flowm2Rng2CheckBox"; + this.flowm2Rng2CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm2Rng2CheckBox.TabIndex = 15; + this.flowm2Rng2CheckBox.Text = "2"; + this.flowm2Rng2CheckBox.UseVisualStyleBackColor = true; + // + // flowm2Rng1CheckBox + // + this.flowm2Rng1CheckBox.AutoSize = true; + this.flowm2Rng1CheckBox.Enabled = false; + this.flowm2Rng1CheckBox.Location = new System.Drawing.Point(245, 123); + this.flowm2Rng1CheckBox.Name = "flowm2Rng1CheckBox"; + this.flowm2Rng1CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm2Rng1CheckBox.TabIndex = 14; + this.flowm2Rng1CheckBox.Text = "1"; + this.flowm2Rng1CheckBox.UseVisualStyleBackColor = true; + // + // flowmeter2ComboBox + // + this.flowmeter2ComboBox.Enabled = false; + this.flowmeter2ComboBox.FormattingEnabled = true; + this.flowmeter2ComboBox.Location = new System.Drawing.Point(95, 120); + this.flowmeter2ComboBox.Name = "flowmeter2ComboBox"; + this.flowmeter2ComboBox.Size = new System.Drawing.Size(69, 21); + this.flowmeter2ComboBox.TabIndex = 12; + // + // flowmeter2Label + // + this.flowmeter2Label.AutoSize = true; + this.flowmeter2Label.Location = new System.Drawing.Point(15, 123); + this.flowmeter2Label.Name = "flowmeter2Label"; + this.flowmeter2Label.Size = new System.Drawing.Size(64, 13); + this.flowmeter2Label.TabIndex = 11; + this.flowmeter2Label.Text = "Flowmeter 2"; + // + // flowm3Rng5CheckBox + // + this.flowm3Rng5CheckBox.AutoSize = true; + this.flowm3Rng5CheckBox.Enabled = false; + this.flowm3Rng5CheckBox.Location = new System.Drawing.Point(365, 150); + this.flowm3Rng5CheckBox.Name = "flowm3Rng5CheckBox"; + this.flowm3Rng5CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm3Rng5CheckBox.TabIndex = 26; + this.flowm3Rng5CheckBox.Text = "5"; + this.flowm3Rng5CheckBox.UseVisualStyleBackColor = true; + // + // flowm3Rng4CheckBox + // + this.flowm3Rng4CheckBox.AutoSize = true; + this.flowm3Rng4CheckBox.Enabled = false; + this.flowm3Rng4CheckBox.Location = new System.Drawing.Point(335, 150); + this.flowm3Rng4CheckBox.Name = "flowm3Rng4CheckBox"; + this.flowm3Rng4CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm3Rng4CheckBox.TabIndex = 25; + this.flowm3Rng4CheckBox.Text = "4"; + this.flowm3Rng4CheckBox.UseVisualStyleBackColor = true; + // + // flowm3Rng3CheckBox + // + this.flowm3Rng3CheckBox.AutoSize = true; + this.flowm3Rng3CheckBox.Enabled = false; + this.flowm3Rng3CheckBox.Location = new System.Drawing.Point(305, 150); + this.flowm3Rng3CheckBox.Name = "flowm3Rng3CheckBox"; + this.flowm3Rng3CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm3Rng3CheckBox.TabIndex = 24; + this.flowm3Rng3CheckBox.Text = "3"; + this.flowm3Rng3CheckBox.UseVisualStyleBackColor = true; + // + // flowm3Rng2CheckBox + // + this.flowm3Rng2CheckBox.AutoSize = true; + this.flowm3Rng2CheckBox.Enabled = false; + this.flowm3Rng2CheckBox.Location = new System.Drawing.Point(275, 150); + this.flowm3Rng2CheckBox.Name = "flowm3Rng2CheckBox"; + this.flowm3Rng2CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm3Rng2CheckBox.TabIndex = 23; + this.flowm3Rng2CheckBox.Text = "2"; + this.flowm3Rng2CheckBox.UseVisualStyleBackColor = true; + // + // flowm3Rng1CheckBox + // + this.flowm3Rng1CheckBox.AutoSize = true; + this.flowm3Rng1CheckBox.Enabled = false; + this.flowm3Rng1CheckBox.Location = new System.Drawing.Point(245, 150); + this.flowm3Rng1CheckBox.Name = "flowm3Rng1CheckBox"; + this.flowm3Rng1CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm3Rng1CheckBox.TabIndex = 22; + this.flowm3Rng1CheckBox.Text = "1"; + this.flowm3Rng1CheckBox.UseVisualStyleBackColor = true; + // + // flowmeter3ComboBox + // + this.flowmeter3ComboBox.Enabled = false; + this.flowmeter3ComboBox.FormattingEnabled = true; + this.flowmeter3ComboBox.Location = new System.Drawing.Point(95, 147); + this.flowmeter3ComboBox.Name = "flowmeter3ComboBox"; + this.flowmeter3ComboBox.Size = new System.Drawing.Size(69, 21); + this.flowmeter3ComboBox.TabIndex = 20; + // + // flowmeter3Label + // + this.flowmeter3Label.AutoSize = true; + this.flowmeter3Label.Location = new System.Drawing.Point(15, 150); + this.flowmeter3Label.Name = "flowmeter3Label"; + this.flowmeter3Label.Size = new System.Drawing.Size(64, 13); + this.flowmeter3Label.TabIndex = 19; + this.flowmeter3Label.Text = "Flowmeter 3"; + // + // flowm4Rng5CheckBox + // + this.flowm4Rng5CheckBox.AutoSize = true; + this.flowm4Rng5CheckBox.Enabled = false; + this.flowm4Rng5CheckBox.Location = new System.Drawing.Point(365, 177); + this.flowm4Rng5CheckBox.Name = "flowm4Rng5CheckBox"; + this.flowm4Rng5CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm4Rng5CheckBox.TabIndex = 34; + this.flowm4Rng5CheckBox.Text = "5"; + this.flowm4Rng5CheckBox.UseVisualStyleBackColor = true; + // + // flowm4Rng4CheckBox + // + this.flowm4Rng4CheckBox.AutoSize = true; + this.flowm4Rng4CheckBox.Enabled = false; + this.flowm4Rng4CheckBox.Location = new System.Drawing.Point(335, 177); + this.flowm4Rng4CheckBox.Name = "flowm4Rng4CheckBox"; + this.flowm4Rng4CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm4Rng4CheckBox.TabIndex = 33; + this.flowm4Rng4CheckBox.Text = "4"; + this.flowm4Rng4CheckBox.UseVisualStyleBackColor = true; + // + // flowm4Rng3CheckBox + // + this.flowm4Rng3CheckBox.AutoSize = true; + this.flowm4Rng3CheckBox.Enabled = false; + this.flowm4Rng3CheckBox.Location = new System.Drawing.Point(305, 177); + this.flowm4Rng3CheckBox.Name = "flowm4Rng3CheckBox"; + this.flowm4Rng3CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm4Rng3CheckBox.TabIndex = 32; + this.flowm4Rng3CheckBox.Text = "3"; + this.flowm4Rng3CheckBox.UseVisualStyleBackColor = true; + // + // flowm4Rng2CheckBox + // + this.flowm4Rng2CheckBox.AutoSize = true; + this.flowm4Rng2CheckBox.Enabled = false; + this.flowm4Rng2CheckBox.Location = new System.Drawing.Point(275, 177); + this.flowm4Rng2CheckBox.Name = "flowm4Rng2CheckBox"; + this.flowm4Rng2CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm4Rng2CheckBox.TabIndex = 31; + this.flowm4Rng2CheckBox.Text = "2"; + this.flowm4Rng2CheckBox.UseVisualStyleBackColor = true; + // + // flowm4Rng1CheckBox + // + this.flowm4Rng1CheckBox.AutoSize = true; + this.flowm4Rng1CheckBox.Enabled = false; + this.flowm4Rng1CheckBox.Location = new System.Drawing.Point(245, 177); + this.flowm4Rng1CheckBox.Name = "flowm4Rng1CheckBox"; + this.flowm4Rng1CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm4Rng1CheckBox.TabIndex = 30; + this.flowm4Rng1CheckBox.Text = "1"; + this.flowm4Rng1CheckBox.UseVisualStyleBackColor = true; + // + // flowmeter4ComboBox + // + this.flowmeter4ComboBox.Enabled = false; + this.flowmeter4ComboBox.FormattingEnabled = true; + this.flowmeter4ComboBox.Location = new System.Drawing.Point(95, 174); + this.flowmeter4ComboBox.Name = "flowmeter4ComboBox"; + this.flowmeter4ComboBox.Size = new System.Drawing.Size(69, 21); + this.flowmeter4ComboBox.TabIndex = 28; + // + // flowmeter4Label + // + this.flowmeter4Label.AutoSize = true; + this.flowmeter4Label.Location = new System.Drawing.Point(15, 177); + this.flowmeter4Label.Name = "flowmeter4Label"; + this.flowmeter4Label.Size = new System.Drawing.Size(64, 13); + this.flowmeter4Label.TabIndex = 27; + this.flowmeter4Label.Text = "Flowmeter 4"; + // + // flowm5Rng5CheckBox + // + this.flowm5Rng5CheckBox.AutoSize = true; + this.flowm5Rng5CheckBox.Enabled = false; + this.flowm5Rng5CheckBox.Location = new System.Drawing.Point(365, 204); + this.flowm5Rng5CheckBox.Name = "flowm5Rng5CheckBox"; + this.flowm5Rng5CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm5Rng5CheckBox.TabIndex = 42; + this.flowm5Rng5CheckBox.Text = "5"; + this.flowm5Rng5CheckBox.UseVisualStyleBackColor = true; + // + // flowm5Rng4CheckBox + // + this.flowm5Rng4CheckBox.AutoSize = true; + this.flowm5Rng4CheckBox.Enabled = false; + this.flowm5Rng4CheckBox.Location = new System.Drawing.Point(335, 204); + this.flowm5Rng4CheckBox.Name = "flowm5Rng4CheckBox"; + this.flowm5Rng4CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm5Rng4CheckBox.TabIndex = 41; + this.flowm5Rng4CheckBox.Text = "4"; + this.flowm5Rng4CheckBox.UseVisualStyleBackColor = true; + // + // flowm5Rng3CheckBox + // + this.flowm5Rng3CheckBox.AutoSize = true; + this.flowm5Rng3CheckBox.Enabled = false; + this.flowm5Rng3CheckBox.Location = new System.Drawing.Point(305, 204); + this.flowm5Rng3CheckBox.Name = "flowm5Rng3CheckBox"; + this.flowm5Rng3CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm5Rng3CheckBox.TabIndex = 40; + this.flowm5Rng3CheckBox.Text = "3"; + this.flowm5Rng3CheckBox.UseVisualStyleBackColor = true; + // + // flowm5Rng2CheckBox + // + this.flowm5Rng2CheckBox.AutoSize = true; + this.flowm5Rng2CheckBox.Enabled = false; + this.flowm5Rng2CheckBox.Location = new System.Drawing.Point(275, 204); + this.flowm5Rng2CheckBox.Name = "flowm5Rng2CheckBox"; + this.flowm5Rng2CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm5Rng2CheckBox.TabIndex = 39; + this.flowm5Rng2CheckBox.Text = "2"; + this.flowm5Rng2CheckBox.UseVisualStyleBackColor = true; + // + // flowm5Rng1CheckBox + // + this.flowm5Rng1CheckBox.AutoSize = true; + this.flowm5Rng1CheckBox.Enabled = false; + this.flowm5Rng1CheckBox.Location = new System.Drawing.Point(245, 204); + this.flowm5Rng1CheckBox.Name = "flowm5Rng1CheckBox"; + this.flowm5Rng1CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm5Rng1CheckBox.TabIndex = 38; + this.flowm5Rng1CheckBox.Text = "1"; + this.flowm5Rng1CheckBox.UseVisualStyleBackColor = true; + // + // flowmeter5ComboBox + // + this.flowmeter5ComboBox.Enabled = false; + this.flowmeter5ComboBox.FormattingEnabled = true; + this.flowmeter5ComboBox.Location = new System.Drawing.Point(95, 201); + this.flowmeter5ComboBox.Name = "flowmeter5ComboBox"; + this.flowmeter5ComboBox.Size = new System.Drawing.Size(69, 21); + this.flowmeter5ComboBox.TabIndex = 36; + // + // flowmeter5Label + // + this.flowmeter5Label.AutoSize = true; + this.flowmeter5Label.Location = new System.Drawing.Point(15, 204); + this.flowmeter5Label.Name = "flowmeter5Label"; + this.flowmeter5Label.Size = new System.Drawing.Size(64, 13); + this.flowmeter5Label.TabIndex = 35; + this.flowmeter5Label.Text = "Flowmeter 5"; + // + // flowm5Rng0CheckBox + // + this.flowm5Rng0CheckBox.AutoSize = true; + this.flowm5Rng0CheckBox.Enabled = false; + this.flowm5Rng0CheckBox.Location = new System.Drawing.Point(196, 204); + this.flowm5Rng0CheckBox.Name = "flowm5Rng0CheckBox"; + this.flowm5Rng0CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm5Rng0CheckBox.TabIndex = 37; + this.flowm5Rng0CheckBox.Text = "0"; + this.flowm5Rng0CheckBox.UseVisualStyleBackColor = true; + // + // flowm4Rng0CheckBox + // + this.flowm4Rng0CheckBox.AutoSize = true; + this.flowm4Rng0CheckBox.Enabled = false; + this.flowm4Rng0CheckBox.Location = new System.Drawing.Point(196, 177); + this.flowm4Rng0CheckBox.Name = "flowm4Rng0CheckBox"; + this.flowm4Rng0CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm4Rng0CheckBox.TabIndex = 29; + this.flowm4Rng0CheckBox.Text = "0"; + this.flowm4Rng0CheckBox.UseVisualStyleBackColor = true; + // + // flowm3Rng0CheckBox + // + this.flowm3Rng0CheckBox.AutoSize = true; + this.flowm3Rng0CheckBox.Enabled = false; + this.flowm3Rng0CheckBox.Location = new System.Drawing.Point(196, 150); + this.flowm3Rng0CheckBox.Name = "flowm3Rng0CheckBox"; + this.flowm3Rng0CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm3Rng0CheckBox.TabIndex = 21; + this.flowm3Rng0CheckBox.Text = "0"; + this.flowm3Rng0CheckBox.UseVisualStyleBackColor = true; + // + // flowm2Rng0CheckBox + // + this.flowm2Rng0CheckBox.AutoSize = true; + this.flowm2Rng0CheckBox.Enabled = false; + this.flowm2Rng0CheckBox.Location = new System.Drawing.Point(196, 123); + this.flowm2Rng0CheckBox.Name = "flowm2Rng0CheckBox"; + this.flowm2Rng0CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm2Rng0CheckBox.TabIndex = 13; + this.flowm2Rng0CheckBox.Text = "0"; + this.flowm2Rng0CheckBox.UseVisualStyleBackColor = true; + // + // flowm1Rng0CheckBox + // + this.flowm1Rng0CheckBox.AutoSize = true; + this.flowm1Rng0CheckBox.Enabled = false; + this.flowm1Rng0CheckBox.Location = new System.Drawing.Point(196, 96); + this.flowm1Rng0CheckBox.Name = "flowm1Rng0CheckBox"; + this.flowm1Rng0CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm1Rng0CheckBox.TabIndex = 5; + this.flowm1Rng0CheckBox.Text = "0"; + this.flowm1Rng0CheckBox.UseVisualStyleBackColor = true; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(193, 72); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(179, 13); + this.label1.TabIndex = 43; + this.label1.Text = "Ranges to calibrate (either 0 or 1...5)"; + // + // flowm6Rng0CheckBox + // + this.flowm6Rng0CheckBox.AutoSize = true; + this.flowm6Rng0CheckBox.Enabled = false; + this.flowm6Rng0CheckBox.Location = new System.Drawing.Point(196, 231); + this.flowm6Rng0CheckBox.Name = "flowm6Rng0CheckBox"; + this.flowm6Rng0CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm6Rng0CheckBox.TabIndex = 46; + this.flowm6Rng0CheckBox.Text = "0"; + this.flowm6Rng0CheckBox.UseVisualStyleBackColor = true; + // + // flowm6Rng5CheckBox + // + this.flowm6Rng5CheckBox.AutoSize = true; + this.flowm6Rng5CheckBox.Enabled = false; + this.flowm6Rng5CheckBox.Location = new System.Drawing.Point(365, 231); + this.flowm6Rng5CheckBox.Name = "flowm6Rng5CheckBox"; + this.flowm6Rng5CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm6Rng5CheckBox.TabIndex = 51; + this.flowm6Rng5CheckBox.Text = "5"; + this.flowm6Rng5CheckBox.UseVisualStyleBackColor = true; + // + // flowm6Rng4CheckBox + // + this.flowm6Rng4CheckBox.AutoSize = true; + this.flowm6Rng4CheckBox.Enabled = false; + this.flowm6Rng4CheckBox.Location = new System.Drawing.Point(335, 231); + this.flowm6Rng4CheckBox.Name = "flowm6Rng4CheckBox"; + this.flowm6Rng4CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm6Rng4CheckBox.TabIndex = 50; + this.flowm6Rng4CheckBox.Text = "4"; + this.flowm6Rng4CheckBox.UseVisualStyleBackColor = true; + // + // flowm6Rng3CheckBox + // + this.flowm6Rng3CheckBox.AutoSize = true; + this.flowm6Rng3CheckBox.Enabled = false; + this.flowm6Rng3CheckBox.Location = new System.Drawing.Point(305, 231); + this.flowm6Rng3CheckBox.Name = "flowm6Rng3CheckBox"; + this.flowm6Rng3CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm6Rng3CheckBox.TabIndex = 49; + this.flowm6Rng3CheckBox.Text = "3"; + this.flowm6Rng3CheckBox.UseVisualStyleBackColor = true; + // + // flowm6Rng2CheckBox + // + this.flowm6Rng2CheckBox.AutoSize = true; + this.flowm6Rng2CheckBox.Enabled = false; + this.flowm6Rng2CheckBox.Location = new System.Drawing.Point(275, 231); + this.flowm6Rng2CheckBox.Name = "flowm6Rng2CheckBox"; + this.flowm6Rng2CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm6Rng2CheckBox.TabIndex = 48; + this.flowm6Rng2CheckBox.Text = "2"; + this.flowm6Rng2CheckBox.UseVisualStyleBackColor = true; + // + // flowm6Rng1CheckBox + // + this.flowm6Rng1CheckBox.AutoSize = true; + this.flowm6Rng1CheckBox.Enabled = false; + this.flowm6Rng1CheckBox.Location = new System.Drawing.Point(245, 231); + this.flowm6Rng1CheckBox.Name = "flowm6Rng1CheckBox"; + this.flowm6Rng1CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm6Rng1CheckBox.TabIndex = 47; + this.flowm6Rng1CheckBox.Text = "1"; + this.flowm6Rng1CheckBox.UseVisualStyleBackColor = true; + // + // flowmeter6ComboBox + // + this.flowmeter6ComboBox.Enabled = false; + this.flowmeter6ComboBox.FormattingEnabled = true; + this.flowmeter6ComboBox.Location = new System.Drawing.Point(95, 228); + this.flowmeter6ComboBox.Name = "flowmeter6ComboBox"; + this.flowmeter6ComboBox.Size = new System.Drawing.Size(69, 21); + this.flowmeter6ComboBox.TabIndex = 45; + // + // flowmeter6Label + // + this.flowmeter6Label.AutoSize = true; + this.flowmeter6Label.Location = new System.Drawing.Point(15, 231); + this.flowmeter6Label.Name = "flowmeter6Label"; + this.flowmeter6Label.Size = new System.Drawing.Size(64, 13); + this.flowmeter6Label.TabIndex = 44; + this.flowmeter6Label.Text = "Flowmeter 6"; + // + // flowm7Rng0CheckBox + // + this.flowm7Rng0CheckBox.AutoSize = true; + this.flowm7Rng0CheckBox.Enabled = false; + this.flowm7Rng0CheckBox.Location = new System.Drawing.Point(196, 258); + this.flowm7Rng0CheckBox.Name = "flowm7Rng0CheckBox"; + this.flowm7Rng0CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm7Rng0CheckBox.TabIndex = 54; + this.flowm7Rng0CheckBox.Text = "0"; + this.flowm7Rng0CheckBox.UseVisualStyleBackColor = true; + // + // flowm7Rng5CheckBox + // + this.flowm7Rng5CheckBox.AutoSize = true; + this.flowm7Rng5CheckBox.Enabled = false; + this.flowm7Rng5CheckBox.Location = new System.Drawing.Point(365, 258); + this.flowm7Rng5CheckBox.Name = "flowm7Rng5CheckBox"; + this.flowm7Rng5CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm7Rng5CheckBox.TabIndex = 59; + this.flowm7Rng5CheckBox.Text = "5"; + this.flowm7Rng5CheckBox.UseVisualStyleBackColor = true; + // + // flowm7Rng4CheckBox + // + this.flowm7Rng4CheckBox.AutoSize = true; + this.flowm7Rng4CheckBox.Enabled = false; + this.flowm7Rng4CheckBox.Location = new System.Drawing.Point(335, 258); + this.flowm7Rng4CheckBox.Name = "flowm7Rng4CheckBox"; + this.flowm7Rng4CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm7Rng4CheckBox.TabIndex = 58; + this.flowm7Rng4CheckBox.Text = "4"; + this.flowm7Rng4CheckBox.UseVisualStyleBackColor = true; + // + // flowm7Rng3CheckBox + // + this.flowm7Rng3CheckBox.AutoSize = true; + this.flowm7Rng3CheckBox.Enabled = false; + this.flowm7Rng3CheckBox.Location = new System.Drawing.Point(305, 258); + this.flowm7Rng3CheckBox.Name = "flowm7Rng3CheckBox"; + this.flowm7Rng3CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm7Rng3CheckBox.TabIndex = 57; + this.flowm7Rng3CheckBox.Text = "3"; + this.flowm7Rng3CheckBox.UseVisualStyleBackColor = true; + // + // flowm7Rng2CheckBox + // + this.flowm7Rng2CheckBox.AutoSize = true; + this.flowm7Rng2CheckBox.Enabled = false; + this.flowm7Rng2CheckBox.Location = new System.Drawing.Point(275, 258); + this.flowm7Rng2CheckBox.Name = "flowm7Rng2CheckBox"; + this.flowm7Rng2CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm7Rng2CheckBox.TabIndex = 56; + this.flowm7Rng2CheckBox.Text = "2"; + this.flowm7Rng2CheckBox.UseVisualStyleBackColor = true; + // + // flowm7Rng1CheckBox + // + this.flowm7Rng1CheckBox.AutoSize = true; + this.flowm7Rng1CheckBox.Enabled = false; + this.flowm7Rng1CheckBox.Location = new System.Drawing.Point(245, 258); + this.flowm7Rng1CheckBox.Name = "flowm7Rng1CheckBox"; + this.flowm7Rng1CheckBox.Size = new System.Drawing.Size(32, 17); + this.flowm7Rng1CheckBox.TabIndex = 55; + this.flowm7Rng1CheckBox.Text = "1"; + this.flowm7Rng1CheckBox.UseVisualStyleBackColor = true; + // + // flowmeter7ComboBox + // + this.flowmeter7ComboBox.Enabled = false; + this.flowmeter7ComboBox.FormattingEnabled = true; + this.flowmeter7ComboBox.Location = new System.Drawing.Point(95, 255); + this.flowmeter7ComboBox.Name = "flowmeter7ComboBox"; + this.flowmeter7ComboBox.Size = new System.Drawing.Size(69, 21); + this.flowmeter7ComboBox.TabIndex = 53; + // + // flowmeter7Label + // + this.flowmeter7Label.AutoSize = true; + this.flowmeter7Label.Location = new System.Drawing.Point(15, 258); + this.flowmeter7Label.Name = "flowmeter7Label"; + this.flowmeter7Label.Size = new System.Drawing.Size(64, 13); + this.flowmeter7Label.TabIndex = 52; + this.flowmeter7Label.Text = "Flowmeter 7"; // // SaveFlowmeterCorrCfgCtrl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.flowmeterComboBox); - this.Controls.Add(this.rangeIdTextBox); - this.Controls.Add(this.rangeIdLabel); - this.Controls.Add(this.flowmeterLabel); + this.Controls.Add(this.flowm7Rng0CheckBox); + this.Controls.Add(this.flowm7Rng5CheckBox); + this.Controls.Add(this.flowm7Rng4CheckBox); + this.Controls.Add(this.flowm7Rng3CheckBox); + this.Controls.Add(this.flowm7Rng2CheckBox); + this.Controls.Add(this.flowm7Rng1CheckBox); + this.Controls.Add(this.flowmeter7ComboBox); + this.Controls.Add(this.flowmeter7Label); + this.Controls.Add(this.flowm6Rng0CheckBox); + this.Controls.Add(this.flowm6Rng5CheckBox); + this.Controls.Add(this.flowm6Rng4CheckBox); + this.Controls.Add(this.flowm6Rng3CheckBox); + this.Controls.Add(this.flowm6Rng2CheckBox); + this.Controls.Add(this.flowm6Rng1CheckBox); + this.Controls.Add(this.flowmeter6ComboBox); + this.Controls.Add(this.flowmeter6Label); + this.Controls.Add(this.label1); + this.Controls.Add(this.flowm5Rng0CheckBox); + this.Controls.Add(this.flowm4Rng0CheckBox); + this.Controls.Add(this.flowm3Rng0CheckBox); + this.Controls.Add(this.flowm2Rng0CheckBox); + this.Controls.Add(this.flowm1Rng0CheckBox); + this.Controls.Add(this.flowm5Rng5CheckBox); + this.Controls.Add(this.flowm5Rng4CheckBox); + this.Controls.Add(this.flowm5Rng3CheckBox); + this.Controls.Add(this.flowm5Rng2CheckBox); + this.Controls.Add(this.flowm5Rng1CheckBox); + this.Controls.Add(this.flowmeter5ComboBox); + this.Controls.Add(this.flowmeter5Label); + this.Controls.Add(this.flowm4Rng5CheckBox); + this.Controls.Add(this.flowm4Rng4CheckBox); + this.Controls.Add(this.flowm4Rng3CheckBox); + this.Controls.Add(this.flowm4Rng2CheckBox); + this.Controls.Add(this.flowm4Rng1CheckBox); + this.Controls.Add(this.flowmeter4ComboBox); + this.Controls.Add(this.flowmeter4Label); + this.Controls.Add(this.flowm3Rng5CheckBox); + this.Controls.Add(this.flowm3Rng4CheckBox); + this.Controls.Add(this.flowm3Rng3CheckBox); + this.Controls.Add(this.flowm3Rng2CheckBox); + this.Controls.Add(this.flowm3Rng1CheckBox); + this.Controls.Add(this.flowmeter3ComboBox); + this.Controls.Add(this.flowmeter3Label); + this.Controls.Add(this.flowm2Rng5CheckBox); + this.Controls.Add(this.flowm2Rng4CheckBox); + this.Controls.Add(this.flowm2Rng3CheckBox); + this.Controls.Add(this.flowm2Rng2CheckBox); + this.Controls.Add(this.flowm2Rng1CheckBox); + this.Controls.Add(this.flowmeter2ComboBox); + this.Controls.Add(this.flowmeter2Label); + this.Controls.Add(this.flowm1Rng5CheckBox); + this.Controls.Add(this.flowm1Rng4CheckBox); + this.Controls.Add(this.flowm1Rng3CheckBox); + this.Controls.Add(this.flowm1Rng2CheckBox); + this.Controls.Add(this.flowm1Rng1CheckBox); + this.Controls.Add(this.flowmeter1ComboBox); + this.Controls.Add(this.flowmeter1Label); this.Controls.Add(this.nameTextBox); this.Controls.Add(this.nameLabel); this.Controls.Add(this.classNameLabel); this.Name = "SaveFlowmeterCorrCfgCtrl"; - this.Size = new System.Drawing.Size(450, 230); + this.Size = new System.Drawing.Size(450, 300); this.Load += new System.EventHandler(this.WriterCfgCtrl_Load); this.ResumeLayout(false); this.PerformLayout(); @@ -125,9 +793,62 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections private System.Windows.Forms.TextBox nameTextBox; private System.Windows.Forms.Label nameLabel; private System.Windows.Forms.Label classNameLabel; - private System.Windows.Forms.Label flowmeterLabel; - private System.Windows.Forms.TextBox rangeIdTextBox; - private System.Windows.Forms.Label rangeIdLabel; - private System.Windows.Forms.ComboBox flowmeterComboBox; + private System.Windows.Forms.Label flowmeter1Label; + private System.Windows.Forms.ComboBox flowmeter1ComboBox; + private System.Windows.Forms.CheckBox flowm1Rng1CheckBox; + private System.Windows.Forms.CheckBox flowm1Rng2CheckBox; + private System.Windows.Forms.CheckBox flowm1Rng3CheckBox; + private System.Windows.Forms.CheckBox flowm1Rng4CheckBox; + private System.Windows.Forms.CheckBox flowm1Rng5CheckBox; + private System.Windows.Forms.CheckBox flowm2Rng5CheckBox; + private System.Windows.Forms.CheckBox flowm2Rng4CheckBox; + private System.Windows.Forms.CheckBox flowm2Rng3CheckBox; + private System.Windows.Forms.CheckBox flowm2Rng2CheckBox; + private System.Windows.Forms.CheckBox flowm2Rng1CheckBox; + private System.Windows.Forms.ComboBox flowmeter2ComboBox; + private System.Windows.Forms.Label flowmeter2Label; + private System.Windows.Forms.CheckBox flowm3Rng5CheckBox; + private System.Windows.Forms.CheckBox flowm3Rng4CheckBox; + private System.Windows.Forms.CheckBox flowm3Rng3CheckBox; + private System.Windows.Forms.CheckBox flowm3Rng2CheckBox; + private System.Windows.Forms.CheckBox flowm3Rng1CheckBox; + private System.Windows.Forms.ComboBox flowmeter3ComboBox; + private System.Windows.Forms.Label flowmeter3Label; + private System.Windows.Forms.CheckBox flowm4Rng5CheckBox; + private System.Windows.Forms.CheckBox flowm4Rng4CheckBox; + private System.Windows.Forms.CheckBox flowm4Rng3CheckBox; + private System.Windows.Forms.CheckBox flowm4Rng2CheckBox; + private System.Windows.Forms.CheckBox flowm4Rng1CheckBox; + private System.Windows.Forms.ComboBox flowmeter4ComboBox; + private System.Windows.Forms.Label flowmeter4Label; + private System.Windows.Forms.CheckBox flowm5Rng5CheckBox; + private System.Windows.Forms.CheckBox flowm5Rng4CheckBox; + private System.Windows.Forms.CheckBox flowm5Rng3CheckBox; + private System.Windows.Forms.CheckBox flowm5Rng2CheckBox; + private System.Windows.Forms.CheckBox flowm5Rng1CheckBox; + private System.Windows.Forms.ComboBox flowmeter5ComboBox; + private System.Windows.Forms.Label flowmeter5Label; + private System.Windows.Forms.CheckBox flowm5Rng0CheckBox; + private System.Windows.Forms.CheckBox flowm4Rng0CheckBox; + private System.Windows.Forms.CheckBox flowm3Rng0CheckBox; + private System.Windows.Forms.CheckBox flowm2Rng0CheckBox; + private System.Windows.Forms.CheckBox flowm1Rng0CheckBox; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.CheckBox flowm6Rng0CheckBox; + private System.Windows.Forms.CheckBox flowm6Rng5CheckBox; + private System.Windows.Forms.CheckBox flowm6Rng4CheckBox; + private System.Windows.Forms.CheckBox flowm6Rng3CheckBox; + private System.Windows.Forms.CheckBox flowm6Rng2CheckBox; + private System.Windows.Forms.CheckBox flowm6Rng1CheckBox; + private System.Windows.Forms.ComboBox flowmeter6ComboBox; + private System.Windows.Forms.Label flowmeter6Label; + private System.Windows.Forms.CheckBox flowm7Rng0CheckBox; + private System.Windows.Forms.CheckBox flowm7Rng5CheckBox; + private System.Windows.Forms.CheckBox flowm7Rng4CheckBox; + private System.Windows.Forms.CheckBox flowm7Rng3CheckBox; + private System.Windows.Forms.CheckBox flowm7Rng2CheckBox; + private System.Windows.Forms.CheckBox flowm7Rng1CheckBox; + private System.Windows.Forms.ComboBox flowmeter7ComboBox; + private System.Windows.Forms.Label flowmeter7Label; } } diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index a7720121d..7697aa823 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.815.0")] -[assembly: AssemblyFileVersion("2.18.815.0")] +[assembly: AssemblyVersion("2.18.816.0")] +[assembly: AssemblyFileVersion("2.18.816.0")]