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

Bugfixes: (1) PumpTandem was missing a Mask to be used as Valve, (2) Column widths in results screen

Browse Source
This commit is contained in:
Milan Hanajik
2015-01-16 07:08:26 +01:00
parent e07cf3c5d3
commit b1c9e0d3b5
4 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/Elde/PumpTandem/Pump.cs
+19 -1
View File
@@ -4,7 +4,7 @@ using log4net;
namespace TBF.BenchControl.Elde.PumpTandem
{
public class Pump : ComponentBase, GenericDevices.IPumpFM, IOperation
public class Pump : ComponentBase, GenericDevices.IPumpFM, GenericDevices.IValve, IOperation
{
private static readonly ILog log = LogManager.GetLogger(typeof(Pump));
public override string ToString() { return string.Format("PumpTandem({0})", Cfg.ToString(1)); }
@@ -20,6 +20,15 @@ namespace TBF.BenchControl.Elde.PumpTandem
public bool State { get { return pump1.State || pump2.State; } }
public int Delay { get { return Math.Max(pump1.Delay, pump2.Delay); } }
public float Power { get { return pumpCfg.TestParams.Power; } }
public ValveCategory Category { get { return ValveCategory.Feeding; } } /// Pump category is Feeding
public GenericDevices.IValve CoupledTo { get { return null; } }
public bool InvertCouple { get { return false; } }
public int LagOpening { get { return 0; } }
public int LagClosing { get { return 0; } }
readonly ulong mask1;
readonly ulong mask2;
public ulong Mask { get { return mask1 | mask2; } } /// derived from masks of two pumps
public Pump(PumpCfg cfg, IList<Generic.IComponent> components)
: base(cfg)
@@ -35,6 +44,14 @@ namespace TBF.BenchControl.Elde.PumpTandem
pumpFm1 = pump1 as GenericDevices.IPumpFM;
pumpFm2 = pump2 as GenericDevices.IPumpFM;
if (pump1 is Elde.Pump.Pump) { mask1 = (pump1 as Elde.Pump.Pump).Mask; }
else if (pump1 is Elde.PumpWithFM.Pump) { mask1 = (pump1 as Elde.PumpWithFM.Pump).Mask; }
else { mask1 = 0; }
if (pump2 is Elde.Pump.Pump) { mask2 = (pump2 as Elde.Pump.Pump).Mask; }
else if (pump2 is Elde.PumpWithFM.Pump) { mask2 = (pump2 as Elde.PumpWithFM.Pump).Mask; }
else { mask2 = 0; }
log.Debug(this.ToString());
}
@@ -53,6 +70,7 @@ namespace TBF.BenchControl.Elde.PumpTandem
}
else if ((pumpFm1 != null) && (pumpFm2 == null))
{
// TODO
if (powerArg >= 50)
{
pumpFm1.TurnOn(2 * (powerArg - 50.0f));
TestBenchFramework/BenchControl/Elde/Valve/SetValvesOp.cs
+4 -2
View File
@@ -149,14 +149,16 @@ namespace TBF.BenchControl.Elde.Valve
if (valve is Valve) point.MasksOpen |= (valve as Valve).Mask;
if (valve is Pump.Pump) point.MasksOpen |= (valve as Pump.Pump).Mask;
if (valve is PumpWithFM.Pump) point.MasksOpen |= (valve as PumpWithFM.Pump).Mask;
}
if (valve is PumpTandem.Pump) point.MasksOpen |= (valve as PumpTandem.Pump).Mask;
}
point.MasksClose = 0;
foreach (var valve in point.VClose)
{
if (valve is Valve) point.MasksClose |= (valve as Valve).Mask;
if (valve is Pump.Pump) point.MasksClose |= (valve as Pump.Pump).Mask;
if (valve is PumpWithFM.Pump) point.MasksClose |= (valve as PumpWithFM.Pump).Mask;
}
if (valve is PumpTandem.Pump) point.MasksClose |= (valve as PumpTandem.Pump).Mask;
}
point.TimeSec += timeShift;
}
}
TestBenchFramework/BenchControl/FeedingPath.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace TBF.BenchControl
public string Name;
public float Qfrom;
public float Qto;
public IValve Pump; /// pump to use with this path or null
public IValve Pump; /// pump to use with this path or null
public IList<IValve> ValvesOpen; /// a list of valves to open or null
public IList<IValve> ValvesClose; /// a list of valves to close or null
TestBenchFramework/Screens/ResultsTabPageCtrl.cs
+23 -4
View File
@@ -245,7 +245,7 @@ namespace TBF.Screens
TBF.LocalSettings ls = Program.LocalSettings;
if (combined)
{
lview.Columns.Add((mtr + 1).ToString(), (ls.RsltsCombinedClmnCount > 0) ? ls.RsltsCombinedClmnWdths[0] : 50);
lview.Columns.Add((mtr + 1).ToString(), (ls.RsltsCombinedClmnCount > 0) ? ls.RsltsCombinedClmnWdths[0] : 40);
int i = 1;
foreach (var item in items)
{
@@ -255,7 +255,7 @@ namespace TBF.Screens
}
else
{
lview.Columns.Add((mtr + 1).ToString(), (ls.RsltsSingleClmnCount > 0) ? ls.RsltsSingleClmnWdths[0] : 50);
lview.Columns.Add((mtr + 1).ToString(), (ls.RsltsSingleClmnCount > 0) ? ls.RsltsSingleClmnWdths[0] : 40);
int i = 1;
foreach (var item in items)
{
@@ -322,8 +322,27 @@ namespace TBF.Screens
ListView lview = GetListView();
// Header
lview.Columns.Add((mtr + 1).ToString());
foreach (var str in GetAllDecoratedTestNames()) lview.Columns.Add(str);
TBF.LocalSettings ls = Program.LocalSettings;
if (combined)
{
lview.Columns.Add((mtr + 1).ToString(), (ls.RsltsCombinedClmnCount > 0) ? ls.RsltsCombinedClmnWdths[0] : 40);
int i = 1;
foreach (var str in GetAllDecoratedTestNames())
{
lview.Columns.Add(str, (ls.RsltsCombinedClmnCount > i) ? ls.RsltsCombinedClmnWdths[i] : 70);
i++;
}
}
else
{
lview.Columns.Add((mtr + 1).ToString(), (ls.RsltsSingleClmnCount > 0) ? ls.RsltsSingleClmnWdths[0] : 40);
int i = 1;
foreach (var str in GetAllDecoratedTestNames())
{
lview.Columns.Add(str, (ls.RsltsSingleClmnCount > i) ? ls.RsltsSingleClmnWdths[i] : 70);
i++;
}
}
IList<Entities.TestResult> trs = GetCurrentTestResults();