From c187dc9abfb0466c2fcaa413e2778c7fe0e91560 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 15 Sep 2014 22:00:30 +0200 Subject: [PATCH] - FlyingStart with corrections - FlowMeterCouple -> FlowMeterTwins --- .../BenchControl/Elde/FlowMeter/FlowMeter.cs | 5 +- .../FlowMeter.cs | 18 +++-- .../FlowMeterCfg.cs | 12 ++-- .../FlowMeterCfgCtrl.Designer.cs | 72 +++++++++++++++---- .../FlowMeterCfgCtrl.cs | 29 ++++++-- .../FlowMeterCfgCtrl.resx | 0 .../FlowMeterFactory.cs | 6 +- .../ReadFlowOp.cs | 2 +- .../BenchControl/Elde/RegulValve/SetFlowOp.cs | 2 +- .../BenchControl/Elde/StartMeasurementOp.cs | 2 +- .../BenchControl/TbfComponents.cs | 2 +- .../TestMethods/FlyingStart/FlyingStartSeq.cs | 2 +- TestBenchFramework/MainWnd.cs | 3 +- TestBenchFramework/MetrologyDlg.cs | 10 +-- TestBenchFramework/TBF.csproj | 14 ++-- 15 files changed, 132 insertions(+), 47 deletions(-) rename TestBenchFramework/BenchControl/Elde/{FlowMeterCouple => FlowMeterTwins}/FlowMeter.cs (71%) rename TestBenchFramework/BenchControl/Elde/{FlowMeterCouple => FlowMeterTwins}/FlowMeterCfg.cs (69%) rename TestBenchFramework/BenchControl/Elde/{FlowMeterCouple => FlowMeterTwins}/FlowMeterCfgCtrl.Designer.cs (64%) rename TestBenchFramework/BenchControl/Elde/{FlowMeterCouple => FlowMeterTwins}/FlowMeterCfgCtrl.cs (61%) rename TestBenchFramework/BenchControl/Elde/{FlowMeterCouple => FlowMeterTwins}/FlowMeterCfgCtrl.resx (100%) rename TestBenchFramework/BenchControl/Elde/{FlowMeterCouple => FlowMeterTwins}/FlowMeterFactory.cs (85%) rename TestBenchFramework/BenchControl/Elde/{FlowMeterCouple => FlowMeterTwins}/ReadFlowOp.cs (97%) diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeter.cs b/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeter.cs index 896181551..23104531a 100644 --- a/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeter.cs +++ b/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeter.cs @@ -36,8 +36,9 @@ namespace TBF.BenchControl.Elde.FlowMeter public float LtrPerPulseCorrected(float flow) { - return LtrPerPulse; /// TODO: apply correction - //float corrected = BenchControl.Formulas.CorrectedValue(flow, meterEntity.Corrections); + //return LtrPerPulse; /// TODO: apply correction + float correctedFlow = BenchControl.Formulas.CorrectedValue(flow, Corrections); + return LtrPerPulse * correctedFlow / flow; } diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeter.cs b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs similarity index 71% rename from TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeter.cs rename to TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs index 2bb836c78..27e39ab56 100644 --- a/TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeter.cs +++ b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using log4net; using TBF.Boxes; -namespace TBF.BenchControl.Elde.FlowMeterCouple +namespace TBF.BenchControl.Elde.FlowMeterTwins { public class FlowMeter : Generic.IComponent, GenericDevices.IFlowMeter { @@ -27,16 +27,20 @@ namespace TBF.BenchControl.Elde.FlowMeterCouple public IList Corrections { get { return flowMeterCfg.Corrections; } } public readonly ControlBoardDev ControlBoard; - + public readonly TBF.BenchControl.Elde.FlowMeter.FlowMeter FlowMeter1; + public readonly TBF.BenchControl.Elde.FlowMeter.FlowMeter FlowMeter2; readonly float nominalFlow; public float NominalFlow { get { return nominalFlow; } } - public float LtrPerPulse { get { return nominalFlow / 14400.0f; } } /// Assuming the nominal flowed is reached at 4000Hz + /// The nominal flowed of a pair of flow meters is reached at 4000Hz + public float LtrPerPulse { get { return nominalFlow / 14400.0f; } } + /// Calculates the average of values of two flowmeters. Assumes the flow is divided evenly. public float LtrPerPulseCorrected(float flow) { - return LtrPerPulse; /// TODO: apply correction + float flow2 = flow / 2; + return (FlowMeter1.LtrPerPulseCorrected(flow2) + FlowMeter2.LtrPerPulseCorrected(flow2)) / 2; } @@ -48,6 +52,12 @@ namespace TBF.BenchControl.Elde.FlowMeterCouple ControlBoard = (ControlBoardDev)TbfComponents.FindComponent(cfg.ParentName, components); if (ControlBoard == null) throw new Exception("Cannot find " + Name + " parent"); + FlowMeter1 = (TBF.BenchControl.Elde.FlowMeter.FlowMeter)TbfComponents.FindComponent(flowMeterCfg.FlowMeter1, components); + if (FlowMeter1 == null) throw new Exception("Cannot find FlowMeter1 component"); + + FlowMeter2 = (TBF.BenchControl.Elde.FlowMeter.FlowMeter)TbfComponents.FindComponent(flowMeterCfg.FlowMeter2, components); + if (FlowMeter2 == null) throw new Exception("Cannot find FlowMeter2 component"); + nominalFlow = cfg.NominalFlow; ControlBoard.EtCalib[Idx1] = NominalFlow; diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeterCfg.cs b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfg.cs similarity index 69% rename from TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeterCfg.cs rename to TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfg.cs index 0d106defe..415483f2b 100644 --- a/TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeterCfg.cs +++ b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfg.cs @@ -3,11 +3,13 @@ using System.IO; using System.Xml.Serialization; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.Elde.FlowMeterCouple +namespace TBF.BenchControl.Elde.FlowMeterTwins { public class FlowMeterCfg : ComponentCfgBase, Generic.IChildComponentCfg { public float NominalFlow; /// Nominal flow in m3/h at output frequency 2000 Hz + public string FlowMeter1; /// Name of the flow meter 1 component + public string FlowMeter2; /// Name of the flow meter 2 component /// Parameterless constructor public FlowMeterCfg() @@ -20,20 +22,22 @@ namespace TBF.BenchControl.Elde.FlowMeterCouple /// Flow meter name /// Parent component name /// Nominal flow/param> - public FlowMeterCfg(IComponentFactory factory, string name, string parentName, float nominalFlow) + public FlowMeterCfg(IComponentFactory factory, string name, string parentName, float nominalFlow, string flowMeter1, string flowMeter2) : base(factory, name, parentName) { this.NominalFlow = nominalFlow; + this.FlowMeter1 = flowMeter1; + this.FlowMeter2 = flowMeter2; } public IComponentCfg Clone() { - return new FlowMeterCfg(Factory, Name, ParentName, NominalFlow); + return new FlowMeterCfg(Factory, Name, ParentName, NominalFlow, FlowMeter1, FlowMeter2); } public string ToString(int i) { - return string.Format("nominalFlow={0}", NominalFlow); + return string.Format("nominalFlow={0}, flowmeter#1={1}, flowmeter#2={2}", NominalFlow, FlowMeter1, FlowMeter2); } public TBF.Entities.Component CreateDbEntity() diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeterCfgCtrl.Designer.cs b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.Designer.cs similarity index 64% rename from TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeterCfgCtrl.Designer.cs rename to TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.Designer.cs index 2fa5c0785..5b6e0fc3f 100644 --- a/TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeterCfgCtrl.Designer.cs +++ b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.Designer.cs @@ -1,4 +1,4 @@ -namespace TBF.BenchControl.Elde.FlowMeterCouple +namespace TBF.BenchControl.Elde.FlowMeterTwins { partial class FlowMeterCfgCtrl { @@ -35,12 +35,16 @@ this.nominalFlowTextBox = new System.Windows.Forms.TextBox(); this.nominalFlowLabel = new System.Windows.Forms.Label(); this.parentNameComboBox = new System.Windows.Forms.ComboBox(); + this.flowMeter1ComboBox = new System.Windows.Forms.ComboBox(); + this.flowMeter1Label = new System.Windows.Forms.Label(); + this.flowMeter2ComboBox = new System.Windows.Forms.ComboBox(); + this.flowMeter2Label = new System.Windows.Forms.Label(); this.SuspendLayout(); // // parentNameLabel // this.parentNameLabel.AutoSize = true; - this.parentNameLabel.Location = new System.Drawing.Point(30, 90); + this.parentNameLabel.Location = new System.Drawing.Point(30, 72); this.parentNameLabel.Name = "parentNameLabel"; this.parentNameLabel.Size = new System.Drawing.Size(69, 13); this.parentNameLabel.TabIndex = 3; @@ -49,7 +53,7 @@ // nameTextBox // this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(140, 61); + this.nameTextBox.Location = new System.Drawing.Point(140, 43); this.nameTextBox.Name = "nameTextBox"; this.nameTextBox.Size = new System.Drawing.Size(130, 20); this.nameTextBox.TabIndex = 2; @@ -57,7 +61,7 @@ // nameLabel // this.nameLabel.AutoSize = true; - this.nameLabel.Location = new System.Drawing.Point(30, 64); + this.nameLabel.Location = new System.Drawing.Point(30, 46); this.nameLabel.Name = "nameLabel"; this.nameLabel.Size = new System.Drawing.Size(35, 13); this.nameLabel.TabIndex = 1; @@ -66,7 +70,7 @@ // classNameLabel // this.classNameLabel.AutoSize = true; - this.classNameLabel.Location = new System.Drawing.Point(137, 37); + this.classNameLabel.Location = new System.Drawing.Point(137, 19); this.classNameLabel.Name = "classNameLabel"; this.classNameLabel.Size = new System.Drawing.Size(83, 13); this.classNameLabel.TabIndex = 0; @@ -75,33 +79,73 @@ // nominalFlowTextBox // this.nominalFlowTextBox.Enabled = false; - this.nominalFlowTextBox.Location = new System.Drawing.Point(224, 138); + this.nominalFlowTextBox.Location = new System.Drawing.Point(224, 150); this.nominalFlowTextBox.Name = "nominalFlowTextBox"; this.nominalFlowTextBox.Size = new System.Drawing.Size(46, 20); - this.nominalFlowTextBox.TabIndex = 8; + this.nominalFlowTextBox.TabIndex = 10; // // nominalFlowLabel // this.nominalFlowLabel.AutoSize = true; - this.nominalFlowLabel.Location = new System.Drawing.Point(30, 141); + this.nominalFlowLabel.Location = new System.Drawing.Point(30, 153); this.nominalFlowLabel.Name = "nominalFlowLabel"; - this.nominalFlowLabel.Size = new System.Drawing.Size(140, 13); - this.nominalFlowLabel.TabIndex = 7; - this.nominalFlowLabel.Text = "Nominal flow [m3/h @2kHz]"; + this.nominalFlowLabel.Size = new System.Drawing.Size(179, 13); + this.nominalFlowLabel.TabIndex = 9; + this.nominalFlowLabel.Text = "Sum of nominal flows [m3/h @4kHz]"; // // parentNameComboBox // this.parentNameComboBox.Enabled = false; this.parentNameComboBox.FormattingEnabled = true; - this.parentNameComboBox.Location = new System.Drawing.Point(140, 87); + this.parentNameComboBox.Location = new System.Drawing.Point(140, 69); this.parentNameComboBox.Name = "parentNameComboBox"; this.parentNameComboBox.Size = new System.Drawing.Size(130, 21); this.parentNameComboBox.TabIndex = 4; // + // flowMeter1ComboBox + // + this.flowMeter1ComboBox.Enabled = false; + this.flowMeter1ComboBox.FormattingEnabled = true; + this.flowMeter1ComboBox.Location = new System.Drawing.Point(140, 96); + this.flowMeter1ComboBox.Name = "flowMeter1ComboBox"; + this.flowMeter1ComboBox.Size = new System.Drawing.Size(130, 21); + this.flowMeter1ComboBox.TabIndex = 6; + // + // flowMeter1Label + // + this.flowMeter1Label.AutoSize = true; + this.flowMeter1Label.Location = new System.Drawing.Point(30, 99); + this.flowMeter1Label.Name = "flowMeter1Label"; + this.flowMeter1Label.Size = new System.Drawing.Size(68, 13); + this.flowMeter1Label.TabIndex = 5; + this.flowMeter1Label.Text = "Flow Meter 1"; + // + // flowMeter2ComboBox + // + this.flowMeter2ComboBox.Enabled = false; + this.flowMeter2ComboBox.FormattingEnabled = true; + this.flowMeter2ComboBox.Location = new System.Drawing.Point(140, 123); + this.flowMeter2ComboBox.Name = "flowMeter2ComboBox"; + this.flowMeter2ComboBox.Size = new System.Drawing.Size(130, 21); + this.flowMeter2ComboBox.TabIndex = 8; + // + // flowMeter2Label + // + this.flowMeter2Label.AutoSize = true; + this.flowMeter2Label.Location = new System.Drawing.Point(30, 126); + this.flowMeter2Label.Name = "flowMeter2Label"; + this.flowMeter2Label.Size = new System.Drawing.Size(68, 13); + this.flowMeter2Label.TabIndex = 7; + this.flowMeter2Label.Text = "Flow Meter 2"; + // // FlowMeterCfgCtrl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.flowMeter2ComboBox); + this.Controls.Add(this.flowMeter2Label); + this.Controls.Add(this.flowMeter1ComboBox); + this.Controls.Add(this.flowMeter1Label); this.Controls.Add(this.parentNameComboBox); this.Controls.Add(this.nominalFlowTextBox); this.Controls.Add(this.nominalFlowLabel); @@ -126,5 +170,9 @@ private System.Windows.Forms.TextBox nominalFlowTextBox; private System.Windows.Forms.Label nominalFlowLabel; private System.Windows.Forms.ComboBox parentNameComboBox; + private System.Windows.Forms.ComboBox flowMeter1ComboBox; + private System.Windows.Forms.Label flowMeter1Label; + private System.Windows.Forms.ComboBox flowMeter2ComboBox; + private System.Windows.Forms.Label flowMeter2Label; } } diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeterCfgCtrl.cs b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs similarity index 61% rename from TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeterCfgCtrl.cs rename to TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs index 6251f26da..885785beb 100644 --- a/TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeterCfgCtrl.cs +++ b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using log4net; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.Elde.FlowMeterCouple +namespace TBF.BenchControl.Elde.FlowMeterTwins { public partial class FlowMeterCfgCtrl : UserControl, IComponentCfgCtrl { @@ -40,7 +40,12 @@ namespace TBF.BenchControl.Elde.FlowMeterCouple { parentNameComboBox.Items.Add(cmpnt.Name); } - } + if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.FlowMeter.FlowMeterFactory) + { + flowMeter1ComboBox.Items.Add(cmpnt.Name); + flowMeter2ComboBox.Items.Add(cmpnt.Name); + } + } } Redraw(); @@ -53,6 +58,8 @@ namespace TBF.BenchControl.Elde.FlowMeterCouple classNameLabel.Text = config.Factory.ClassName; nameTextBox.Text = config.Name; parentNameComboBox.Text = string.IsNullOrEmpty(config.ParentName) ? "---" : config.ParentName; + flowMeter1ComboBox.Text = string.IsNullOrEmpty(config.FlowMeter1) ? "---" : config.FlowMeter1; + flowMeter2ComboBox.Text = string.IsNullOrEmpty(config.FlowMeter2) ? "---" : config.FlowMeter2; nominalFlowTextBox.Text = config.NominalFlow.ToString(); } @@ -60,7 +67,9 @@ namespace TBF.BenchControl.Elde.FlowMeterCouple { nameTextBox.Enabled = true; parentNameComboBox.Enabled = true; - nominalFlowTextBox.Enabled = true; + flowMeter1ComboBox.Enabled = true; + flowMeter2ComboBox.Enabled = true; + nominalFlowTextBox.Enabled = true; } public CfgVerifyFlags VerifyCfg(ref string message) @@ -72,6 +81,16 @@ namespace TBF.BenchControl.Elde.FlowMeterCouple flags |= CfgVerifyFlags.Error; message += Environment.NewLine + "Invalid 'Parent Name'"; } + if (!flowMeter1ComboBox.Items.Contains(flowMeter1ComboBox.Text)) + { + flags |= CfgVerifyFlags.Error; + message += Environment.NewLine + "Invalid 'Flow Meter 1'"; + } + if (!flowMeter2ComboBox.Items.Contains(flowMeter2ComboBox.Text)) + { + flags |= CfgVerifyFlags.Error; + message += Environment.NewLine + "Invalid 'Flow Meter 2'"; + } float fdummy; if (!Utils.TryParseUFloat(nominalFlowTextBox.Text, out fdummy) || fdummy < 0.2 || fdummy > 1600) { @@ -87,7 +106,9 @@ namespace TBF.BenchControl.Elde.FlowMeterCouple config.Name = nameTextBox.Text; config.ParentName = parentNameComboBox.Text.Equals("---") ? string.Empty : parentNameComboBox.Text; - Utils.TryParseUFloat(nominalFlowTextBox.Text, out config.NominalFlow); + config.FlowMeter1 = flowMeter1ComboBox.Text.Equals("---") ? string.Empty : flowMeter1ComboBox.Text; + config.FlowMeter2 = flowMeter2ComboBox.Text.Equals("---") ? string.Empty : flowMeter2ComboBox.Text; + Utils.TryParseUFloat(nominalFlowTextBox.Text, out config.NominalFlow); } } } diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeterCfgCtrl.resx b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeterCfgCtrl.resx rename to TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeterFactory.cs b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterFactory.cs similarity index 85% rename from TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeterFactory.cs rename to TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterFactory.cs index d7e5d1dfa..c31507aef 100644 --- a/TestBenchFramework/BenchControl/Elde/FlowMeterCouple/FlowMeterFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterFactory.cs @@ -4,11 +4,11 @@ using System.Linq; using System.Text; using TBF.BenchControl.Generic; -namespace TBF.BenchControl.Elde.FlowMeterCouple +namespace TBF.BenchControl.Elde.FlowMeterTwins { public class FlowMeterFactory : IComponentFactory { - public string ClassName { get { return "FlowMeterCouple"; } } + public string ClassName { get { return "FlowMeterTwins"; } } public bool HasProcedureParams { get { return false; } } public bool HasTestParams { get { return false; } } public IParamsProvider GetTestParams(Entities.ComponentTest testParams) { return null; } @@ -20,7 +20,7 @@ namespace TBF.BenchControl.Elde.FlowMeterCouple public IComponentCfg DefaultConfig(IList components) { - return new FlowMeterCfg(this, "FlowMeterCouple", "CB", 1600); + return new FlowMeterCfg(this, "FlowMeterTwins", "CB", 1600, "---", "---"); } public IComponentCfgCtrl CreateCfgCtrl() diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterCouple/ReadFlowOp.cs b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/ReadFlowOp.cs similarity index 97% rename from TestBenchFramework/BenchControl/Elde/FlowMeterCouple/ReadFlowOp.cs rename to TestBenchFramework/BenchControl/Elde/FlowMeterTwins/ReadFlowOp.cs index bfbf9df85..42145fdbe 100644 --- a/TestBenchFramework/BenchControl/Elde/FlowMeterCouple/ReadFlowOp.cs +++ b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/ReadFlowOp.cs @@ -2,7 +2,7 @@ using log4net; using TBF.Boxes; -namespace TBF.BenchControl.Elde.FlowMeterCouple +namespace TBF.BenchControl.Elde.FlowMeterTwins { public class ReadFlowOp : IOperation { diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs b/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs index 4657ae8dd..544cce3d6 100644 --- a/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs +++ b/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs @@ -73,7 +73,7 @@ namespace TBF.BenchControl.Elde.RegulValve { this.flowMeterNr = (flowMeter as Elde.FlowMeter.FlowMeter).Idx1; } - else if (flowMeter is Elde.FlowMeterCouple.FlowMeter) + else if (flowMeter is Elde.FlowMeterTwins.FlowMeter) { this.flowMeterNr = 0; } diff --git a/TestBenchFramework/BenchControl/Elde/StartMeasurementOp.cs b/TestBenchFramework/BenchControl/Elde/StartMeasurementOp.cs index f303985e9..e26a19e7f 100644 --- a/TestBenchFramework/BenchControl/Elde/StartMeasurementOp.cs +++ b/TestBenchFramework/BenchControl/Elde/StartMeasurementOp.cs @@ -35,7 +35,7 @@ namespace TBF.BenchControl.Elde { flowMeterIdx = (flowMeter as Elde.FlowMeter.FlowMeter).Idx1; } - else if (flowMeter is Elde.FlowMeterCouple.FlowMeter) + else if (flowMeter is Elde.FlowMeterTwins.FlowMeter) { flowMeterIdx = 0; } diff --git a/TestBenchFramework/BenchControl/TbfComponents.cs b/TestBenchFramework/BenchControl/TbfComponents.cs index 7e7f0b35c..5ddede576 100644 --- a/TestBenchFramework/BenchControl/TbfComponents.cs +++ b/TestBenchFramework/BenchControl/TbfComponents.cs @@ -19,7 +19,7 @@ namespace TBF.BenchControl Factories.Add(new Elde.ControlBoardFactory()); Factories.Add(new Elde.Diverter.DiverterFactory()); Factories.Add(new Elde.FlowMeter.FlowMeterFactory()); - Factories.Add(new Elde.FlowMeterCouple.FlowMeterFactory()); + Factories.Add(new Elde.FlowMeterTwins.FlowMeterFactory()); Factories.Add(new Elde.PressureMeter.PressureMeterFactory()); Factories.Add(new Elde.Pump.PumpFactory()); Factories.Add(new Elde.PumpWithFM.PumpFactory()); diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 15650388d..3ab018380 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -286,7 +286,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart tstRslt.Meters[i].VolumeEnd = 0; /// liter if (sensPath.RegisterReaders[i].PulsesPerLtr <= float.Epsilon) tstRslt.Meters[i].VolumeMeter = 0; else tstRslt.Meters[i].VolumeMeter = Convert.ToSingle(WMPulses[i]) / sensPath.RegisterReaders[i].PulsesPerLtr; - tstRslt.Meters[i].VolumeRef = tstRslt.ConstMaster * WMRefPulses[i]; /// liter + tstRslt.Meters[i].VolumeRef = tstRslt.ConstMaster * WMRefPulses[i]; /// liter tstRslt.Meters[i].PulsesMeter = WMPulses[i]; tstRslt.Meters[i].PulsesMaster = WMRefPulses[i]; tstRslt.Meters[i].Time = cBrd.TTime; diff --git a/TestBenchFramework/MainWnd.cs b/TestBenchFramework/MainWnd.cs index a3eb94304..b3fa58f67 100644 --- a/TestBenchFramework/MainWnd.cs +++ b/TestBenchFramework/MainWnd.cs @@ -383,7 +383,7 @@ namespace TBF private void MainWnd_FormClosing(object sender, FormClosingEventArgs e) { Program.LocalSettings.ManiWndMaximized = (WindowState == FormWindowState.Maximized); - if (WindowState != FormWindowState.Normal) + if (WindowState == FormWindowState.Normal) { Program.LocalSettings.MainWndLeft = Location.X; Program.LocalSettings.MainWndTop = Location.Y; @@ -392,6 +392,7 @@ namespace TBF } else { + /// Maximized or minimized (when restarted, minimized window is restored as normal) Program.LocalSettings.MainWndLeft = RestoreBounds.Left; Program.LocalSettings.MainWndTop = RestoreBounds.Top; Program.LocalSettings.MainWndWidth = RestoreBounds.Width; diff --git a/TestBenchFramework/MetrologyDlg.cs b/TestBenchFramework/MetrologyDlg.cs index d3616e9d1..3d65fe26d 100644 --- a/TestBenchFramework/MetrologyDlg.cs +++ b/TestBenchFramework/MetrologyDlg.cs @@ -57,7 +57,7 @@ namespace TBF factory is BenchControl.MettlerToledo.BalanceNewFactory) { balancesCount++; - TabPage tabPage = new TabPage(" " + Strings.Balance + " " + balancesCount.ToString() + " "); + TabPage tabPage = new TabPage(" " + cmpnt.Name + " "); MetrologyDlgBalanceTab uiControl = new MetrologyDlgBalanceTab(); uiControl.MeterEntity = cmpnt; uiControl.Dock = DockStyle.Fill; @@ -68,8 +68,8 @@ namespace TBF if (factory is BenchControl.Elde.FlowMeter.FlowMeterFactory) { flowMetersCount++; - TabPage tabPage = new TabPage(" " + Strings.Reference + " " + flowMetersCount.ToString() + " "); - MetrologyDlgFlowMeterTab uiControl = new MetrologyDlgFlowMeterTab(); + TabPage tabPage = new TabPage(" " + cmpnt.Name + " "); + MetrologyDlgFlowMeterTab uiControl = new MetrologyDlgFlowMeterTab(); uiControl.MeterEntity = cmpnt; uiControl.Dock = DockStyle.Fill; tabPage.Tag = uiControl; @@ -79,8 +79,8 @@ namespace TBF if (factory is BenchControl.Elde.PressureMeter.PressureMeterFactory) { pressMetersCount++; - TabPage tabPage = new TabPage(" " + Strings.Pressure_meter + pressMetersCount.ToString() + " "); - MetrologyDlgPressMeterTab uiControl = new MetrologyDlgPressMeterTab(); + TabPage tabPage = new TabPage(" " + cmpnt.Name + " "); + MetrologyDlgPressMeterTab uiControl = new MetrologyDlgPressMeterTab(); uiControl.MeterEntity = cmpnt; uiControl.Dock = DockStyle.Fill; tabPage.Tag = uiControl; diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj index aca976054..9a56133bd 100644 --- a/TestBenchFramework/TBF.csproj +++ b/TestBenchFramework/TBF.csproj @@ -203,16 +203,16 @@ EntryFormCfgCtrl.cs - - - + + + UserControl - + FlowMeterCfgCtrl.cs - - + + @@ -925,7 +925,7 @@ DiverterCfgCtrl.cs - + FlowMeterCfgCtrl.cs