michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(1) RegulValveTandem wont appear in transition sequences, (2) Fixed RegulValveTandem initialization

Browse Source
This commit is contained in:
Milan Hanajik
2015-02-03 10:53:02 +01:00
parent 5806a65a0c
commit 64253e1985
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandem.cs
+1 -1
View File
@@ -40,7 +40,7 @@ namespace TBF.BenchControl.Elde.RegulValveTandem
regulValve = (RegulValve.RegulValve)TbfComponents.FindComponent(RegulValveTandemCfg.RegulValveName, components); regulValve = (RegulValve.RegulValve)TbfComponents.FindComponent(RegulValveTandemCfg.RegulValveName, components);
if (regulValve == null) throw new Exception("Cannot find regulation valve"); if (regulValve == null) throw new Exception("Cannot find regulation valve");
fixedRV = (RegulValve.RegulValve)TbfComponents.FindComponent(RegulValveTandemCfg.ParentName, components); fixedRV = (RegulValve.RegulValve)TbfComponents.FindComponent(RegulValveTandemCfg.FixedRVName, components);
if (fixedRV == null) throw new Exception("Cannot find fixed RV"); if (fixedRV == null) throw new Exception("Cannot find fixed RV");
fixedPctLo = Math.Max(0.0f, RegulValveTandemCfg.FixedRVPosition - 3.0f); fixedPctLo = Math.Max(0.0f, RegulValveTandemCfg.FixedRVPosition - 3.0f);
TestBenchFramework/BenchControl/StateMachine.cs
+4 -1
View File
@@ -209,7 +209,10 @@ namespace TBF.BenchControl
if (cmpnt is Elde.ControlBoardDev) ControlBoard = cmpnt as Elde.ControlBoardDev; if (cmpnt is Elde.ControlBoardDev) ControlBoard = cmpnt as Elde.ControlBoardDev;
if (cmpnt is BenchId.Component) SequenceBase.BenchId = cmpnt as BenchId.Component; if (cmpnt is BenchId.Component) SequenceBase.BenchId = cmpnt as BenchId.Component;
if (cmpnt is IFlowMeter) SequenceBase.FlowMeters.Add(cmpnt as IFlowMeter); if (cmpnt is IFlowMeter) SequenceBase.FlowMeters.Add(cmpnt as IFlowMeter);
if (cmpnt is IRegulValve) SequenceBase.RegulValves.Add(cmpnt as IRegulValve); if ((cmpnt is IRegulValve) && !(cmpnt is BenchControl.Elde.RegulValveTandem.RegulValveTandem))
{
SequenceBase.RegulValves.Add(cmpnt as IRegulValve);
}
if (cmpnt is IPumpFM) SequenceBase.PumpsWithFM.Add(cmpnt as IPumpFM); if (cmpnt is IPumpFM) SequenceBase.PumpsWithFM.Add(cmpnt as IPumpFM);
if (cmpnt is IWaterMeter) SequenceBase.WaterMeters.Add(cmpnt as IWaterMeter); if (cmpnt is IWaterMeter) SequenceBase.WaterMeters.Add(cmpnt as IWaterMeter);
if (cmpnt is ICamera) SequenceBase.Cameras.Add(cmpnt as ICamera); if (cmpnt is ICamera) SequenceBase.Cameras.Add(cmpnt as ICamera);
TestBenchFramework/TransitionsDlg.cs
+4 -1
View File
@@ -99,7 +99,10 @@ namespace TBF
RegulValves = new List<IRegulValve>(); RegulValves = new List<IRegulValve>();
foreach (var cmpnt in TbfComponents) foreach (var cmpnt in TbfComponents)
{ {
if (cmpnt is IRegulValve) RegulValves.Add(cmpnt as IRegulValve); if ((cmpnt is IRegulValve) && !(cmpnt is BenchControl.Elde.RegulValveTandem.RegulValveTandem))
{
RegulValves.Add(cmpnt as IRegulValve);
}
} }
/// Load the sequences /// Load the sequences