diff --git a/Config/Entities/BenchPath.cs b/Config/Entities/BenchPath.cs index c1a73a702..b02ec8ba8 100644 --- a/Config/Entities/BenchPath.cs +++ b/Config/Entities/BenchPath.cs @@ -17,6 +17,7 @@ namespace Config.Entities public virtual string TempOut { get; set; } public virtual string PressIn { get; set; } public virtual string PressOut { get; set; } + public virtual string StopBFValve { get; set; } /// Valves public virtual string ValvesOpen { get; set; } diff --git a/Config/Mappings/BenchPathMap.cs b/Config/Mappings/BenchPathMap.cs index 7e2906c18..048b43969 100644 --- a/Config/Mappings/BenchPathMap.cs +++ b/Config/Mappings/BenchPathMap.cs @@ -19,6 +19,7 @@ namespace Config.Mappings Map(x => x.TempOut); Map(x => x.PressIn); Map(x => x.PressOut); + Map(x => x.StopBFValve); Map(x => x.ValvesOpen) .CustomType("StringClob") .CustomSqlType("varchar(8000)"); diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs index 49e04718d..db38779d6 100644 --- a/Config/Properties/AssemblyInfo.cs +++ b/Config/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.3.228.0")] -[assembly: AssemblyFileVersion("2.3.228.0")] +[assembly: AssemblyVersion("2.4.247.0")] +[assembly: AssemblyFileVersion("2.4.247.0")] diff --git a/TestBenchFramework/BenchControl/BenchPath.cs b/TestBenchFramework/BenchControl/BenchPath.cs index fa134caa4..0b90039cf 100644 --- a/TestBenchFramework/BenchControl/BenchPath.cs +++ b/TestBenchFramework/BenchControl/BenchPath.cs @@ -16,6 +16,7 @@ namespace TBF.BenchControl public ITempMeter TempOut; public IPressureMeter PressIn; public IPressureMeter PressOut; + public IValve StopBFValve; public IList ValvesOpen; public IList ValvesClose; @@ -34,10 +35,11 @@ namespace TBF.BenchControl { Qfrom = entity.Qfrom; Qto = entity.Qto; - TempIn = (ITempMeter)TbfComponents.FindComponent(entity.TempIn, components); - TempOut = (ITempMeter)TbfComponents.FindComponent(entity.TempOut, components); - PressIn = (IPressureMeter)TbfComponents.FindComponent(entity.PressIn, components); - PressOut = (IPressureMeter)TbfComponents.FindComponent(entity.PressOut, components); + TempIn = TbfComponents.FindComponent(entity.TempIn, components) as ITempMeter; + TempOut = TbfComponents.FindComponent(entity.TempOut, components) as ITempMeter; + PressIn = TbfComponents.FindComponent(entity.PressIn, components) as IPressureMeter; + PressOut = TbfComponents.FindComponent(entity.PressOut, components) as IPressureMeter; + StopBFValve = TbfComponents.FindComponent(entity.StopBFValve, components) as IValve; string[] vOpen = entity.ValvesOpen.Split(new char[] { ';' }); ValvesOpen = new List(); diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index db1341f81..17943c435 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -153,11 +153,11 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection } - if (outPath.StartValve != null) + if (benchPath.StopBFValve != null) { - State.Create("FlyingStartMassCollection : Opening the start/stop valve") + State.Create("FlyingStartMassCollection : Opening the stop backflow valve") .AddOperation(checkUiOp) - .AddOperation(StateMachine.ControlBoard.SetValvesOp(outPath.StartValve, null)) + .AddOperation(StateMachine.ControlBoard.SetValvesOp(benchPath.StopBFValve, null)) .AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp()) .EnterState(); do { diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 0073c2e8a..a9320ff42 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.245.1")] -[assembly: AssemblyFileVersion("2.3.245.1")] +[assembly: AssemblyVersion("2.4.248.1")] +[assembly: AssemblyFileVersion("2.4.248.1")] diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs index e5f94f9b4..cb0d48f7e 100644 --- a/TestBenchFramework/Resources/Strings.Designer.cs +++ b/TestBenchFramework/Resources/Strings.Designer.cs @@ -2643,6 +2643,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Stop backflow valve. + /// + internal static string StopBFValve_chdr { + get { + return ResourceManager.GetString("StopBFValve_chdr", resourceCulture); + } + } + /// /// Looks up a localized string similar to Stopping. /// diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx index 49e8d01a9..2b390fb3d 100644 --- a/TestBenchFramework/Resources/Strings.resx +++ b/TestBenchFramework/Resources/Strings.resx @@ -1210,4 +1210,7 @@ T pump - start vlv. [s] + + Stop backflow valve + \ No newline at end of file diff --git a/TestBenchFramework/UiControls/PathsBenchCtrl.cs b/TestBenchFramework/UiControls/PathsBenchCtrl.cs index 93bdaec2b..3cdf3c46f 100644 --- a/TestBenchFramework/UiControls/PathsBenchCtrl.cs +++ b/TestBenchFramework/UiControls/PathsBenchCtrl.cs @@ -27,6 +27,7 @@ namespace TBF.UiControls Tout, Pin, Pout, + StopBFValve, FixedColumnsCount, } readonly int fixedColumnsCount = (int)Column.FixedColumnsCount; @@ -56,14 +57,15 @@ namespace TBF.UiControls /// ListViewEx columns TBF.LocalSettings ls = Program.LocalSettings; - Columns.Add(Strings.Name, (ls.BenchColumnCount > 0) ? ls.BenchColumnWidths[0] : 60 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.Q_from_m3h, (ls.BenchColumnCount > 1) ? ls.BenchColumnWidths[1] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.Q_to_m3h, (ls.BenchColumnCount > 2) ? ls.BenchColumnWidths[2] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.T_in, (ls.BenchColumnCount > 3) ? ls.BenchColumnWidths[3] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.T_out, (ls.BenchColumnCount > 4) ? ls.BenchColumnWidths[4] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.P_in, (ls.BenchColumnCount > 5) ? ls.BenchColumnWidths[5] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.P_out, (ls.BenchColumnCount > 6) ? ls.BenchColumnWidths[6] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - int clmn = (int)Column.FixedColumnsCount; + Columns.Add(Strings.Name, (ls.BenchColumnCount > 0) ? ls.BenchColumnWidths[0] : 60 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(Strings.Q_from_m3h, (ls.BenchColumnCount > 1) ? ls.BenchColumnWidths[1] : 50 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(Strings.Q_to_m3h, (ls.BenchColumnCount > 2) ? ls.BenchColumnWidths[2] : 50 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(Strings.T_in, (ls.BenchColumnCount > 3) ? ls.BenchColumnWidths[3] : 50 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(Strings.T_out, (ls.BenchColumnCount > 4) ? ls.BenchColumnWidths[4] : 50 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(Strings.P_in, (ls.BenchColumnCount > 5) ? ls.BenchColumnWidths[5] : 50 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(Strings.P_out, (ls.BenchColumnCount > 6) ? ls.BenchColumnWidths[6] : 50 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(Strings.StopBFValve_chdr, (ls.BenchColumnCount > 7) ? ls.BenchColumnWidths[7] : 70 * parent.Dpi / PathsDlg.Dpi100pct); + int clmn = (int)Column.FixedColumnsCount; foreach (var vlv in parent.Valves) { if (vlv.Category == ValveCategory.All || vlv.Category == ValveCategory.Bench) @@ -78,6 +80,8 @@ namespace TBF.UiControls ComboBox tOutCBox = new ComboBox(); ComboBox prInCBox = new ComboBox(); ComboBox prOutCBox = new ComboBox(); + ComboBox stopBFValveComboBox = new ComboBox(); + stopBFValveComboBox.Items.Add("---"); foreach (var cmpnt in parent.TbfComponents) { if (cmpnt is BenchControl.GenericDevices.ITempMeter) @@ -90,6 +94,10 @@ namespace TBF.UiControls prInCBox.Items.Add(cmpnt.Cfg.Name); prOutCBox.Items.Add(cmpnt.Cfg.Name); } + if (cmpnt is IValve && (cmpnt as IValve).CoupledTo == null) + { + stopBFValveComboBox.Items.Add(cmpnt.Cfg.Name); + } } editors = new Control[fixedColumnsCount + 64]; @@ -101,6 +109,7 @@ namespace TBF.UiControls editors[(int)Column.Tout] = tOutCBox; editors[(int)Column.Pin] = prInCBox; editors[(int)Column.Pout] = prOutCBox; + editors[(int)Column.StopBFValve] = stopBFValveComboBox; /// Prepare valve combo-boxes (max. 64 valves) for (int i = 0; i < 64; i++) { @@ -144,6 +153,7 @@ namespace TBF.UiControls lvi.SubItems.Add(path.TempOut != null ? path.TempOut.Cfg.Name : "---"); lvi.SubItems.Add(path.PressIn != null ? path.PressIn.Cfg.Name : "---"); lvi.SubItems.Add(path.PressOut != null ? path.PressOut.Cfg.Name : "---"); + lvi.SubItems.Add((path.StopBFValve != null) ? path.StopBFValve.Cfg.Name : "---"); foreach (var valve in parent.Valves) { @@ -187,6 +197,7 @@ namespace TBF.UiControls entity.TempOut = lvi.SubItems[(int)Column.Tout].Text; entity.PressIn = lvi.SubItems[(int)Column.Pin].Text; entity.PressOut = lvi.SubItems[(int)Column.Pout].Text; + entity.StopBFValve = lvi.SubItems[(int)Column.StopBFValve].Text.Equals("---") ? null : lvi.SubItems[(int)Column.StopBFValve].Text; string valvesOpen = string.Empty; string valvesClose = string.Empty; diff --git a/TestBenchFramework/UiControls/PathsOutputCtrl.cs b/TestBenchFramework/UiControls/PathsOutputCtrl.cs index d3aa0a5db..3f5118f44 100644 --- a/TestBenchFramework/UiControls/PathsOutputCtrl.cs +++ b/TestBenchFramework/UiControls/PathsOutputCtrl.cs @@ -217,7 +217,7 @@ namespace TBF.UiControls allOk &= Utils.TryParseSFloat(lvi.SubItems[(int)Column.PidCoef].Text, out pid); entity.PidCoef = pid; - entity.StartValve = lvi.SubItems[(int)Column.StartValve].Text.Equals("---") ? null : lvi.SubItems[(int)Column.StartValve].Text; + entity.StartValve = lvi.SubItems[(int)Column.StartValve].Text.Equals("---") ? null : lvi.SubItems[(int)Column.StartValve].Text; entity.Diverter = lvi.SubItems[(int)Column.Div].Text.Equals("---") ? null : lvi.SubItems[(int)Column.Div].Text; entity.TempDiv = lvi.SubItems[(int)Column.Tdiv].Text.Equals("---") ? null : lvi.SubItems[(int)Column.Tdiv].Text; entity.Balance = lvi.SubItems[(int)Column.Scale].Text.Equals("---") ? null : lvi.SubItems[(int)Column.Scale].Text;