diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs index ec8f4d2de..090a59d40 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs @@ -93,6 +93,8 @@ namespace TBF.BenchControl.Elde public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 }; #elif FUZHOU150 public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 }; +#elif FUZHOU300 + public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 }; #endif public uint[] DiverterEdge = new uint[2] { 50, 50 }; public uint[] BalanceRange = new uint[2]; @@ -151,6 +153,8 @@ namespace TBF.BenchControl.Elde ControlComponent3Munich.UserControl1 ctrlBrdComponent, #elif FUZHOU150 ControlComponent3Munich.UserControl1 ctrlBrdComponent, +#elif FUZHOU300 + ControlComponent3Munich.UserControl1 ctrlBrdComponent, #endif float[] tankCapacities) { diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs index 1ca0fd3de..8da92b04a 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs @@ -55,6 +55,8 @@ namespace TBF.BenchControl.Elde private ControlComponent3Munich.UserControl1 ctrlBrdComponent; #elif FUZHOU150 private ControlComponent3Munich.UserControl1 ctrlBrdComponent; +#elif FUZHOU300 + private ControlComponent3Munich.UserControl1 ctrlBrdComponent; #endif /// @@ -67,8 +69,10 @@ namespace TBF.BenchControl.Elde public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent) #elif FUZHOU150 public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent) +#elif FUZHOU300 + public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent) #endif - { + { this.ctrlBrdComponent = ctrlBrdComponent; } @@ -216,10 +220,7 @@ namespace TBF.BenchControl.Elde regConst, shortImp, stopDevs); -#if DN100 - ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods, - filterConstant, fmFreq[0], (uint)regConst, (uint)shortImp, (uint)stopDevs); -#elif MUNICH +#if (DN100 || MUNICH || FUZHOU300) ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods, filterConstant, fmFreq[0], (uint)regConst, (uint)shortImp, (uint)stopDevs); #else diff --git a/TestBenchFramework/BenchControl/Elde/Pump/Pump.cs b/TestBenchFramework/BenchControl/Elde/Pump/Pump.cs index 87f8caa32..a8bfe20c0 100644 --- a/TestBenchFramework/BenchControl/Elde/Pump/Pump.cs +++ b/TestBenchFramework/BenchControl/Elde/Pump/Pump.cs @@ -23,6 +23,8 @@ namespace TBF.BenchControl.Elde.Pump public string Name { get { return pumpCfg.Name; } } + public ValveCategory Category { get { return ValveCategory.Feeding; } } /// Pump category is Feeding + public GenericDevices.IValve CoupledTo { get { return null; } } public bool Invert { get { return false; } } public int LagOpening { get { return 0; } } diff --git a/TestBenchFramework/BenchControl/Elde/PumpWithFM/Pump.cs b/TestBenchFramework/BenchControl/Elde/PumpWithFM/Pump.cs index 48f2eab18..a0cd06fe5 100644 --- a/TestBenchFramework/BenchControl/Elde/PumpWithFM/Pump.cs +++ b/TestBenchFramework/BenchControl/Elde/PumpWithFM/Pump.cs @@ -23,7 +23,9 @@ namespace TBF.BenchControl.Elde.PumpWithFM public string Name { get { return pumpCfg.Name; } } - public GenericDevices.IValve CoupledTo { get { return null; } } + public ValveCategory Category { get { return ValveCategory.Feeding; } } /// Pump category is Feeding + + public GenericDevices.IValve CoupledTo { get { return null; } } public bool Invert { get { return false; } } public int LagOpening { get { return 0; } } public int LagClosing { get { return 0; } } diff --git a/TestBenchFramework/BenchControl/Elde/Valve/Valve.cs b/TestBenchFramework/BenchControl/Elde/Valve/Valve.cs index f6a8cad22..392afb900 100644 --- a/TestBenchFramework/BenchControl/Elde/Valve/Valve.cs +++ b/TestBenchFramework/BenchControl/Elde/Valve/Valve.cs @@ -27,6 +27,7 @@ namespace TBF.BenchControl.Elde.Valve readonly int bitPosition; /// 0 .. 63 public string Name { get { return valveCfg.Name; } } + public ValveCategory Category { get { return valveCfg.Category; } } public IValve CoupledTo { get { return coupledTo; } } public bool Invert { get { return valveCfg.Invert; } } public int LagOpening { get { return valveCfg.LagOpening; } } diff --git a/TestBenchFramework/BenchControl/Elde/Valve/ValveCfg.cs b/TestBenchFramework/BenchControl/Elde/Valve/ValveCfg.cs index 059025cd9..34ed61b0c 100644 --- a/TestBenchFramework/BenchControl/Elde/Valve/ValveCfg.cs +++ b/TestBenchFramework/BenchControl/Elde/Valve/ValveCfg.cs @@ -7,6 +7,7 @@ namespace TBF.BenchControl.Elde.Valve public class ValveCfg : ComponentCfgBase, IChildComponentCfg { public int BitPosition; /// Bit-position + public ValveCategory Category; /// None, Feeding, Bench or Output public string CoupledToName; /// Name of the coupled valve or null public bool Invert; /// The coupled valve has inverted position public int LagOpening; /// Delay (referred to the master valve) when opening this valve in [s] @@ -18,30 +19,37 @@ namespace TBF.BenchControl.Elde.Valve { } /// Constructor 1 - public ValveCfg(IComponentFactory factory, string name, string parentName, int bitPosition, string coupledToName, bool invert, int lagOpening, int lagClosing) + public ValveCfg(IComponentFactory factory, string name, string parentName, int bitPosition, + ValveCategory category, string coupledToName, bool invert, int lagOpening, int lagClosing) : base(factory, name, parentName) { this.BitPosition = bitPosition; + this.Category = category; this.CoupledToName = coupledToName; this.Invert = invert; this.LagOpening = lagOpening; this.LagClosing = lagClosing; } /// Constructor 2 without CoupledTo valve - public ValveCfg(IComponentFactory factory, string name, string parentName, int bitPosition) - : this(factory, name, parentName, bitPosition, null, false, 0, 0) + public ValveCfg(IComponentFactory factory, string name, string parentName, int bitPosition, ValveCategory category) + : this(factory, name, parentName, bitPosition, category, null, false, 0, 0) { } public IComponentCfg Clone() { - return new ValveCfg(Factory, Name, ParentName, BitPosition, CoupledToName, Invert, LagOpening, LagClosing); + return new ValveCfg(Factory, Name, ParentName, BitPosition, Category, CoupledToName, Invert, LagOpening, LagClosing); } - + public string ToString(int i) { - return string.Format("bit={0}, coupledTo={1}, invert={2}, lagOpen={3}, lagClose={4}", - BitPosition, CoupledToName, (Invert ? "yes" : "no"), LagOpening, LagClosing); + return string.Format("bit={0}, cat={1}, coupledTo={2}, invert={3}, lagOpen={4}, lagClose={5}", + BitPosition, + Category, + (string.IsNullOrEmpty(CoupledToName) ? "---" : CoupledToName), + (Invert ? "yes" : "no"), + LagOpening, + LagClosing); } public TBF.Entities.Component CreateDbEntity() diff --git a/TestBenchFramework/BenchControl/Elde/Valve/ValveCfgCtrl.Designer.cs b/TestBenchFramework/BenchControl/Elde/Valve/ValveCfgCtrl.Designer.cs index c1803b628..c88ee3dac 100644 --- a/TestBenchFramework/BenchControl/Elde/Valve/ValveCfgCtrl.Designer.cs +++ b/TestBenchFramework/BenchControl/Elde/Valve/ValveCfgCtrl.Designer.cs @@ -28,169 +28,191 @@ /// private void InitializeComponent() { - this.bitPositionTextBox = new System.Windows.Forms.TextBox(); - this.bitPositionLabel = new System.Windows.Forms.Label(); - this.parentNameLabel = new System.Windows.Forms.Label(); - this.nameTextBox = new System.Windows.Forms.TextBox(); - this.nameLabel = new System.Windows.Forms.Label(); - this.classNameLabel = new System.Windows.Forms.Label(); - this.coupledToLabel = new System.Windows.Forms.Label(); - this.invertCheckBox = new System.Windows.Forms.CheckBox(); - this.parentNameComboBox = new System.Windows.Forms.ComboBox(); - this.lagOpeningLabel = new System.Windows.Forms.Label(); - this.lagClosingLabel = new System.Windows.Forms.Label(); - this.lagOpeningTextBox = new System.Windows.Forms.TextBox(); - this.lagClosingTextBox = new System.Windows.Forms.TextBox(); - this.coupledToComboBox = new System.Windows.Forms.ComboBox(); - this.SuspendLayout(); - // - // bitPositionTextBox - // - this.bitPositionTextBox.Enabled = false; - this.bitPositionTextBox.Location = new System.Drawing.Point(138, 82); - this.bitPositionTextBox.Name = "bitPositionTextBox"; - this.bitPositionTextBox.Size = new System.Drawing.Size(81, 20); - this.bitPositionTextBox.TabIndex = 6; - // - // bitPositionLabel - // - this.bitPositionLabel.AutoSize = true; - this.bitPositionLabel.Location = new System.Drawing.Point(22, 85); - this.bitPositionLabel.Name = "bitPositionLabel"; - this.bitPositionLabel.Size = new System.Drawing.Size(59, 13); - this.bitPositionLabel.TabIndex = 5; - this.bitPositionLabel.Text = "Bit Position"; - // - // parentNameLabel - // - this.parentNameLabel.AutoSize = true; - this.parentNameLabel.Location = new System.Drawing.Point(22, 60); - this.parentNameLabel.Name = "parentNameLabel"; - this.parentNameLabel.Size = new System.Drawing.Size(69, 13); - this.parentNameLabel.TabIndex = 3; - this.parentNameLabel.Text = "Parent Name"; - // - // nameTextBox - // - this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(138, 33); - this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(130, 20); - this.nameTextBox.TabIndex = 2; - // - // nameLabel - // - this.nameLabel.AutoSize = true; - this.nameLabel.Location = new System.Drawing.Point(22, 36); - this.nameLabel.Name = "nameLabel"; - this.nameLabel.Size = new System.Drawing.Size(35, 13); - this.nameLabel.TabIndex = 1; - this.nameLabel.Text = "Name"; - // - // classNameLabel - // - this.classNameLabel.AutoSize = true; - this.classNameLabel.Location = new System.Drawing.Point(136, 13); - this.classNameLabel.Name = "classNameLabel"; - this.classNameLabel.Size = new System.Drawing.Size(83, 13); - this.classNameLabel.TabIndex = 0; - this.classNameLabel.Text = "ComonentName"; - // - // coupledToLabel - // - this.coupledToLabel.AutoSize = true; - this.coupledToLabel.Location = new System.Drawing.Point(22, 124); - this.coupledToLabel.Name = "coupledToLabel"; - this.coupledToLabel.Size = new System.Drawing.Size(56, 13); - this.coupledToLabel.TabIndex = 7; - this.coupledToLabel.Text = "Copled To"; - // - // invertCheckBox - // - this.invertCheckBox.AutoSize = true; - this.invertCheckBox.Enabled = false; - this.invertCheckBox.Location = new System.Drawing.Point(232, 124); - this.invertCheckBox.Name = "invertCheckBox"; - this.invertCheckBox.Size = new System.Drawing.Size(53, 17); - this.invertCheckBox.TabIndex = 9; - this.invertCheckBox.Text = "Invert"; - this.invertCheckBox.UseVisualStyleBackColor = true; - // - // parentNameComboBox - // - this.parentNameComboBox.Enabled = false; - this.parentNameComboBox.FormattingEnabled = true; - this.parentNameComboBox.Location = new System.Drawing.Point(138, 57); - this.parentNameComboBox.Name = "parentNameComboBox"; - this.parentNameComboBox.Size = new System.Drawing.Size(130, 21); - this.parentNameComboBox.TabIndex = 4; - // - // lagOpeningLabel - // - this.lagOpeningLabel.AutoSize = true; - this.lagOpeningLabel.Location = new System.Drawing.Point(22, 147); - this.lagOpeningLabel.Name = "lagOpeningLabel"; - this.lagOpeningLabel.Size = new System.Drawing.Size(109, 13); - this.lagOpeningLabel.TabIndex = 10; - this.lagOpeningLabel.Text = "Lag when opening [s]"; - // - // lagClosingLabel - // - this.lagClosingLabel.AutoSize = true; - this.lagClosingLabel.Location = new System.Drawing.Point(22, 171); - this.lagClosingLabel.Name = "lagClosingLabel"; - this.lagClosingLabel.Size = new System.Drawing.Size(104, 13); - this.lagClosingLabel.TabIndex = 11; - this.lagClosingLabel.Text = "Lag when closing [s]"; - // - // lagOpeningTextBox - // - this.lagOpeningTextBox.Enabled = false; - this.lagOpeningTextBox.Location = new System.Drawing.Point(138, 144); - this.lagOpeningTextBox.Name = "lagOpeningTextBox"; - this.lagOpeningTextBox.Size = new System.Drawing.Size(81, 20); - this.lagOpeningTextBox.TabIndex = 12; - // - // lagClosingTextBox - // - this.lagClosingTextBox.Enabled = false; - this.lagClosingTextBox.Location = new System.Drawing.Point(138, 168); - this.lagClosingTextBox.Name = "lagClosingTextBox"; - this.lagClosingTextBox.Size = new System.Drawing.Size(81, 20); - this.lagClosingTextBox.TabIndex = 13; - // - // coupledToComboBox - // - this.coupledToComboBox.Enabled = false; - this.coupledToComboBox.FormattingEnabled = true; - this.coupledToComboBox.Location = new System.Drawing.Point(138, 121); - this.coupledToComboBox.Name = "coupledToComboBox"; - this.coupledToComboBox.Size = new System.Drawing.Size(81, 21); - this.coupledToComboBox.TabIndex = 14; - // - // ValveCfgCtrl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.coupledToComboBox); - this.Controls.Add(this.lagClosingTextBox); - this.Controls.Add(this.lagOpeningTextBox); - this.Controls.Add(this.lagClosingLabel); - this.Controls.Add(this.lagOpeningLabel); - this.Controls.Add(this.parentNameComboBox); - this.Controls.Add(this.invertCheckBox); - this.Controls.Add(this.coupledToLabel); - this.Controls.Add(this.bitPositionTextBox); - this.Controls.Add(this.bitPositionLabel); - this.Controls.Add(this.parentNameLabel); - this.Controls.Add(this.nameTextBox); - this.Controls.Add(this.nameLabel); - this.Controls.Add(this.classNameLabel); - this.Name = "ValveCfgCtrl"; - this.Size = new System.Drawing.Size(300, 200); - this.Load += new System.EventHandler(this.ValveCfgCtrl_Load); - this.ResumeLayout(false); - this.PerformLayout(); + this.bitPositionTextBox = new System.Windows.Forms.TextBox(); + this.bitPositionLabel = new System.Windows.Forms.Label(); + this.parentNameLabel = new System.Windows.Forms.Label(); + this.nameTextBox = new System.Windows.Forms.TextBox(); + this.nameLabel = new System.Windows.Forms.Label(); + this.classNameLabel = new System.Windows.Forms.Label(); + this.coupledToLabel = new System.Windows.Forms.Label(); + this.invertCheckBox = new System.Windows.Forms.CheckBox(); + this.parentNameComboBox = new System.Windows.Forms.ComboBox(); + this.lagOpeningLabel = new System.Windows.Forms.Label(); + this.lagClosingLabel = new System.Windows.Forms.Label(); + this.lagOpeningTextBox = new System.Windows.Forms.TextBox(); + this.lagClosingTextBox = new System.Windows.Forms.TextBox(); + this.coupledToComboBox = new System.Windows.Forms.ComboBox(); + this.categoryLabel = new System.Windows.Forms.Label(); + this.categoryComboBox = new System.Windows.Forms.ComboBox(); + this.SuspendLayout(); + // + // bitPositionTextBox + // + this.bitPositionTextBox.Enabled = false; + this.bitPositionTextBox.Location = new System.Drawing.Point(138, 77); + this.bitPositionTextBox.Name = "bitPositionTextBox"; + this.bitPositionTextBox.Size = new System.Drawing.Size(81, 20); + this.bitPositionTextBox.TabIndex = 6; + // + // bitPositionLabel + // + this.bitPositionLabel.AutoSize = true; + this.bitPositionLabel.Location = new System.Drawing.Point(22, 80); + this.bitPositionLabel.Name = "bitPositionLabel"; + this.bitPositionLabel.Size = new System.Drawing.Size(59, 13); + this.bitPositionLabel.TabIndex = 5; + this.bitPositionLabel.Text = "Bit Position"; + // + // parentNameLabel + // + this.parentNameLabel.AutoSize = true; + this.parentNameLabel.Location = new System.Drawing.Point(22, 55); + this.parentNameLabel.Name = "parentNameLabel"; + this.parentNameLabel.Size = new System.Drawing.Size(69, 13); + this.parentNameLabel.TabIndex = 3; + this.parentNameLabel.Text = "Parent Name"; + // + // nameTextBox + // + this.nameTextBox.Enabled = false; + this.nameTextBox.Location = new System.Drawing.Point(138, 28); + this.nameTextBox.Name = "nameTextBox"; + this.nameTextBox.Size = new System.Drawing.Size(130, 20); + this.nameTextBox.TabIndex = 2; + // + // nameLabel + // + this.nameLabel.AutoSize = true; + this.nameLabel.Location = new System.Drawing.Point(22, 31); + this.nameLabel.Name = "nameLabel"; + this.nameLabel.Size = new System.Drawing.Size(35, 13); + this.nameLabel.TabIndex = 1; + this.nameLabel.Text = "Name"; + // + // classNameLabel + // + this.classNameLabel.AutoSize = true; + this.classNameLabel.Location = new System.Drawing.Point(136, 8); + this.classNameLabel.Name = "classNameLabel"; + this.classNameLabel.Size = new System.Drawing.Size(83, 13); + this.classNameLabel.TabIndex = 0; + this.classNameLabel.Text = "ComonentName"; + // + // coupledToLabel + // + this.coupledToLabel.AutoSize = true; + this.coupledToLabel.Location = new System.Drawing.Point(22, 128); + this.coupledToLabel.Name = "coupledToLabel"; + this.coupledToLabel.Size = new System.Drawing.Size(56, 13); + this.coupledToLabel.TabIndex = 9; + this.coupledToLabel.Text = "Copled To"; + // + // invertCheckBox + // + this.invertCheckBox.AutoSize = true; + this.invertCheckBox.Enabled = false; + this.invertCheckBox.Location = new System.Drawing.Point(232, 128); + this.invertCheckBox.Name = "invertCheckBox"; + this.invertCheckBox.Size = new System.Drawing.Size(53, 17); + this.invertCheckBox.TabIndex = 11; + this.invertCheckBox.Text = "Invert"; + this.invertCheckBox.UseVisualStyleBackColor = true; + // + // parentNameComboBox + // + this.parentNameComboBox.Enabled = false; + this.parentNameComboBox.FormattingEnabled = true; + this.parentNameComboBox.Location = new System.Drawing.Point(138, 52); + this.parentNameComboBox.Name = "parentNameComboBox"; + this.parentNameComboBox.Size = new System.Drawing.Size(130, 21); + this.parentNameComboBox.TabIndex = 4; + // + // lagOpeningLabel + // + this.lagOpeningLabel.AutoSize = true; + this.lagOpeningLabel.Location = new System.Drawing.Point(22, 153); + this.lagOpeningLabel.Name = "lagOpeningLabel"; + this.lagOpeningLabel.Size = new System.Drawing.Size(109, 13); + this.lagOpeningLabel.TabIndex = 12; + this.lagOpeningLabel.Text = "Lag when opening [s]"; + // + // lagClosingLabel + // + this.lagClosingLabel.AutoSize = true; + this.lagClosingLabel.Location = new System.Drawing.Point(22, 177); + this.lagClosingLabel.Name = "lagClosingLabel"; + this.lagClosingLabel.Size = new System.Drawing.Size(104, 13); + this.lagClosingLabel.TabIndex = 14; + this.lagClosingLabel.Text = "Lag when closing [s]"; + // + // lagOpeningTextBox + // + this.lagOpeningTextBox.Enabled = false; + this.lagOpeningTextBox.Location = new System.Drawing.Point(138, 150); + this.lagOpeningTextBox.Name = "lagOpeningTextBox"; + this.lagOpeningTextBox.Size = new System.Drawing.Size(81, 20); + this.lagOpeningTextBox.TabIndex = 13; + // + // lagClosingTextBox + // + this.lagClosingTextBox.Enabled = false; + this.lagClosingTextBox.Location = new System.Drawing.Point(138, 174); + this.lagClosingTextBox.Name = "lagClosingTextBox"; + this.lagClosingTextBox.Size = new System.Drawing.Size(81, 20); + this.lagClosingTextBox.TabIndex = 15; + // + // coupledToComboBox + // + this.coupledToComboBox.Enabled = false; + this.coupledToComboBox.FormattingEnabled = true; + this.coupledToComboBox.Location = new System.Drawing.Point(138, 125); + this.coupledToComboBox.Name = "coupledToComboBox"; + this.coupledToComboBox.Size = new System.Drawing.Size(81, 21); + this.coupledToComboBox.TabIndex = 10; + // + // categoryLabel + // + this.categoryLabel.AutoSize = true; + this.categoryLabel.Location = new System.Drawing.Point(22, 104); + this.categoryLabel.Name = "categoryLabel"; + this.categoryLabel.Size = new System.Drawing.Size(49, 13); + this.categoryLabel.TabIndex = 7; + this.categoryLabel.Text = "Category"; + // + // categoryComboBox + // + this.categoryComboBox.Enabled = false; + this.categoryComboBox.FormattingEnabled = true; + this.categoryComboBox.Location = new System.Drawing.Point(138, 101); + this.categoryComboBox.Name = "categoryComboBox"; + this.categoryComboBox.Size = new System.Drawing.Size(81, 21); + this.categoryComboBox.TabIndex = 8; + // + // ValveCfgCtrl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.categoryComboBox); + this.Controls.Add(this.categoryLabel); + this.Controls.Add(this.coupledToComboBox); + this.Controls.Add(this.lagClosingTextBox); + this.Controls.Add(this.lagOpeningTextBox); + this.Controls.Add(this.lagClosingLabel); + this.Controls.Add(this.lagOpeningLabel); + this.Controls.Add(this.parentNameComboBox); + this.Controls.Add(this.invertCheckBox); + this.Controls.Add(this.coupledToLabel); + this.Controls.Add(this.bitPositionTextBox); + this.Controls.Add(this.bitPositionLabel); + this.Controls.Add(this.parentNameLabel); + this.Controls.Add(this.nameTextBox); + this.Controls.Add(this.nameLabel); + this.Controls.Add(this.classNameLabel); + this.Name = "ValveCfgCtrl"; + this.Size = new System.Drawing.Size(300, 200); + this.Load += new System.EventHandler(this.ValveCfgCtrl_Load); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -210,5 +232,7 @@ private System.Windows.Forms.TextBox lagOpeningTextBox; private System.Windows.Forms.TextBox lagClosingTextBox; private System.Windows.Forms.ComboBox coupledToComboBox; + private System.Windows.Forms.Label categoryLabel; + private System.Windows.Forms.ComboBox categoryComboBox; } } diff --git a/TestBenchFramework/BenchControl/Elde/Valve/ValveCfgCtrl.cs b/TestBenchFramework/BenchControl/Elde/Valve/ValveCfgCtrl.cs index 28a190ce3..9336aefe8 100644 --- a/TestBenchFramework/BenchControl/Elde/Valve/ValveCfgCtrl.cs +++ b/TestBenchFramework/BenchControl/Elde/Valve/ValveCfgCtrl.cs @@ -31,6 +31,12 @@ namespace TBF.BenchControl.Elde.Valve parent = ParentForm as ComponentParametersDlg; if (parent == null) return; + categoryComboBox.Items.Add(ValveCategory.All.ToString()); + categoryComboBox.Items.Add(ValveCategory.Feeding.ToString()); + categoryComboBox.Items.Add(ValveCategory.Bench.ToString()); + categoryComboBox.Items.Add(ValveCategory.Output.ToString()); + categoryComboBox.Items.Add(ValveCategory.None.ToString()); + if (parent.TbfComponents != null) { parentNameComboBox.Items.Add("---"); @@ -59,6 +65,7 @@ namespace TBF.BenchControl.Elde.Valve nameTextBox.Text = config.Name; parentNameComboBox.Text = string.IsNullOrEmpty(config.ParentName) ? "---" : config.ParentName; bitPositionTextBox.Text = config.BitPosition.ToString(); + categoryComboBox.Text = config.Category.ToString(); coupledToComboBox.Text = string.IsNullOrEmpty(config.CoupledToName) ? "---" : config.CoupledToName; invertCheckBox.Checked = config.Invert; lagOpeningTextBox.Text = config.LagOpening.ToString(); @@ -70,6 +77,7 @@ namespace TBF.BenchControl.Elde.Valve nameTextBox.Enabled = true; parentNameComboBox.Enabled = true; bitPositionTextBox.Enabled = true; + categoryComboBox.Enabled = true; coupledToComboBox.Enabled = true; invertCheckBox.Enabled = true; lagOpeningTextBox.Enabled = true; @@ -83,6 +91,13 @@ namespace TBF.BenchControl.Elde.Valve config.Name = nameTextBox.Text; config.ParentName = parentNameComboBox.Text.Equals("---") ? string.Empty : parentNameComboBox.Text; config.BitPosition = int.Parse(bitPositionTextBox.Text); + + if (categoryComboBox.Text.Equals(ValveCategory.All.ToString())) config.Category = ValveCategory.All; + else if (categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString())) config.Category = ValveCategory.Feeding; + else if (categoryComboBox.Text.Equals(ValveCategory.Bench.ToString())) config.Category = ValveCategory.Bench; + else if (categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) config.Category = ValveCategory.Output; + else config.Category = ValveCategory.None; + config.CoupledToName = coupledToComboBox.Text.Equals("---") ? string.Empty : coupledToComboBox.Text; config.Invert = invertCheckBox.Checked; config.LagOpening = int.Parse(lagOpeningTextBox.Text); @@ -99,7 +114,12 @@ namespace TBF.BenchControl.Elde.Valve flags |= CfgVerifyFlags.Error; message += Environment.NewLine + "Invalid 'Parent Name'"; } - if (!coupledToComboBox.Items.Contains(coupledToComboBox.Text)) + if (!categoryComboBox.Items.Contains(categoryComboBox.Text)) + { + flags |= CfgVerifyFlags.Error; + message += Environment.NewLine + "Invalid 'Category'"; + } + if (!coupledToComboBox.Items.Contains(coupledToComboBox.Text)) { flags |= CfgVerifyFlags.Error; message += Environment.NewLine + "Invalid 'Coupled To'"; diff --git a/TestBenchFramework/BenchControl/Elde/Valve/ValveFactory.cs b/TestBenchFramework/BenchControl/Elde/Valve/ValveFactory.cs index 1130758e7..40499f101 100644 --- a/TestBenchFramework/BenchControl/Elde/Valve/ValveFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/Valve/ValveFactory.cs @@ -16,7 +16,7 @@ namespace TBF.BenchControl.Elde.Valve public IComponentCfg DefaultConfig(IList components) { - return new ValveCfg(this, "Valve", "CB", 0); + return new ValveCfg(this, "Valve", "CB", 0, ValveCategory.None); } public IComponentCfgCtrl CreateCfgCtrl() diff --git a/TestBenchFramework/BenchControl/Events.cs b/TestBenchFramework/BenchControl/Events.cs index 4707bb9a9..5a118664f 100644 --- a/TestBenchFramework/BenchControl/Events.cs +++ b/TestBenchFramework/BenchControl/Events.cs @@ -21,6 +21,15 @@ Warning = 0x02, /// Some settings in the user control are suspicious, can be set after user confirmation } + public enum ValveCategory + { + All = 0, /// Valve will be shown in all paths + Feeding, /// Valve will be shown in Feeding paths + Bench, /// Valve will be shown in Bench paths + Output, /// Valve will be shown in Output paths + None, /// Valve will not be shown in the paths + } + /// /// StateMachine events (issued by operations, IOperation derived classes) /// diff --git a/TestBenchFramework/BenchControl/GenericDevices/IValve.cs b/TestBenchFramework/BenchControl/GenericDevices/IValve.cs index e3dfda958..9fff09123 100644 --- a/TestBenchFramework/BenchControl/GenericDevices/IValve.cs +++ b/TestBenchFramework/BenchControl/GenericDevices/IValve.cs @@ -9,6 +9,11 @@ namespace TBF.BenchControl.GenericDevices /// bool State { get; } + /// + /// All, Feeding, Bench, Output or None + /// + ValveCategory Category { get; } + /// /// Coupled valve or null. /// This valve is a slave and follows the coupled valve, which is a master. diff --git a/TestBenchFramework/BenchControl/StateMachine.cs b/TestBenchFramework/BenchControl/StateMachine.cs index d26d24956..c3660ee8e 100644 --- a/TestBenchFramework/BenchControl/StateMachine.cs +++ b/TestBenchFramework/BenchControl/StateMachine.cs @@ -183,6 +183,8 @@ namespace TBF.BenchControl public static void InitializeBoardEtc(ControlComponent3Munich.UserControl1 ctrlBrdComponent) #elif FUZHOU150 public static void InitializeBoardEtc(ControlComponent3Munich.UserControl1 ctrlBrdComponent) +#elif FUZHOU300 + public static void InitializeBoardEtc(ControlComponent3Munich.UserControl1 ctrlBrdComponent) #endif { /// Load the list of components (entities) from the database. diff --git a/TestBenchFramework/BenchControl/TestBenchSim.cs b/TestBenchFramework/BenchControl/TestBenchSim.cs index 779194aea..2b24692a2 100644 --- a/TestBenchFramework/BenchControl/TestBenchSim.cs +++ b/TestBenchFramework/BenchControl/TestBenchSim.cs @@ -154,6 +154,54 @@ namespace TBF.BenchControl const ulong EmptyValve1 = VB1 | VB1a; const ulong EmptyValve2 = VB2 | VB2a; + const ulong Path1 = VL12 | VI11 | VI13; + const ulong Path2 = VL12 | VI21 | VI22 | VI13; + const ulong Path3 = VL12 | VI31 | VI32; + const ulong Path4 = VL12 | VI41 | VI42; + const ulong Path5 = VL12 | VI41 | VI43; +#elif FUZHOU300 + const ulong VL11 = (1 << 2); + const ulong VL13 = (1 << 3); + const ulong VL4 = (1 << 4); + const ulong VZ6 = (1 << 5); + const ulong VZ7 = (1 << 6); + const ulong VP5 = (1 << 7); + + const ulong VP6 = (1 << 8); + const ulong VL12 = (1 << 9); + const ulong VZ14 = (1 << 10); + const ulong VI11 = (1 << 11); + const ulong VI12 = (1 << 12); + const ulong VI13 = (1 << 13); + const ulong VI21 = (1 << 14); + const ulong VI22 = (1 << 15); + + const ulong VI2p = (1 << 16); + const ulong VI31 = (1 << 17); + const ulong VI32 = (1 << 18); + const ulong VI3p = (1 << 19); + const ulong VI41 = (1 << 20); + const ulong VI42 = (1 << 21); + const ulong VI43 = (1 << 22); + const ulong VI4p = (1 << 23); + + const ulong VB1 = (1 << 24); + const ulong VB1a = (1 << 25); + const ulong VB2 = (1 << 26); + const ulong VB2a = (1 << 27); + const ulong VM1 = (1 << 28); + const ulong VM2 = (1 << 29); + const ulong VM3 = (1 << 20); + + const ulong Pump1 = ((ulong)1 << 32); + const ulong Pump4 = ((ulong)1 << 33); + const ulong Pump2 = ((ulong)1 << 37); + const ulong Pump3 = ((ulong)1 << 38); + const ulong Pump5 = ((ulong)1 << 39); + + const ulong EmptyValve1 = VB1 | VB1a; + const ulong EmptyValve2 = VB2 | VB2a; + const ulong Path1 = VL12 | VI11 | VI13; const ulong Path2 = VL12 | VI21 | VI22 | VI13; const ulong Path3 = VL12 | VI31 | VI32; @@ -177,7 +225,7 @@ namespace TBF.BenchControl const ulong Path4 = 0; const ulong Path5 = 0; #endif - /// Run this device + /// Run this device public void RunDevice(int regulValveNo, int refFlowmtrNo, Elde.StatusP statusP) { this.regulValveNo = regulValveNo; @@ -190,7 +238,7 @@ namespace TBF.BenchControl if (Div2sim && (RouteSim & Path3) == Path3) Mass2sim += DiffKg(Flow3sim, time); if (Div2sim && (RouteSim & Path4) == Path4) Mass2sim += DiffKg(Flow4sim, time); if (Div1sim && (RouteSim & Path5) == Path5) Mass1sim += DiffKg(Flow5sim, time); -#elif MUNICH || FUZHOU150 +#elif MUNICH || FUZHOU150 || FUZHOU300 if (Div1sim && (RouteSim & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time); if (Div1sim && (RouteSim & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time); if (Div2sim && (RouteSim & Path3) == Path3) @@ -204,7 +252,7 @@ namespace TBF.BenchControl if (Div2sim && (RouteSim & Path2) == Path2) Mass2sim += DiffKg(Flow2sim, time); #endif - if ((RouteSim & EmptyValve1) == EmptyValve1) Mass1sim -= DiffKg(100.0f, time); + if ((RouteSim & EmptyValve1) == EmptyValve1) Mass1sim -= DiffKg(100.0f, time); if (Mass1sim < 0) Mass1sim = 0; if ((RouteSim & EmptyValve2) == EmptyValve2) Mass2sim -= DiffKg(10.0f, time); @@ -263,8 +311,8 @@ namespace TBF.BenchControl default: if (toTank) { throw (new Exception()); } break; - } -#elif MUNICH || FUZHOU150 + } +#elif MUNICH || FUZHOU150 || FUZHOU300 switch (regulValveNo) { case 1: @@ -292,7 +340,7 @@ namespace TBF.BenchControl break; } #endif - return; + return; } /// @@ -327,6 +375,14 @@ namespace TBF.BenchControl else if (nominalFlow <= 7.0f) return 3; else if (nominalFlow <= 50.0f) return 2; else return 1; +#elif FUZHOU300 + // + // Qn1=350, Qn2=50, Qn3=7, Qn4=0.5 + // + if (nominalFlow <= 0.5f) return 4; + else if (nominalFlow <= 7.0f) return 3; + else if (nominalFlow <= 50.0f) return 2; + else return 1; #else // // Qn1=1, Qn2=10 @@ -334,7 +390,7 @@ namespace TBF.BenchControl if (nominalFlow < 3.0f) return 1; else return 2; #endif - } + } /// /// Get the simulated flow in [m3/h]. diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs index 704fa3ce6..06c0e40b4 100644 --- a/TestBenchFramework/MainWnd.Designer.cs +++ b/TestBenchFramework/MainWnd.Designer.cs @@ -47,7 +47,7 @@ this.activityLabel = new System.Windows.Forms.Label(); this.mainTabControl = new System.Windows.Forms.TabControl(); this.homeTabPage = new System.Windows.Forms.TabPage(); - this.ctrlBrdComponent = new ControlCom2VB.ControlCom2panel(); + this.ctrlBrdComponent = new ControlComponent3Munich.UserControl1(); this.processTabPage = new System.Windows.Forms.TabPage(); this.processTabPageCtrl = new TBF.Screens.ProcessTabPageCtrl(); this.measurementTabPage = new System.Windows.Forms.TabPage(); @@ -561,9 +561,11 @@ private ControlComponent3Munich.UserControl1 ctrlBrdComponent; #elif FUZHOU150 private ControlComponent3Munich.UserControl1 ctrlBrdComponent; +#elif FUZHOU300 + private ControlComponent3Munich.UserControl1 ctrlBrdComponent; #endif - private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem; + private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem; private System.Windows.Forms.ToolStripMenuItem homeTSMenuItem; private System.Windows.Forms.ToolStripMenuItem measurementTSMenuItem; private System.Windows.Forms.ToolStripMenuItem resultsTSMenuItem; diff --git a/TestBenchFramework/MainWnd.resx b/TestBenchFramework/MainWnd.resx index 6f050c9fc..a868332dc 100644 --- a/TestBenchFramework/MainWnd.resx +++ b/TestBenchFramework/MainWnd.resx @@ -1063,7 +1063,7 @@ 0, 0 - ControlCom2VB.ControlCom2panel, ControlCom2VB, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + ControlComponent3Munich.UserControl1, ControlComponent3Munich, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null 30 diff --git a/TestBenchFramework/PathsDlg.Designer.cs b/TestBenchFramework/PathsDlg.Designer.cs index 612523edd..2dc0f0916 100644 --- a/TestBenchFramework/PathsDlg.Designer.cs +++ b/TestBenchFramework/PathsDlg.Designer.cs @@ -28,148 +28,150 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PathsDlg)); - this.splitContainer = new System.Windows.Forms.SplitContainer(); - this.pathsTabControl = new System.Windows.Forms.TabControl(); - this.feedingTabPage = new System.Windows.Forms.TabPage(); - this.pathsFeedingCtrl = new TBF.UiControls.PathsFeedingCtrl(); - this.benchTabPage = new System.Windows.Forms.TabPage(); - this.pathsBenchCtrl = new TBF.UiControls.PathsBenchCtrl(); - this.outputTabPage = new System.Windows.Forms.TabPage(); - this.pathsOutputCtrl = new TBF.UiControls.PathsOutputCtrl(); - this.metersTabPage = new System.Windows.Forms.TabPage(); - this.pathsMetersCtrl = new TBF.UiControls.PathsMetersCtrl(); - this.sharedButtons = new TBF.UiControls.SharedButtons(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); - this.splitContainer.Panel1.SuspendLayout(); - this.splitContainer.Panel2.SuspendLayout(); - this.splitContainer.SuspendLayout(); - this.pathsTabControl.SuspendLayout(); - this.feedingTabPage.SuspendLayout(); - this.benchTabPage.SuspendLayout(); - this.outputTabPage.SuspendLayout(); - this.metersTabPage.SuspendLayout(); - this.SuspendLayout(); - // - // splitContainer - // - resources.ApplyResources(this.splitContainer, "splitContainer"); - this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.splitContainer.Name = "splitContainer"; - // - // splitContainer.Panel1 - // - this.splitContainer.Panel1.Controls.Add(this.pathsTabControl); - // - // splitContainer.Panel2 - // - this.splitContainer.Panel2.Controls.Add(this.sharedButtons); - // - // pathsTabControl - // - this.pathsTabControl.Controls.Add(this.feedingTabPage); - this.pathsTabControl.Controls.Add(this.benchTabPage); - this.pathsTabControl.Controls.Add(this.outputTabPage); - this.pathsTabControl.Controls.Add(this.metersTabPage); - resources.ApplyResources(this.pathsTabControl, "pathsTabControl"); - this.pathsTabControl.Name = "pathsTabControl"; - this.pathsTabControl.SelectedIndex = 0; - this.pathsTabControl.SelectedIndexChanged += new System.EventHandler(this.pathsTabControl_SelectedIndexChanged); - // - // feedingTabPage - // - this.feedingTabPage.Controls.Add(this.pathsFeedingCtrl); - resources.ApplyResources(this.feedingTabPage, "feedingTabPage"); - this.feedingTabPage.Name = "feedingTabPage"; - this.feedingTabPage.UseVisualStyleBackColor = true; - // - // pathsFeedingCtrl - // - resources.ApplyResources(this.pathsFeedingCtrl, "pathsFeedingCtrl"); - this.pathsFeedingCtrl.DoubleClickActivation = false; - this.pathsFeedingCtrl.FullRowSelect = true; - this.pathsFeedingCtrl.GridLines = true; - this.pathsFeedingCtrl.Name = "pathsFeedingCtrl"; - this.pathsFeedingCtrl.UseCompatibleStateImageBehavior = false; - this.pathsFeedingCtrl.View = System.Windows.Forms.View.Details; - this.pathsFeedingCtrl.SelectedIndexChanged += new System.EventHandler(this.SelectedIndexChanged); - // - // benchTabPage - // - this.benchTabPage.Controls.Add(this.pathsBenchCtrl); - resources.ApplyResources(this.benchTabPage, "benchTabPage"); - this.benchTabPage.Name = "benchTabPage"; - this.benchTabPage.UseVisualStyleBackColor = true; - // - // pathsBenchCtrl - // - resources.ApplyResources(this.pathsBenchCtrl, "pathsBenchCtrl"); - this.pathsBenchCtrl.DoubleClickActivation = false; - this.pathsBenchCtrl.FullRowSelect = true; - this.pathsBenchCtrl.GridLines = true; - this.pathsBenchCtrl.Name = "pathsBenchCtrl"; - this.pathsBenchCtrl.UseCompatibleStateImageBehavior = false; - this.pathsBenchCtrl.View = System.Windows.Forms.View.Details; - this.pathsBenchCtrl.SelectedIndexChanged += new System.EventHandler(this.SelectedIndexChanged); - // - // outputTabPage - // - this.outputTabPage.Controls.Add(this.pathsOutputCtrl); - resources.ApplyResources(this.outputTabPage, "outputTabPage"); - this.outputTabPage.Name = "outputTabPage"; - this.outputTabPage.UseVisualStyleBackColor = true; - // - // pathsOutputCtrl - // - resources.ApplyResources(this.pathsOutputCtrl, "pathsOutputCtrl"); - this.pathsOutputCtrl.DoubleClickActivation = false; - this.pathsOutputCtrl.FullRowSelect = true; - this.pathsOutputCtrl.GridLines = true; - this.pathsOutputCtrl.Name = "pathsOutputCtrl"; - this.pathsOutputCtrl.UseCompatibleStateImageBehavior = false; - this.pathsOutputCtrl.View = System.Windows.Forms.View.Details; - this.pathsOutputCtrl.SelectedIndexChanged += new System.EventHandler(this.SelectedIndexChanged); - // - // metersTabPage - // - this.metersTabPage.Controls.Add(this.pathsMetersCtrl); - resources.ApplyResources(this.metersTabPage, "metersTabPage"); - this.metersTabPage.Name = "metersTabPage"; - this.metersTabPage.UseVisualStyleBackColor = true; - // - // pathsMetersCtrl - // - resources.ApplyResources(this.pathsMetersCtrl, "pathsMetersCtrl"); - this.pathsMetersCtrl.DoubleClickActivation = false; - this.pathsMetersCtrl.FullRowSelect = true; - this.pathsMetersCtrl.GridLines = true; - this.pathsMetersCtrl.Name = "pathsMetersCtrl"; - this.pathsMetersCtrl.UseCompatibleStateImageBehavior = false; - this.pathsMetersCtrl.View = System.Windows.Forms.View.Details; - this.pathsMetersCtrl.SelectedIndexChanged += new System.EventHandler(this.SelectedIndexChanged); - // - // sharedButtons - // - resources.ApplyResources(this.sharedButtons, "sharedButtons"); - this.sharedButtons.Name = "sharedButtons"; - // - // PathsDlg - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.splitContainer); - this.Name = "PathsDlg"; - this.Load += new System.EventHandler(this.PathsDlg_Load); - this.splitContainer.Panel1.ResumeLayout(false); - this.splitContainer.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); - this.splitContainer.ResumeLayout(false); - this.pathsTabControl.ResumeLayout(false); - this.feedingTabPage.ResumeLayout(false); - this.benchTabPage.ResumeLayout(false); - this.outputTabPage.ResumeLayout(false); - this.metersTabPage.ResumeLayout(false); - this.ResumeLayout(false); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PathsDlg)); + this.splitContainer = new System.Windows.Forms.SplitContainer(); + this.pathsTabControl = new System.Windows.Forms.TabControl(); + this.feedingTabPage = new System.Windows.Forms.TabPage(); + this.pathsFeedingCtrl = new TBF.UiControls.PathsFeedingCtrl(); + this.benchTabPage = new System.Windows.Forms.TabPage(); + this.pathsBenchCtrl = new TBF.UiControls.PathsBenchCtrl(); + this.outputTabPage = new System.Windows.Forms.TabPage(); + this.pathsOutputCtrl = new TBF.UiControls.PathsOutputCtrl(); + this.metersTabPage = new System.Windows.Forms.TabPage(); + this.pathsMetersCtrl = new TBF.UiControls.PathsMetersCtrl(); + this.sharedButtons = new TBF.UiControls.SharedButtons(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); + this.splitContainer.Panel1.SuspendLayout(); + this.splitContainer.Panel2.SuspendLayout(); + this.splitContainer.SuspendLayout(); + this.pathsTabControl.SuspendLayout(); + this.feedingTabPage.SuspendLayout(); + this.benchTabPage.SuspendLayout(); + this.outputTabPage.SuspendLayout(); + this.metersTabPage.SuspendLayout(); + this.SuspendLayout(); + // + // splitContainer + // + resources.ApplyResources(this.splitContainer, "splitContainer"); + this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer.Name = "splitContainer"; + // + // splitContainer.Panel1 + // + resources.ApplyResources(this.splitContainer.Panel1, "splitContainer.Panel1"); + this.splitContainer.Panel1.Controls.Add(this.pathsTabControl); + // + // splitContainer.Panel2 + // + resources.ApplyResources(this.splitContainer.Panel2, "splitContainer.Panel2"); + this.splitContainer.Panel2.Controls.Add(this.sharedButtons); + // + // pathsTabControl + // + resources.ApplyResources(this.pathsTabControl, "pathsTabControl"); + this.pathsTabControl.Controls.Add(this.feedingTabPage); + this.pathsTabControl.Controls.Add(this.benchTabPage); + this.pathsTabControl.Controls.Add(this.outputTabPage); + this.pathsTabControl.Controls.Add(this.metersTabPage); + this.pathsTabControl.Name = "pathsTabControl"; + this.pathsTabControl.SelectedIndex = 0; + this.pathsTabControl.SelectedIndexChanged += new System.EventHandler(this.pathsTabControl_SelectedIndexChanged); + // + // feedingTabPage + // + resources.ApplyResources(this.feedingTabPage, "feedingTabPage"); + this.feedingTabPage.Controls.Add(this.pathsFeedingCtrl); + this.feedingTabPage.Name = "feedingTabPage"; + this.feedingTabPage.UseVisualStyleBackColor = true; + // + // pathsFeedingCtrl + // + resources.ApplyResources(this.pathsFeedingCtrl, "pathsFeedingCtrl"); + this.pathsFeedingCtrl.DoubleClickActivation = false; + this.pathsFeedingCtrl.FullRowSelect = true; + this.pathsFeedingCtrl.GridLines = true; + this.pathsFeedingCtrl.Name = "pathsFeedingCtrl"; + this.pathsFeedingCtrl.UseCompatibleStateImageBehavior = false; + this.pathsFeedingCtrl.View = System.Windows.Forms.View.Details; + this.pathsFeedingCtrl.SelectedIndexChanged += new System.EventHandler(this.SelectedIndexChanged); + // + // benchTabPage + // + resources.ApplyResources(this.benchTabPage, "benchTabPage"); + this.benchTabPage.Controls.Add(this.pathsBenchCtrl); + this.benchTabPage.Name = "benchTabPage"; + this.benchTabPage.UseVisualStyleBackColor = true; + // + // pathsBenchCtrl + // + resources.ApplyResources(this.pathsBenchCtrl, "pathsBenchCtrl"); + this.pathsBenchCtrl.DoubleClickActivation = false; + this.pathsBenchCtrl.FullRowSelect = true; + this.pathsBenchCtrl.GridLines = true; + this.pathsBenchCtrl.Name = "pathsBenchCtrl"; + this.pathsBenchCtrl.UseCompatibleStateImageBehavior = false; + this.pathsBenchCtrl.View = System.Windows.Forms.View.Details; + this.pathsBenchCtrl.SelectedIndexChanged += new System.EventHandler(this.SelectedIndexChanged); + // + // outputTabPage + // + resources.ApplyResources(this.outputTabPage, "outputTabPage"); + this.outputTabPage.Controls.Add(this.pathsOutputCtrl); + this.outputTabPage.Name = "outputTabPage"; + this.outputTabPage.UseVisualStyleBackColor = true; + // + // pathsOutputCtrl + // + resources.ApplyResources(this.pathsOutputCtrl, "pathsOutputCtrl"); + this.pathsOutputCtrl.DoubleClickActivation = false; + this.pathsOutputCtrl.FullRowSelect = true; + this.pathsOutputCtrl.GridLines = true; + this.pathsOutputCtrl.Name = "pathsOutputCtrl"; + this.pathsOutputCtrl.UseCompatibleStateImageBehavior = false; + this.pathsOutputCtrl.View = System.Windows.Forms.View.Details; + this.pathsOutputCtrl.SelectedIndexChanged += new System.EventHandler(this.SelectedIndexChanged); + // + // metersTabPage + // + resources.ApplyResources(this.metersTabPage, "metersTabPage"); + this.metersTabPage.Controls.Add(this.pathsMetersCtrl); + this.metersTabPage.Name = "metersTabPage"; + this.metersTabPage.UseVisualStyleBackColor = true; + // + // pathsMetersCtrl + // + resources.ApplyResources(this.pathsMetersCtrl, "pathsMetersCtrl"); + this.pathsMetersCtrl.DoubleClickActivation = false; + this.pathsMetersCtrl.FullRowSelect = true; + this.pathsMetersCtrl.GridLines = true; + this.pathsMetersCtrl.Name = "pathsMetersCtrl"; + this.pathsMetersCtrl.UseCompatibleStateImageBehavior = false; + this.pathsMetersCtrl.View = System.Windows.Forms.View.Details; + this.pathsMetersCtrl.SelectedIndexChanged += new System.EventHandler(this.SelectedIndexChanged); + // + // sharedButtons + // + resources.ApplyResources(this.sharedButtons, "sharedButtons"); + this.sharedButtons.Name = "sharedButtons"; + // + // PathsDlg + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.splitContainer); + this.Name = "PathsDlg"; + this.Load += new System.EventHandler(this.PathsDlg_Load); + this.splitContainer.Panel1.ResumeLayout(false); + this.splitContainer.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); + this.splitContainer.ResumeLayout(false); + this.pathsTabControl.ResumeLayout(false); + this.feedingTabPage.ResumeLayout(false); + this.benchTabPage.ResumeLayout(false); + this.outputTabPage.ResumeLayout(false); + this.metersTabPage.ResumeLayout(false); + this.ResumeLayout(false); } diff --git a/TestBenchFramework/PathsDlg.resx b/TestBenchFramework/PathsDlg.resx index 71161813e..190a266c5 100644 --- a/TestBenchFramework/PathsDlg.resx +++ b/TestBenchFramework/PathsDlg.resx @@ -117,334 +117,331 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill - - - - True - - - 0, 0 - - - Fill - - - 3, 3 - - - 825, 271 - - - 0 - - - pathsFeedingCtrl - - - TBF.UiControls.PathsFeedingCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - feedingTabPage - - - 0 - - - 4, 34 - - - 3, 3, 3, 3 - - + 831, 277 - + + $this + + + splitContainer.Panel1 + + + 0 - - Feeding - - - feedingTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - pathsTabControl - - 0 - - - Fill - - - 3, 3 - - - 825, 271 - - - 0 - - - pathsBenchCtrl - - - TBF.UiControls.PathsBenchCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - benchTabPage - - - 0 - - - 4, 34 - - - 3, 3, 3, 3 - - - 831, 277 - - - 1 - - - Bench - - - benchTabPage - - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - pathsTabControl - - - 1 - - - Fill - - - 3, 3 - - - 825, 271 - - - 0 - - - pathsOutputCtrl - - - TBF.UiControls.PathsOutputCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 3 outputTabPage - - 0 - - - 4, 34 - - - 3, 3, 3, 3 - - - 831, 277 - - - 2 - - - Output - - - outputTabPage - - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 pathsTabControl - - 2 + + 3, 3 - + + 825, 271 + + + 825, 271 + + + benchTabPage + + + TBF.UiControls.PathsBenchCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + Fill - - 0, 0 - - - 831, 277 - - - 0 - - - pathsMetersCtrl - - - TBF.UiControls.PathsMetersCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - metersTabPage - - - 0 - - - 4, 34 - - - 831, 277 - - - 3 - Sensors - - metersTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pathsTabControl - - - 3 - - - Fill - - - 42, 30 - - - 0, 0 - - - 839, 315 - - - 0 - - - pathsTabControl - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer.Panel1 - - - 0 - - - splitContainer.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer - - - 0 - - - -2, 0 - - - 100, 521 - - - 0 - - - sharedButtons - - - TBF.UiControls.SharedButtons, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - splitContainer.Panel2 - - - 0 - - - splitContainer.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - splitContainer 1 - - 941, 315 + + feedingTabPage - - 839 + + 3, 3, 3, 3 - + 0 - - splitContainer - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - de - - - True - 6, 13 - - 941, 315 + + pathsTabControl + + + 0 + + + 4, 34 + + + outputTabPage + + + pathsOutputCtrl CenterParent - - Bench - Paths + + TBF.UiControls.PathsFeedingCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - PathsDlg + + pathsTabControl + + + TBF.UiControls.PathsMetersCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + Bench + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + metersTabPage + + + Fill + + + 0, 0 + + + pathsFeedingCtrl + + + 831, 277 + + + 0, 0 + + + 2 + + + 0 + + + splitContainer.Panel2 + + + pathsMetersCtrl + + + 839 + + + True + + + 3, 3 + + + sharedButtons + + + -2, 0 + + + 2 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 839, 315 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3, 3, 3, 3 System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 42, 30 + + + 0, 0 + + + 3, 3, 3, 3 + + + 0 + + + TBF.UiControls.SharedButtons, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + metersTabPage + + + PathsDlg + + + 831, 277 + + + 4, 34 + + + 0 + + + 3 + + + splitContainer.Panel1 + + + 0 + + + 0 + + + Fill + + + 0 + + + Output + + + benchTabPage + + + Feeding + + + 0 + + + 0 + + + 1 + + + TBF.UiControls.PathsOutputCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 831, 277 + + + 0 + + + feedingTabPage + + + 825, 271 + + + splitContainer.Panel2 + + + pathsTabControl + + + 0 + + + 1 + + + Fill + + + 100, 521 + + + splitContainer + + + 941, 315 + + + Fill + + + 4, 34 + + + pathsBenchCtrl + + + Bench - Paths + + + 0 + + + 941, 315 + + + 3, 3 + + + 831, 277 + + + 0 + + + 0 + + + 4, 34 + + + splitContainer + + + Fill + + + True + \ No newline at end of file diff --git a/TestBenchFramework/Program.cs b/TestBenchFramework/Program.cs index 1fa6ff890..677e87417 100644 --- a/TestBenchFramework/Program.cs +++ b/TestBenchFramework/Program.cs @@ -32,7 +32,9 @@ namespace TBF #if (DN100 || MUNICH) public const int WMsCount = 3; -#else +#elif FUZHOU300 + public const int WMsCount = 5; +#else // if FUZHOU150 public const int WMsCount = 6; #endif diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj index e1d1746b9..42329941a 100644 --- a/TestBenchFramework/TBF.csproj +++ b/TestBenchFramework/TBF.csproj @@ -38,7 +38,7 @@ full false bin\Debug\ - TRACE;DEBUG;DN100 + TRACE;DEBUG;FUZHOU300 prompt 4 @@ -46,7 +46,7 @@ pdbonly true bin\Release\ - TRACE;DN100 + TRACE;FUZHOU300 prompt 4 AnyCPU @@ -73,8 +73,8 @@ TBF.Program - - ..\packages\ControlBoard\ControlCom2VB.dll + + ..\packages\ControlBoard\ControlComponent3Munich.dll ..\packages\FluentNHibernate.1.3.0.733\lib\FluentNHibernate.dll diff --git a/TestBenchFramework/UiControls/PathsBenchCtrl.cs b/TestBenchFramework/UiControls/PathsBenchCtrl.cs index 9835f65f5..1f02b5214 100644 --- a/TestBenchFramework/UiControls/PathsBenchCtrl.cs +++ b/TestBenchFramework/UiControls/PathsBenchCtrl.cs @@ -59,7 +59,13 @@ namespace TBF.UiControls Columns.Add(Strings.T_out, 50 * parent.Dpi / PathsDlg.Dpi100pct); Columns.Add(Strings.P_in, 50 * parent.Dpi / PathsDlg.Dpi100pct); Columns.Add(Strings.P_out, 50 * parent.Dpi / PathsDlg.Dpi100pct); - foreach (var vlv in parent.Valves) Columns.Add(vlv.Cfg.Name, 50 * parent.Dpi / PathsDlg.Dpi100pct); + foreach (var vlv in parent.Valves) + { + if (vlv.Category == ValveCategory.All || vlv.Category == ValveCategory.Bench) + { + Columns.Add(vlv.Cfg.Name, 50 * parent.Dpi / PathsDlg.Dpi100pct); + } + } /// Temperatures, pressures ComboBox tInCBox = new ComboBox(); @@ -135,18 +141,21 @@ namespace TBF.UiControls foreach (var valve in parent.Valves) { - if (path.ValvesOpen != null && path.ValvesOpen.Contains(valve)) - { - lvi.SubItems.Add(Strings.open); - } - else if (path.ValvesClose != null && path.ValvesClose.Contains(valve)) - { - lvi.SubItems.Add(Strings.close); - } - else - { - lvi.SubItems.Add("---"); - } + if (valve.Category == ValveCategory.All || valve.Category == ValveCategory.Bench) + { + if (path.ValvesOpen != null && path.ValvesOpen.Contains(valve)) + { + lvi.SubItems.Add(Strings.open); + } + else if (path.ValvesClose != null && path.ValvesClose.Contains(valve)) + { + lvi.SubItems.Add(Strings.close); + } + else + { + lvi.SubItems.Add("---"); + } + } } lvi.Tag = entity; @@ -175,19 +184,24 @@ namespace TBF.UiControls string valvesOpen = string.Empty; string valvesClose = string.Empty; + int k = 0; for (int j = 0; j < parent.Valves.Count; j++) { - string text = lvi.SubItems[fixedColumnsCount + j].Text; - if (text.Equals(Strings.open)) - { - if (valvesOpen != string.Empty) valvesOpen += ";"; - valvesOpen += parent.Valves[j].Cfg.Name; - } - if (text.Equals(Strings.close)) - { - if (valvesClose != string.Empty) valvesClose += ";"; - valvesClose += parent.Valves[j].Cfg.Name; - } + if (parent.Valves[j].Category == ValveCategory.All || parent.Valves[j].Category == ValveCategory.Bench) + { + string text = lvi.SubItems[fixedColumnsCount + k].Text; + if (text.Equals(Strings.open)) + { + if (valvesOpen != string.Empty) valvesOpen += ";"; + valvesOpen += parent.Valves[j].Cfg.Name; + } + if (text.Equals(Strings.close)) + { + if (valvesClose != string.Empty) valvesClose += ";"; + valvesClose += parent.Valves[j].Cfg.Name; + } + k++; + } } entity.ValvesOpen = valvesOpen; entity.ValvesClose = valvesClose; diff --git a/TestBenchFramework/UiControls/PathsFeedingCtrl.cs b/TestBenchFramework/UiControls/PathsFeedingCtrl.cs index e6abdc80d..040c3b1bd 100644 --- a/TestBenchFramework/UiControls/PathsFeedingCtrl.cs +++ b/TestBenchFramework/UiControls/PathsFeedingCtrl.cs @@ -53,7 +53,13 @@ namespace TBF.UiControls Columns.Add(Strings.Q_from_m3h, 50 * parent.Dpi / PathsDlg.Dpi100pct); Columns.Add(Strings.Q_to_m3h, 50 * parent.Dpi / PathsDlg.Dpi100pct); Columns.Add(Strings.Pump, 60 * parent.Dpi / PathsDlg.Dpi100pct); - foreach (var vlv in parent.Valves) Columns.Add(vlv.Cfg.Name, 50 * parent.Dpi / PathsDlg.Dpi100pct); + foreach (var vlv in parent.Valves) + { + if (vlv.Category == ValveCategory.All || vlv.Category == ValveCategory.Feeding) + { + Columns.Add(vlv.Cfg.Name, 50 * parent.Dpi / PathsDlg.Dpi100pct); + } + } /// Pump ComboBox pumpCBox = new ComboBox(); @@ -112,18 +118,21 @@ namespace TBF.UiControls foreach (var valve in parent.Valves) { - if (path.ValvesOpen != null && path.ValvesOpen.Contains(valve)) - { - lvi.SubItems.Add(Strings.open); - } - else if (path.ValvesClose != null && path.ValvesClose.Contains(valve)) - { - lvi.SubItems.Add(Strings.close); - } - else - { - lvi.SubItems.Add("---"); - } + if (valve.Category == ValveCategory.All || valve.Category == ValveCategory.Feeding) + { + if (path.ValvesOpen != null && path.ValvesOpen.Contains(valve)) + { + lvi.SubItems.Add(Strings.open); + } + else if (path.ValvesClose != null && path.ValvesClose.Contains(valve)) + { + lvi.SubItems.Add(Strings.close); + } + else + { + lvi.SubItems.Add("---"); + } + } } lvi.Tag = entity; @@ -153,19 +162,24 @@ namespace TBF.UiControls string valvesOpen = string.Empty; string valvesClose = string.Empty; + int k = 0; for (int j = 0; j < parent.Valves.Count; j++) { - string text = lvi.SubItems[fixedColumnsCount + j].Text; - if (text.Equals(Strings.open)) - { - if (valvesOpen != string.Empty) valvesOpen += ";"; - valvesOpen += parent.Valves[j].Cfg.Name; - } - if (text.Equals(Strings.close)) - { - if (valvesClose != string.Empty) valvesClose += ";"; - valvesClose += parent.Valves[j].Cfg.Name; - } + if (parent.Valves[j].Category == ValveCategory.All || parent.Valves[j].Category == ValveCategory.Feeding) + { + string text = lvi.SubItems[fixedColumnsCount + k].Text; + if (text.Equals(Strings.open)) + { + if (valvesOpen != string.Empty) valvesOpen += ";"; + valvesOpen += parent.Valves[j].Cfg.Name; + } + if (text.Equals(Strings.close)) + { + if (valvesClose != string.Empty) valvesClose += ";"; + valvesClose += parent.Valves[j].Cfg.Name; + } + k++; + } } entity.ValvesOpen = valvesOpen; entity.ValvesClose = valvesClose; diff --git a/TestBenchFramework/UiControls/PathsOutputCtrl.cs b/TestBenchFramework/UiControls/PathsOutputCtrl.cs index ec106407d..080e99534 100644 --- a/TestBenchFramework/UiControls/PathsOutputCtrl.cs +++ b/TestBenchFramework/UiControls/PathsOutputCtrl.cs @@ -63,7 +63,13 @@ namespace TBF.UiControls Columns.Add(Strings.T_div, 70 * parent.Dpi / PathsDlg.Dpi100pct); Columns.Add(Strings.Balance, 50 * parent.Dpi / PathsDlg.Dpi100pct); Columns.Add(Strings.Emptying_valve, 80 * parent.Dpi / PathsDlg.Dpi100pct); - foreach (var vlv in parent.Valves) Columns.Add(vlv.Cfg.Name, 50 * parent.Dpi / PathsDlg.Dpi100pct); + foreach (var vlv in parent.Valves) + { + if (vlv.Category == ValveCategory.All || vlv.Category == ValveCategory.Output) + { + Columns.Add(vlv.Cfg.Name, 50 * parent.Dpi / PathsDlg.Dpi100pct); + } + } /// Prepare fixed columns combo boxes ComboBox regulValveComboBox = new ComboBox(); @@ -141,17 +147,20 @@ namespace TBF.UiControls foreach (var valve in parent.Valves) { - if (path.ValvesOpen != null && path.ValvesOpen.Contains(valve)) - { - lvi.SubItems.Add(Strings.open); - } - else if (path.ValvesClose != null && path.ValvesClose.Contains(valve)) - { - lvi.SubItems.Add(Strings.close); - } - else - { - lvi.SubItems.Add("---"); + if (valve.Category == ValveCategory.All || valve.Category == ValveCategory.Output) + { + if (path.ValvesOpen != null && path.ValvesOpen.Contains(valve)) + { + lvi.SubItems.Add(Strings.open); + } + else if (path.ValvesClose != null && path.ValvesClose.Contains(valve)) + { + lvi.SubItems.Add(Strings.close); + } + else + { + lvi.SubItems.Add("---"); + } } } @@ -183,19 +192,24 @@ namespace TBF.UiControls string valvesOpen = string.Empty; string valvesClose = string.Empty; + int k = 0; for (int j = 0; j < parent.Valves.Count; j++) { - string text = lvi.SubItems[fixedColumnsCount + j].Text; - if (text.Equals(Strings.open)) - { - if (valvesOpen != string.Empty) valvesOpen += ";"; - valvesOpen += parent.Valves[j].Cfg.Name; - } - if (text.Equals(Strings.close)) - { - if (valvesClose != string.Empty) valvesClose += ";"; - valvesClose += parent.Valves[j].Cfg.Name; - } + if (parent.Valves[j].Category == ValveCategory.All || parent.Valves[j].Category == ValveCategory.Output) + { + string text = lvi.SubItems[fixedColumnsCount + k].Text; + if (text.Equals(Strings.open)) + { + if (valvesOpen != string.Empty) valvesOpen += ";"; + valvesOpen += parent.Valves[j].Cfg.Name; + } + if (text.Equals(Strings.close)) + { + if (valvesClose != string.Empty) valvesClose += ";"; + valvesClose += parent.Valves[j].Cfg.Name; + } + k++; + } } entity.ValvesOpen = valvesOpen; entity.ValvesClose = valvesClose;